From 519a4bc24e4b343237ec26679abafa5b5eb1c8f2 Mon Sep 17 00:00:00 2001 From: Elliot Lee Date: Thu, 27 Nov 1997 05:07:48 +0000 Subject: [PATCH] cleanups for color changing stuff --- Makefile.in | 1 + aclocal.m4 | 60 ++++++++++--- configure | 224 ++++++++++++++++++++++++++--------------------- docs/Makefile.in | 1 + gdk/.cvsignore | 3 +- gdk/Makefile.in | 1 + gdk/gdkx.h | 2 +- gdk/x11/gdkx.h | 2 +- gtk/Makefile.in | 1 + gtk/gtkwidget.c | 6 +- gtk/gtkwindow.c | 8 +- 11 files changed, 183 insertions(+), 126 deletions(-) diff --git a/Makefile.in b/Makefile.in index 8f8f1d6362..fc88284591 100644 --- a/Makefile.in +++ b/Makefile.in @@ -58,6 +58,7 @@ POST_UNINSTALL = true host_alias = @host_alias@ host_triplet = @host@ CC = @CC@ +CPP = @CPP@ LD = @LD@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ diff --git a/aclocal.m4 b/aclocal.m4 index 9f99ab8e72..938449a8aa 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,14 @@ -dnl aclocal.m4 generated automatically by aclocal 1.2 +dnl aclocal.m4 generated automatically by aclocal 1.2c + +dnl Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +dnl This Makefile.in is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without +dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A +dnl PARTICULAR PURPOSE. # Do all the work for Automake. This macro actually does too much -- # some checks are only needed if your package does certain things. @@ -58,7 +68,7 @@ echo timestamp > conftestfile # directory). if ( set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` - if test "$@" = "X"; then + if test "[$]*" = "X"; then # -L didn't work. set X `ls -t $srcdir/configure conftestfile` fi @@ -338,8 +348,7 @@ AC_DEFUN(AM_MAINTAINER_MODE, # If the C compiler in not in ANSI C mode by default, try to add an option # to output variable @code{CC} to make it so. This macro tries various # options that select ANSI C on some system or another. It considers the -# compiler to be in ANSI C mode if it defines @code{__STDC__} to 1 and -# handles function prototypes correctly. +# compiler to be in ANSI C mode if it handles function prototypes correctly. # # If you use this macro, you should check after calling it whether the C # compiler has been set to accept ANSI C; if not, the shell variable @@ -352,6 +361,10 @@ AC_DEFUN(AM_PROG_CC_STDC, [AC_REQUIRE([AC_PROG_CC]) AC_BEFORE([$0], [AC_C_INLINE]) AC_BEFORE([$0], [AC_C_CONST]) +dnl Force this before AC_PROG_CPP. Some cpp's, eg on HPUX, require +dnl a magic option to avoid problems with ANSI preprocessor commands +dnl like #elif. +AC_BEFORE([$0], [AC_PROG_CPP]) AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C) AC_CACHE_VAL(am_cv_prog_cc_stdc, [am_cv_prog_cc_stdc=no @@ -366,18 +379,37 @@ for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__ do CC="$ac_save_CC $ac_arg" AC_TRY_COMPILE( -[#if !defined(__STDC__) || __STDC__ != 1 -choke me -#endif -/* DYNIX/ptx V4.1.3 can't compile sys/stat.h with -Xc -D__EXTENSIONS__. */ -#ifdef _SEQUENT_ -# include -# include -#endif -], [ +[#include +#include +#include +#include +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} int test (int i, double x); struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);};], +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +], [ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; +], [am_cv_prog_cc_stdc="$ac_arg"; break]) done CC="$ac_save_CC" diff --git a/configure b/configure index ac0742c0bd..96cbb23942 100755 --- a/configure +++ b/configure @@ -652,7 +652,7 @@ echo timestamp > conftestfile # directory). if ( set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` - if test "" = "X"; then + if test "$*" = "X"; then # -L didn't work. set X `ls -t $srcdir/configure conftestfile` fi @@ -1339,7 +1339,7 @@ echo timestamp > conftestfile # directory). if ( set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` - if test "" = "X"; then + if test "$*" = "X"; then # -L didn't work. set X `ls -t $srcdir/configure conftestfile` fi @@ -1529,8 +1529,9 @@ fi + echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 -echo "configure:1534: checking for ${CC-cc} option to accept ANSI C" >&5 +echo "configure:1535: checking for ${CC-cc} option to accept ANSI C" >&5 if eval "test \"`echo '$''{'am_cv_prog_cc_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1546,25 +1547,44 @@ for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__ do CC="$ac_save_CC $ac_arg" cat > conftest.$ac_ext < -# include -#endif - -int main() { - +#include +#include +#include +#include +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} int test (int i, double x); struct s1 {int (*f) (int a);}; struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; + +int main() { + +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; return 0; } EOF -if { (eval echo configure:1568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1588: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_prog_cc_stdc="$ac_arg"; break else @@ -1598,7 +1618,7 @@ esac # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1602: checking for a BSD compatible install" >&5 +echo "configure:1622: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1648,7 +1668,7 @@ test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1652: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1672: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1696,7 +1716,7 @@ fi # Find the X11 include and library directories echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1700: checking how to run the C preprocessor" >&5 +echo "configure:1720: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1711,13 +1731,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1721: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1741: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1728,13 +1748,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1738: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1758: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1761,7 +1781,7 @@ echo "$ac_t""$CPP" 1>&6 # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:1765: checking for X" >&5 +echo "configure:1785: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -1823,12 +1843,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1832: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1852: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1897,14 +1917,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -2010,17 +2030,17 @@ else case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:2014: checking whether -R must be followed by a space" >&5 +echo "configure:2034: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_nospace=yes else @@ -2036,14 +2056,14 @@ rm -f conftest* else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_space=yes else @@ -2075,7 +2095,7 @@ rm -f conftest* # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:2079: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:2099: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2083,7 +2103,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2116,7 +2136,7 @@ fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:2120: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:2140: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2124,7 +2144,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2164,12 +2184,12 @@ fi # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:2168: checking for gethostbyname" >&5 +echo "configure:2188: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -2213,7 +2233,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:2217: checking for gethostbyname in -lnsl" >&5 +echo "configure:2237: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2221,7 +2241,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2262,12 +2282,12 @@ fi # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:2266: checking for connect" >&5 +echo "configure:2286: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -2311,7 +2331,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:2315: checking for connect in -lsocket" >&5 +echo "configure:2335: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2319,7 +2339,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2354,12 +2374,12 @@ fi # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:2358: checking for remove" >&5 +echo "configure:2378: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -2403,7 +2423,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:2407: checking for remove in -lposix" >&5 +echo "configure:2427: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2411,7 +2431,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2446,12 +2466,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:2450: checking for shmat" >&5 +echo "configure:2470: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -2495,7 +2515,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:2499: checking for shmat in -lipc" >&5 +echo "configure:2519: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2503,7 +2523,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2547,7 +2567,7 @@ fi # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:2551: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:2571: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2555,7 +2575,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2604,7 +2624,7 @@ LDFLAGS="$X_LDFLAGS $X_LIBS" # Checks for libraries. # Check for the X11 library echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:2608: checking for XOpenDisplay in -lX11" >&5 +echo "configure:2628: checking for XOpenDisplay in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2612,7 +2632,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lX11 $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2648,7 +2668,7 @@ fi if eval "test x$enable_shm = xyes"; then # Check for the Xext library (needed for XShm extention) echo $ac_n "checking for XShmAttach in -lXext""... $ac_c" 1>&6 -echo "configure:2652: checking for XShmAttach in -lXext" >&5 +echo "configure:2672: checking for XShmAttach in -lXext" >&5 ac_lib_var=`echo Xext'_'XShmAttach | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2656,7 +2676,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXext $x_libs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2729,17 +2749,17 @@ if eval "test x$enable_shm = xyes"; then # Check for shared memory ac_safe=`echo "sys/ipc.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/ipc.h""... $ac_c" 1>&6 -echo "configure:2733: checking for sys/ipc.h" >&5 +echo "configure:2753: checking for sys/ipc.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2743: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2763: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2766,17 +2786,17 @@ fi ac_safe=`echo "sys/shm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/shm.h""... $ac_c" 1>&6 -echo "configure:2770: checking for sys/shm.h" >&5 +echo "configure:2790: checking for sys/shm.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2780: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2800: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2805,12 +2825,12 @@ fi # Check whether shmctl IPC_RMID allowes subsequent attaches if test "$ac_cv_header_sys_shm_h" = "yes"; then echo $ac_n "checking whether shmctl IPC_RMID allowes subsequent attaches""... $ac_c" 1>&6 -echo "configure:2809: checking whether shmctl IPC_RMID allowes subsequent attaches" >&5 +echo "configure:2829: checking whether shmctl IPC_RMID allowes subsequent attaches" >&5 if test "$cross_compiling" = yes; then echo "$ac_t""assuming no" 1>&6 else cat > conftest.$ac_ext < @@ -2836,7 +2856,7 @@ else } EOF -if { (eval echo configure:2840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF #define IPC_RMID_DEFERRED_RELEASE 1 @@ -2856,7 +2876,7 @@ fi # Check for the X shared memory extension header file echo $ac_n "checking X11/extensions/XShm.h""... $ac_c" 1>&6 -echo "configure:2860: checking X11/extensions/XShm.h" >&5 +echo "configure:2880: checking X11/extensions/XShm.h" >&5 if eval "test x$no_ext_lib = xyes"; then echo "$ac_t""no" 1>&6 no_xshm=yes @@ -2876,7 +2896,7 @@ fi # Check for private display resource base variable echo $ac_n "checking resource base field in XDisplay""... $ac_c" 1>&6 -echo "configure:2880: checking resource base field in XDisplay" >&5 +echo "configure:2900: checking resource base field in XDisplay" >&5 if eval "test \"`echo '$''{'gtk_cv_display_resource_base'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2884,7 +2904,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <resource_base; } EOF -if { (eval echo configure:2904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then gtk_cv_display_resource_base="resource_base" else @@ -2922,12 +2942,12 @@ EOF # Checks for header files. echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2926: checking for ANSI C header files" >&5 +echo "configure:2946: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2935,7 +2955,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2939: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2959: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2952,7 +2972,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -2970,7 +2990,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -2991,7 +3011,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -3002,7 +3022,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:3006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -3028,12 +3048,12 @@ fi # Checks for typedefs, structures, and compiler characteristics. echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:3032: checking for working const" >&5 +echo "configure:3052: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -3105,12 +3125,12 @@ fi # Checks for library functions. echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:3109: checking return type of signal handlers" >&5 +echo "configure:3129: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3127,7 +3147,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:3131: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3151: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -3149,16 +3169,16 @@ EOF # Check for sys/select.h echo $ac_n "checking fd_set and sys/select""... $ac_c" 1>&6 -echo "configure:3153: checking fd_set and sys/select" >&5 +echo "configure:3173: checking fd_set and sys/select" >&5 cat > conftest.$ac_ext < int main() { fd_set readMask, writeMask; ; return 0; } EOF -if { (eval echo configure:3162: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3182: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gtk_ok=yes else @@ -3170,7 +3190,7 @@ fi rm -f conftest* if test $gtk_ok = no; then cat > conftest.$ac_ext < EOF diff --git a/docs/Makefile.in b/docs/Makefile.in index 19e9ab4f71..140053eb30 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -58,6 +58,7 @@ POST_UNINSTALL = true host_alias = @host_alias@ host_triplet = @host@ CC = @CC@ +CPP = @CPP@ LD = @LD@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ diff --git a/gdk/.cvsignore b/gdk/.cvsignore index 79680c82cb..bb21b37205 100644 --- a/gdk/.cvsignore +++ b/gdk/.cvsignore @@ -3,4 +3,5 @@ Makefile .deps _libs libgdk.la - +gdkcursors.h +gdkkeysyms.h diff --git a/gdk/Makefile.in b/gdk/Makefile.in index 258a23610f..987d781869 100644 --- a/gdk/Makefile.in +++ b/gdk/Makefile.in @@ -58,6 +58,7 @@ POST_UNINSTALL = true host_alias = @host_alias@ host_triplet = @host@ CC = @CC@ +CPP = @CPP@ LD = @LD@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ diff --git a/gdk/gdkx.h b/gdk/gdkx.h index cb8e33b44f..cc43cbca17 100644 --- a/gdk/gdkx.h +++ b/gdk/gdkx.h @@ -22,7 +22,7 @@ #define GDK_ROOT_WINDOW() gdk_root_window -#define GDK_ROOT_PARENT() &gdk_root_parent +#define GDK_ROOT_PARENT() ((GdkWindow *)&gdk_root_parent) #define GDK_DISPLAY() gdk_display #define GDK_WINDOW_XDISPLAY(win) (((GdkWindowPrivate*) win)->xdisplay) #define GDK_WINDOW_XWINDOW(win) (((GdkWindowPrivate*) win)->xwindow) diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h index cb8e33b44f..cc43cbca17 100644 --- a/gdk/x11/gdkx.h +++ b/gdk/x11/gdkx.h @@ -22,7 +22,7 @@ #define GDK_ROOT_WINDOW() gdk_root_window -#define GDK_ROOT_PARENT() &gdk_root_parent +#define GDK_ROOT_PARENT() ((GdkWindow *)&gdk_root_parent) #define GDK_DISPLAY() gdk_display #define GDK_WINDOW_XDISPLAY(win) (((GdkWindowPrivate*) win)->xdisplay) #define GDK_WINDOW_XWINDOW(win) (((GdkWindowPrivate*) win)->xwindow) diff --git a/gtk/Makefile.in b/gtk/Makefile.in index acb52704f8..2503ca094a 100644 --- a/gtk/Makefile.in +++ b/gtk/Makefile.in @@ -58,6 +58,7 @@ POST_UNINSTALL = true host_alias = @host_alias@ host_triplet = @host@ CC = @CC@ +CPP = @CPP@ LD = @LD@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 26e0c9bbc2..76813761b5 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -2483,15 +2483,15 @@ gtk_widget_propagate_default_style(void) /* Set the property on the root window */ gdk_property_change(GDK_ROOT_PARENT(), gdk_atom_intern("_GTK_DEFAULT_COLORS", FALSE), - GDK_NONE, sizeof(gushort), + GDK_NONE, 8*sizeof(gushort), GDK_PROP_MODE_REPLACE, - gtk_widget_get_default_style(), + (guchar *)gtk_widget_get_default_style(), GTK_STYLE_NUM_STYLECOLORS() * sizeof(GdkColor)); for(i = 0; i < 5; i++) sev.data.l[i] = 0; sev.data_format = 32; sev.message_type = gdk_atom_intern("_GTK_STYLE_CHANGED", FALSE); - gdk_event_send_clientmessage_toall(&sev); + gdk_event_send_clientmessage_toall((GdkEvent *)&sev); } /***************************************** diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index e97708a96c..950d7c7045 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -73,7 +73,7 @@ static gint gtk_window_focus_in_event (GtkWidget *widget, static gint gtk_window_focus_out_event (GtkWidget *widget, GdkEventFocus *event); static gint gtk_window_client_event (GtkWidget *widget, - GdkEvent *event); + GdkEventClient *event); static gint gtk_window_need_resize (GtkContainer *container); static gint gtk_real_window_move_resize (GtkWindow *window, gint *x, @@ -847,7 +847,7 @@ gtk_window_style_set_event (GtkWidget *widget, &realtype, &retfmt, &retlen, - (guchar *)&data) != TRUE + (guchar **)&data) != TRUE || retfmt != sizeof(gushort)) { g_warning("gdk_property_get() failed in _GTK_STYLE_CHANGED\n"); return; @@ -873,7 +873,7 @@ gtk_window_style_set_event (GtkWidget *widget, static gint gtk_window_client_event (GtkWidget *widget, - GdkEvent *event) + GdkEventClient *event) { GdkAtom atom_styleset; g_return_val_if_fail (widget != NULL, FALSE); @@ -882,7 +882,7 @@ gtk_window_client_event (GtkWidget *widget, atom_styleset = gdk_atom_intern("_GTK_STYLE_CHANGED", FALSE); - if(event->client.message_type == atom_styleset) { + if(event->message_type == atom_styleset) { gtk_window_style_set_event(widget, event); } return FALSE;