tGTK+ client will now compile successfully with GTK+2.0, and the rest of the pr… | |
git clone git://src.adamsgaard.dk/vaccinewars | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 801f0c99838c8ec5560b70ef2b6b9f1b921c30d4 | |
parent 99ca4cc4a185dfe52e70aef61872a5a708871386 | |
Author: Ben Webb <[email protected]> | |
Date: Tue, 19 Mar 2002 19:08:01 +0000 | |
GTK+ client will now compile successfully with GTK+2.0, and the rest of the | |
program with GLIB 2.0. | |
Diffstat: | |
M Makefile.in | 4 ++++ | |
M aclocal.m4 | 410 ++++++++++++++++++++++++++++++ | |
M configure | 975 ++++++++++++++++++++++++-----… | |
M configure.in | 62 ++++++++++++++++-------------… | |
M doc/Makefile.in | 4 ++++ | |
M src/Makefile.in | 4 ++++ | |
M src/curses_client/Makefile.am | 2 +- | |
M src/curses_client/Makefile.in | 6 +++++- | |
M src/cursesport/Makefile.in | 4 ++++ | |
M src/gtkport/Makefile.in | 4 ++++ | |
M src/gtkport/gtkport.c | 5 +++-- | |
M src/gui_client/Makefile.in | 4 ++++ | |
M src/gui_client/gtk_client.c | 33 ++++++++++++++++-------------… | |
M src/gui_client/newgamedia.c | 8 ++++---- | |
M src/gui_client/optdialog.c | 2 +- | |
15 files changed, 1256 insertions(+), 271 deletions(-) | |
--- | |
diff --git a/Makefile.in b/Makefile.in | |
t@@ -68,9 +68,12 @@ GENCAT = @GENCAT@ | |
GLIBC21 = @GLIBC21@ | |
GLIB_CFLAGS = @GLIB_CFLAGS@ | |
GLIB_CONFIG = @GLIB_CONFIG@ | |
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ | |
GLIB_LIBS = @GLIB_LIBS@ | |
+GLIB_MKENUMS = @GLIB_MKENUMS@ | |
GMOFILES = @GMOFILES@ | |
GMSGFMT = @GMSGFMT@ | |
+GOBJECT_QUERY = @GOBJECT_QUERY@ | |
GTK_CFLAGS = @GTK_CFLAGS@ | |
GTK_CONFIG = @GTK_CONFIG@ | |
GTK_LIBS = @GTK_LIBS@ | |
t@@ -84,6 +87,7 @@ MAKEINFO = @MAKEINFO@ | |
MKINSTALLDIRS = @MKINSTALLDIRS@ | |
MSGFMT = @MSGFMT@ | |
PACKAGE = @PACKAGE@ | |
+PKG_CONFIG = @PKG_CONFIG@ | |
POFILES = @POFILES@ | |
POSUB = @POSUB@ | |
RANLIB = @RANLIB@ | |
diff --git a/aclocal.m4 b/aclocal.m4 | |
t@@ -144,6 +144,219 @@ AC_DEFUN([AC_ISC_POSIX], | |
) | |
# Configure paths for GLIB | |
+# Owen Taylor 1997-2001 | |
+ | |
+dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND… | |
+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject o… | |
+dnl gthread is specified in MODULES, pass to pkg-config | |
+dnl | |
+AC_DEFUN(AM_PATH_GLIB_2_0, | |
+[dnl | |
+dnl Get the cflags and libraries from pkg-config | |
+dnl | |
+AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and r… | |
+ , enable_glibtest=yes) | |
+ | |
+ pkg_config_args=glib-2.0 | |
+ for module in . $4 | |
+ do | |
+ case "$module" in | |
+ gmodule) | |
+ pkg_config_args="$pkg_config_args gmodule-2.0" | |
+ ;; | |
+ gobject) | |
+ pkg_config_args="$pkg_config_args gobject-2.0" | |
+ ;; | |
+ gthread) | |
+ pkg_config_args="$pkg_config_args gthread-2.0" | |
+ ;; | |
+ esac | |
+ done | |
+ | |
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) | |
+ | |
+ no_glib="" | |
+ | |
+ if test x$PKG_CONFIG != xno ; then | |
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then | |
+ : | |
+ else | |
+ echo *** pkg-config too old; version 0.7 or better required. | |
+ no_glib=yes | |
+ PKG_CONFIG=no | |
+ fi | |
+ else | |
+ no_glib=yes | |
+ fi | |
+ | |
+ min_glib_version=ifelse([$1], ,2.0.0,$1) | |
+ AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) | |
+ | |
+ if test x$PKG_CONFIG != xno ; then | |
+ ## don't try to run the test against uninstalled libtool libs | |
+ if $PKG_CONFIG --uninstalled $pkg_config_args; then | |
+ echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" | |
+ enable_glibtest=no | |
+ fi | |
+ | |
+ if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then | |
+ : | |
+ else | |
+ no_glib=yes | |
+ fi | |
+ fi | |
+ | |
+ if test x"$no_glib" = x ; then | |
+ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` | |
+ GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` | |
+ GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` | |
+ | |
+ GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` | |
+ GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` | |
+ glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ | |
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` | |
+ glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ | |
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` | |
+ glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ | |
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` | |
+ if test "x$enable_glibtest" = "xyes" ; then | |
+ ac_save_CFLAGS="$CFLAGS" | |
+ ac_save_LIBS="$LIBS" | |
+ CFLAGS="$CFLAGS $GLIB_CFLAGS" | |
+ LIBS="$GLIB_LIBS $LIBS" | |
+dnl | |
+dnl Now check if the installed GLIB is sufficiently new. (Also sanity | |
+dnl checks the results of pkg-config to some extent) | |
+dnl | |
+ rm -f conf.glibtest | |
+ AC_TRY_RUN([ | |
+#include <glib.h> | |
+#include <stdio.h> | |
+#include <stdlib.h> | |
+ | |
+int | |
+main () | |
+{ | |
+ int major, minor, micro; | |
+ char *tmp_version; | |
+ | |
+ system ("touch conf.glibtest"); | |
+ | |
+ /* HP/UX 9 (%@#!) writes to sscanf strings */ | |
+ tmp_version = g_strdup("$min_glib_version"); | |
+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { | |
+ printf("%s, bad version string\n", "$min_glib_version"); | |
+ exit(1); | |
+ } | |
+ | |
+ if ((glib_major_version != $glib_config_major_version) || | |
+ (glib_minor_version != $glib_config_minor_version) || | |
+ (glib_micro_version != $glib_config_micro_version)) | |
+ { | |
+ printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but … | |
+ $glib_config_major_version, $glib_config_minor_version, $glib_con… | |
+ glib_major_version, glib_minor_version, glib_micro_version); | |
+ printf ("*** was found! If pkg-config was correct, then it is best\n"); | |
+ printf ("*** to remove the old version of GLib. You may also be able to … | |
+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by… | |
+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\… | |
+ printf("*** required on your system.\n"); | |
+ printf("*** If pkg-config was wrong, set the environment variable PKG_CO… | |
+ printf("*** to point to the correct configuration files\n"); | |
+ } | |
+ else if ((glib_major_version != GLIB_MAJOR_VERSION) || | |
+ (glib_minor_version != GLIB_MINOR_VERSION) || | |
+ (glib_micro_version != GLIB_MICRO_VERSION)) | |
+ { | |
+ printf("*** GLIB header files (version %d.%d.%d) do not match\n", | |
+ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); | |
+ printf("*** library (version %d.%d.%d)\n", | |
+ glib_major_version, glib_minor_version, glib_micro_version); | |
+ } | |
+ else | |
+ { | |
+ if ((glib_major_version > major) || | |
+ ((glib_major_version == major) && (glib_minor_version > minor)) || | |
+ ((glib_major_version == major) && (glib_minor_version == minor) && (gl… | |
+ { | |
+ return 0; | |
+ } | |
+ else | |
+ { | |
+ printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", | |
+ glib_major_version, glib_minor_version, glib_micro_version); | |
+ printf("*** You need a version of GLIB newer than %d.%d.%d. The latest… | |
+ major, minor, micro); | |
+ printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); | |
+ printf("***\n"); | |
+ printf("*** If you have already installed a sufficiently new version, … | |
+ printf("*** probably means that the wrong copy of the pkg-config shell… | |
+ printf("*** being found. The easiest way to fix this is to remove the … | |
+ printf("*** of GLIB, but you can also set the PKG_CONFIG environment t… | |
+ printf("*** correct copy of pkg-config. (In this case, you will have t… | |
+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /… | |
+ printf("*** so that the correct libraries are found at run-time))\n"); | |
+ } | |
+ } | |
+ return 1; | |
+} | |
+],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) | |
+ CFLAGS="$ac_save_CFLAGS" | |
+ LIBS="$ac_save_LIBS" | |
+ fi | |
+ fi | |
+ if test "x$no_glib" = x ; then | |
+ AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_… | |
+ ifelse([$2], , :, [$2]) | |
+ else | |
+ AC_MSG_RESULT(no) | |
+ if test "$PKG_CONFIG" = "no" ; then | |
+ echo "*** A new enough version of pkg-config was not found." | |
+ echo "*** See http://www.freedesktop.org/software/pkgconfig/" | |
+ else | |
+ if test -f conf.glibtest ; then | |
+ : | |
+ else | |
+ echo "*** Could not run GLIB test program, checking why..." | |
+ CFLAGS="$CFLAGS $GLIB_CFLAGS" | |
+ LIBS="$LIBS $GLIB_LIBS" | |
+ AC_TRY_LINK([ | |
+#include <glib.h> | |
+#include <stdio.h> | |
+], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_… | |
+ [ echo "*** The test program compiled, but did not run. This usually m… | |
+ echo "*** that the run-time linker is not finding GLIB or finding th… | |
+ echo "*** version of GLIB. If it is not finding GLIB, you'll need to… | |
+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.c… | |
+ echo "*** to the installed location Also, make sure you have run ld… | |
+ echo "*** is required on your system" | |
+ echo "***" | |
+ echo "*** If you have an old version installed, it is best to remove… | |
+ echo "*** you may also be able to get things to work by modifying LD… | |
+ [ echo "*** The test program failed to compile or link. See the file c… | |
+ echo "*** exact error that occured. This usually means GLIB was inco… | |
+ echo "*** or that you have moved GLIB since it was installed. In the… | |
+ echo "*** may want to edit the pkg-config script: $PKG_CONFIG" ]) | |
+ CFLAGS="$ac_save_CFLAGS" | |
+ LIBS="$ac_save_LIBS" | |
+ fi | |
+ fi | |
+ GLIB_CFLAGS="" | |
+ GLIB_LIBS="" | |
+ GLIB_GENMARSHAL="" | |
+ GOBJECT_QUERY="" | |
+ GLIB_MKENUMS="" | |
+ ifelse([$3], , :, [$3]) | |
+ fi | |
+ AC_SUBST(GLIB_CFLAGS) | |
+ AC_SUBST(GLIB_LIBS) | |
+ AC_SUBST(GLIB_GENMARSHAL) | |
+ AC_SUBST(GOBJECT_QUERY) | |
+ AC_SUBST(GLIB_MKENUMS) | |
+ rm -f conf.glibtest | |
+]) | |
+ | |
+# Configure paths for GLIB | |
# Owen Taylor 97-11-3 | |
dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, … | |
t@@ -341,6 +554,203 @@ main () | |
]) | |
# Configure paths for GTK+ | |
+# Owen Taylor 1997-2001 | |
+ | |
+dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND … | |
+dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified… | |
+dnl pass to pkg-config | |
+dnl | |
+AC_DEFUN(AM_PATH_GTK_2_0, | |
+[dnl | |
+dnl Get the cflags and libraries from pkg-config | |
+dnl | |
+AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and ru… | |
+ , enable_gtktest=yes) | |
+ | |
+ pkg_config_args=gtk+-2.0 | |
+ for module in . $4 | |
+ do | |
+ case "$module" in | |
+ gthread) | |
+ pkg_config_args="$pkg_config_args gthread-2.0" | |
+ ;; | |
+ esac | |
+ done | |
+ | |
+ no_gtk="" | |
+ | |
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) | |
+ | |
+ if test x$PKG_CONFIG != xno ; then | |
+ if pkg-config --atleast-pkgconfig-version 0.7 ; then | |
+ : | |
+ else | |
+ echo *** pkg-config too old; version 0.7 or better required. | |
+ no_gtk=yes | |
+ PKG_CONFIG=no | |
+ fi | |
+ else | |
+ no_gtk=yes | |
+ fi | |
+ | |
+ min_gtk_version=ifelse([$1], ,2.0.0,$1) | |
+ AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version) | |
+ | |
+ if test x$PKG_CONFIG != xno ; then | |
+ ## don't try to run the test against uninstalled libtool libs | |
+ if $PKG_CONFIG --uninstalled $pkg_config_args; then | |
+ echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH" | |
+ enable_gtktest=no | |
+ fi | |
+ | |
+ if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then | |
+ : | |
+ else | |
+ no_gtk=yes | |
+ fi | |
+ fi | |
+ | |
+ if test x"$no_gtk" = x ; then | |
+ GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags` | |
+ GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs` | |
+ gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ | |
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` | |
+ gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ | |
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` | |
+ gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ | |
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` | |
+ if test "x$enable_gtktest" = "xyes" ; then | |
+ ac_save_CFLAGS="$CFLAGS" | |
+ ac_save_LIBS="$LIBS" | |
+ CFLAGS="$CFLAGS $GTK_CFLAGS" | |
+ LIBS="$GTK_LIBS $LIBS" | |
+dnl | |
+dnl Now check if the installed GTK+ is sufficiently new. (Also sanity | |
+dnl checks the results of pkg-config to some extent) | |
+dnl | |
+ rm -f conf.gtktest | |
+ AC_TRY_RUN([ | |
+#include <gtk/gtk.h> | |
+#include <stdio.h> | |
+#include <stdlib.h> | |
+ | |
+int | |
+main () | |
+{ | |
+ int major, minor, micro; | |
+ char *tmp_version; | |
+ | |
+ system ("touch conf.gtktest"); | |
+ | |
+ /* HP/UX 9 (%@#!) writes to sscanf strings */ | |
+ tmp_version = g_strdup("$min_gtk_version"); | |
+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { | |
+ printf("%s, bad version string\n", "$min_gtk_version"); | |
+ exit(1); | |
+ } | |
+ | |
+ if ((gtk_major_version != $gtk_config_major_version) || | |
+ (gtk_minor_version != $gtk_config_minor_version) || | |
+ (gtk_micro_version != $gtk_config_micro_version)) | |
+ { | |
+ printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but … | |
+ $gtk_config_major_version, $gtk_config_minor_version, $gtk_config… | |
+ gtk_major_version, gtk_minor_version, gtk_micro_version); | |
+ printf ("*** was found! If pkg-config was correct, then it is best\n"); | |
+ printf ("*** to remove the old version of GTK+. You may also be able to … | |
+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by… | |
+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\… | |
+ printf("*** required on your system.\n"); | |
+ printf("*** If pkg-config was wrong, set the environment variable PKG_CO… | |
+ printf("*** to point to the correct configuration files\n"); | |
+ } | |
+ else if ((gtk_major_version != GTK_MAJOR_VERSION) || | |
+ (gtk_minor_version != GTK_MINOR_VERSION) || | |
+ (gtk_micro_version != GTK_MICRO_VERSION)) | |
+ { | |
+ printf("*** GTK+ header files (version %d.%d.%d) do not match\n", | |
+ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); | |
+ printf("*** library (version %d.%d.%d)\n", | |
+ gtk_major_version, gtk_minor_version, gtk_micro_version); | |
+ } | |
+ else | |
+ { | |
+ if ((gtk_major_version > major) || | |
+ ((gtk_major_version == major) && (gtk_minor_version > minor)) || | |
+ ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_… | |
+ { | |
+ return 0; | |
+ } | |
+ else | |
+ { | |
+ printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", | |
+ gtk_major_version, gtk_minor_version, gtk_micro_version); | |
+ printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest… | |
+ major, minor, micro); | |
+ printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); | |
+ printf("***\n"); | |
+ printf("*** If you have already installed a sufficiently new version, … | |
+ printf("*** probably means that the wrong copy of the pkg-config shell… | |
+ printf("*** being found. The easiest way to fix this is to remove the … | |
+ printf("*** of GTK+, but you can also set the PKG_CONFIG environment t… | |
+ printf("*** correct copy of pkg-config. (In this case, you will have t… | |
+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /… | |
+ printf("*** so that the correct libraries are found at run-time))\n"); | |
+ } | |
+ } | |
+ return 1; | |
+} | |
+],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) | |
+ CFLAGS="$ac_save_CFLAGS" | |
+ LIBS="$ac_save_LIBS" | |
+ fi | |
+ fi | |
+ if test "x$no_gtk" = x ; then | |
+ AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_ve… | |
+ ifelse([$2], , :, [$2]) | |
+ else | |
+ AC_MSG_RESULT(no) | |
+ if test "$PKG_CONFIG" = "no" ; then | |
+ echo "*** A new enough version of pkg-config was not found." | |
+ echo "*** See http://pkgconfig.sourceforge.net" | |
+ else | |
+ if test -f conf.gtktest ; then | |
+ : | |
+ else | |
+ echo "*** Could not run GTK+ test program, checking why..." | |
+ CFLAGS="$CFLAGS $GTK_CFLAGS" | |
+ LIBS="$LIBS $GTK_LIBS" | |
+ AC_TRY_LINK([ | |
+#include <gtk/gtk.h> | |
+#include <stdio.h> | |
+], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_ver… | |
+ [ echo "*** The test program compiled, but did not run. This usually m… | |
+ echo "*** that the run-time linker is not finding GTK+ or finding th… | |
+ echo "*** version of GTK+. If it is not finding GTK+, you'll need to… | |
+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.c… | |
+ echo "*** to the installed location Also, make sure you have run ld… | |
+ echo "*** is required on your system" | |
+ echo "***" | |
+ echo "*** If you have an old version installed, it is best to remove… | |
+ echo "*** you may also be able to get things to work by modifying LD… | |
+ [ echo "*** The test program failed to compile or link. See the file c… | |
+ echo "*** exact error that occured. This usually means GTK+ was inco… | |
+ echo "*** or that you have moved GTK+ since it was installed. In the… | |
+ echo "*** may want to edit the pkg-config script: $PKG_CONFIG" ]) | |
+ CFLAGS="$ac_save_CFLAGS" | |
+ LIBS="$ac_save_LIBS" | |
+ fi | |
+ fi | |
+ GTK_CFLAGS="" | |
+ GTK_LIBS="" | |
+ ifelse([$3], , :, [$3]) | |
+ fi | |
+ AC_SUBST(GTK_CFLAGS) | |
+ AC_SUBST(GTK_LIBS) | |
+ rm -f conf.gtktest | |
+]) | |
+ | |
+# Configure paths for GTK+ | |
# Owen Taylor 97-11-3 | |
dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, M… | |
diff --git a/configure b/configure | |
t@@ -20,12 +20,16 @@ ac_help="$ac_help | |
ac_help="$ac_help | |
--enable-nativewin32 build a native Win32 binary under Cygwin" | |
ac_help="$ac_help | |
+ --disable-glibtest do not try to compile and run a test GLIB program" | |
+ac_help="$ac_help | |
--with-glib-prefix=PFX Prefix where GLIB is installed (optional)" | |
ac_help="$ac_help | |
--with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)" | |
ac_help="$ac_help | |
--disable-glibtest Do not try to compile and run a test GLIB program" | |
ac_help="$ac_help | |
+ --disable-gtktest do not try to compile and run a test GTK+ program" | |
+ac_help="$ac_help | |
--with-gtk-prefix=PFX Prefix where GTK is installed (optional)" | |
ac_help="$ac_help | |
--with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)" | |
t@@ -583,7 +587,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus… | |
# 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:587: checking for a BSD compatible install" >&5 | |
+echo "configure:591: 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 | |
t@@ -636,7 +640,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PRO… | |
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' | |
echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 | |
-echo "configure:640: checking whether build environment is sane" >&5 | |
+echo "configure:644: checking whether build environment is sane" >&5 | |
# Just in case | |
sleep 1 | |
echo timestamp > conftestfile | |
t@@ -693,7 +697,7 @@ test "$program_suffix" != NONE && | |
test "$program_transform_name" = "" && program_transform_name="s,x,x," | |
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 | |
-echo "configure:697: checking whether ${MAKE-make} sets \${MAKE}" >&5 | |
+echo "configure:701: 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"; t… | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
t@@ -739,7 +743,7 @@ EOF | |
missing_dir=`cd $ac_aux_dir && pwd` | |
echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 | |
-echo "configure:743: checking for working aclocal" >&5 | |
+echo "configure:747: checking for working aclocal" >&5 | |
# Run test in a subshell; some versions of sh will print an error if | |
# an executable is not found, even if stderr is redirected. | |
# Redirect stdin to placate older versions of autoconf. Sigh. | |
t@@ -752,7 +756,7 @@ else | |
fi | |
echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 | |
-echo "configure:756: checking for working autoconf" >&5 | |
+echo "configure:760: checking for working autoconf" >&5 | |
# Run test in a subshell; some versions of sh will print an error if | |
# an executable is not found, even if stderr is redirected. | |
# Redirect stdin to placate older versions of autoconf. Sigh. | |
t@@ -765,7 +769,7 @@ else | |
fi | |
echo $ac_n "checking for working automake""... $ac_c" 1>&6 | |
-echo "configure:769: checking for working automake" >&5 | |
+echo "configure:773: checking for working automake" >&5 | |
# Run test in a subshell; some versions of sh will print an error if | |
# an executable is not found, even if stderr is redirected. | |
# Redirect stdin to placate older versions of autoconf. Sigh. | |
t@@ -778,7 +782,7 @@ else | |
fi | |
echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 | |
-echo "configure:782: checking for working autoheader" >&5 | |
+echo "configure:786: checking for working autoheader" >&5 | |
# Run test in a subshell; some versions of sh will print an error if | |
# an executable is not found, even if stderr is redirected. | |
# Redirect stdin to placate older versions of autoconf. Sigh. | |
t@@ -791,7 +795,7 @@ else | |
fi | |
echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 | |
-echo "configure:795: checking for working makeinfo" >&5 | |
+echo "configure:799: checking for working makeinfo" >&5 | |
# Run test in a subshell; some versions of sh will print an error if | |
# an executable is not found, even if stderr is redirected. | |
# Redirect stdin to placate older versions of autoconf. Sigh. | |
t@@ -812,7 +816,7 @@ fi | |
# Extract the first word of "gcc", so it can be a program name with args. | |
set dummy gcc; ac_word=$2 | |
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
-echo "configure:816: checking for $ac_word" >&5 | |
+echo "configure:820: checking for $ac_word" >&5 | |
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
t@@ -842,7 +846,7 @@ if test -z "$CC"; then | |
# Extract the first word of "cc", so it can be a program name with args. | |
set dummy cc; ac_word=$2 | |
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
-echo "configure:846: checking for $ac_word" >&5 | |
+echo "configure:850: checking for $ac_word" >&5 | |
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
t@@ -893,7 +897,7 @@ fi | |
# Extract the first word of "cl", so it can be a program name with args. | |
set dummy cl; ac_word=$2 | |
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
-echo "configure:897: checking for $ac_word" >&5 | |
+echo "configure:901: checking for $ac_word" >&5 | |
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
t@@ -925,7 +929,7 @@ fi | |
fi | |
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... … | |
-echo "configure:929: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) wo… | |
+echo "configure:933: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) wo… | |
ac_ext=c | |
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. | |
t@@ -936,12 +940,12 @@ cross_compiling=$ac_cv_prog_cc_cross | |
cat > conftest.$ac_ext << EOF | |
-#line 940 "configure" | |
+#line 944 "configure" | |
#include "confdefs.h" | |
main(){return(0);} | |
EOF | |
-if { (eval echo configure:945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && … | |
+if { (eval echo configure:949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && … | |
ac_cv_prog_cc_works=yes | |
# If we can't run a trivial program, we are probably using a cross compiler. | |
if (./conftest; exit) 2>/dev/null; then | |
t@@ -967,12 +971,12 @@ if test $ac_cv_prog_cc_works = no; then | |
{ echo "configure: error: installation or configuration problem: C compiler … | |
fi | |
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-… | |
-echo "configure:971: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is… | |
+echo "configure:975: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is… | |
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 | |
cross_compiling=$ac_cv_prog_cc_cross | |
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 | |
-echo "configure:976: checking whether we are using GNU C" >&5 | |
+echo "configure:980: checking whether we are using GNU C" >&5 | |
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
t@@ -981,7 +985,7 @@ else | |
yes; | |
#endif | |
EOF | |
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:985: \"$ac_try\")… | |
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:989: \"$ac_try\")… | |
ac_cv_prog_gcc=yes | |
else | |
ac_cv_prog_gcc=no | |
t@@ -1000,7 +1004,7 @@ ac_test_CFLAGS="${CFLAGS+set}" | |
ac_save_CFLAGS="$CFLAGS" | |
CFLAGS= | |
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 | |
-echo "configure:1004: checking whether ${CC-cc} accepts -g" >&5 | |
+echo "configure:1008: checking whether ${CC-cc} accepts -g" >&5 | |
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
t@@ -1033,7 +1037,7 @@ fi | |
echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6 | |
-echo "configure:1037: checking for strerror in -lcposix" >&5 | |
+echo "configure:1041: checking for strerror in -lcposix" >&5 | |
ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'` | |
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
t@@ -1041,7 +1045,7 @@ else | |
ac_save_LIBS="$LIBS" | |
LIBS="-lcposix $LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 1045 "configure" | |
+#line 1049 "configure" | |
#include "confdefs.h" | |
/* Override any gcc2 internal prototype to avoid an error. */ | |
/* We use char because int might match the return type of a gcc2 | |
t@@ -1052,7 +1056,7 @@ int main() { | |
strerror() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:1056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:1060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_lib_$ac_lib_var=yes" | |
else | |
t@@ -1086,7 +1090,7 @@ fi | |
# 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:1090: checking for a BSD compatible install" >&5 | |
+echo "configure:1094: 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 | |
t@@ -1139,7 +1143,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_P… | |
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' | |
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 | |
-echo "configure:1143: checking whether ${MAKE-make} sets \${MAKE}" >&5 | |
+echo "configure:1147: 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"; t… | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
t@@ -1167,7 +1171,7 @@ fi | |
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 | |
-echo "configure:1171: checking how to run the C preprocessor" >&5 | |
+echo "configure:1175: checking how to run the C preprocessor" >&5 | |
# On Suns, sometimes $CPP names a directory. | |
if test -n "$CPP" && test -d "$CPP"; then | |
CPP= | |
t@@ -1182,13 +1186,13 @@ else | |
# On the NeXT, cc -E runs the code through the compiler's parser, | |
# not just through cpp. | |
cat > conftest.$ac_ext <<EOF | |
-#line 1186 "configure" | |
+#line 1190 "configure" | |
#include "confdefs.h" | |
#include <assert.h> | |
Syntax Error | |
EOF | |
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
-{ (eval echo configure:1192: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
+{ (eval echo configure:1196: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | |
if test -z "$ac_err"; then | |
: | |
t@@ -1199,13 +1203,13 @@ else | |
rm -rf conftest* | |
CPP="${CC-cc} -E -traditional-cpp" | |
cat > conftest.$ac_ext <<EOF | |
-#line 1203 "configure" | |
+#line 1207 "configure" | |
#include "confdefs.h" | |
#include <assert.h> | |
Syntax Error | |
EOF | |
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
-{ (eval echo configure:1209: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
+{ (eval echo configure:1213: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | |
if test -z "$ac_err"; then | |
: | |
t@@ -1216,13 +1220,13 @@ else | |
rm -rf conftest* | |
CPP="${CC-cc} -nologo -E" | |
cat > conftest.$ac_ext <<EOF | |
-#line 1220 "configure" | |
+#line 1224 "configure" | |
#include "confdefs.h" | |
#include <assert.h> | |
Syntax Error | |
EOF | |
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
-{ (eval echo configure:1226: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
+{ (eval echo configure:1230: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | |
if test -z "$ac_err"; then | |
: | |
t@@ -1247,12 +1251,12 @@ fi | |
echo "$ac_t""$CPP" 1>&6 | |
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 | |
-echo "configure:1251: checking for ANSI C header files" >&5 | |
+echo "configure:1255: 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 <<EOF | |
-#line 1256 "configure" | |
+#line 1260 "configure" | |
#include "confdefs.h" | |
#include <stdlib.h> | |
#include <stdarg.h> | |
t@@ -1260,7 +1264,7 @@ else | |
#include <float.h> | |
EOF | |
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
-{ (eval echo configure:1264: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
+{ (eval echo configure:1268: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | |
if test -z "$ac_err"; then | |
rm -rf conftest* | |
t@@ -1277,7 +1281,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 | |
-#line 1281 "configure" | |
+#line 1285 "configure" | |
#include "confdefs.h" | |
#include <string.h> | |
EOF | |
t@@ -1295,7 +1299,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 | |
-#line 1299 "configure" | |
+#line 1303 "configure" | |
#include "confdefs.h" | |
#include <stdlib.h> | |
EOF | |
t@@ -1316,7 +1320,7 @@ if test "$cross_compiling" = yes; then | |
: | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 1320 "configure" | |
+#line 1324 "configure" | |
#include "confdefs.h" | |
#include <ctype.h> | |
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') | |
t@@ -1327,7 +1331,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOU… | |
exit (0); } | |
EOF | |
-if { (eval echo configure:1331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:1335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
: | |
else | |
t@@ -1351,12 +1355,12 @@ EOF | |
fi | |
echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 | |
-echo "configure:1355: checking for sys/wait.h that is POSIX.1 compatible" >&5 | |
+echo "configure:1359: checking for sys/wait.h that is POSIX.1 compatible" >&5 | |
if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 1360 "configure" | |
+#line 1364 "configure" | |
#include "confdefs.h" | |
#include <sys/types.h> | |
#include <sys/wait.h> | |
t@@ -1372,7 +1376,7 @@ wait (&s); | |
s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; | |
; return 0; } | |
EOF | |
-if { (eval echo configure:1376: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:1380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
ac_cv_header_sys_wait_h=yes | |
else | |
t@@ -1396,17 +1400,17 @@ for ac_hdr in fcntl.h sys/time.h unistd.h stdlib.h | |
do | |
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | |
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | |
-echo "configure:1400: checking for $ac_hdr" >&5 | |
+echo "configure:1404: checking for $ac_hdr" >&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 | |
-#line 1405 "configure" | |
+#line 1409 "configure" | |
#include "confdefs.h" | |
#include <$ac_hdr> | |
EOF | |
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
-{ (eval echo configure:1410: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
+{ (eval echo configure:1414: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | |
if test -z "$ac_err"; then | |
rm -rf conftest* | |
t@@ -1434,12 +1438,12 @@ done | |
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $… | |
-echo "configure:1438: checking whether time.h and sys/time.h may both be inclu… | |
+echo "configure:1442: checking whether time.h and sys/time.h may both be inclu… | |
if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 1443 "configure" | |
+#line 1447 "configure" | |
#include "confdefs.h" | |
#include <sys/types.h> | |
#include <sys/time.h> | |
t@@ -1448,7 +1452,7 @@ int main() { | |
struct tm *tp; | |
; return 0; } | |
EOF | |
-if { (eval echo configure:1452: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:1456: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
ac_cv_header_time=yes | |
else | |
t@@ -1469,12 +1473,12 @@ EOF | |
fi | |
echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" … | |
-echo "configure:1473: checking whether struct tm is in sys/time.h or time.h" >… | |
+echo "configure:1477: checking whether struct tm is in sys/time.h or time.h" >… | |
if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 1478 "configure" | |
+#line 1482 "configure" | |
#include "confdefs.h" | |
#include <sys/types.h> | |
#include <time.h> | |
t@@ -1482,7 +1486,7 @@ int main() { | |
struct tm *tp; tp->tm_sec; | |
; return 0; } | |
EOF | |
-if { (eval echo configure:1486: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:1490: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
ac_cv_struct_tm=time.h | |
else | |
t@@ -1510,7 +1514,7 @@ else { echo "configure: error: can not run $ac_config_su… | |
fi | |
echo $ac_n "checking host system type""... $ac_c" 1>&6 | |
-echo "configure:1514: checking host system type" >&5 | |
+echo "configure:1518: checking host system type" >&5 | |
host_alias=$host | |
case "$host_alias" in | |
t@@ -1565,12 +1569,12 @@ fi | |
echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 | |
-echo "configure:1569: checking for Cygwin environment" >&5 | |
+echo "configure:1573: checking for Cygwin environment" >&5 | |
if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 1574 "configure" | |
+#line 1578 "configure" | |
#include "confdefs.h" | |
int main() { | |
t@@ -1581,7 +1585,7 @@ int main() { | |
return __CYGWIN__; | |
; return 0; } | |
EOF | |
-if { (eval echo configure:1585: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:1589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
ac_cv_cygwin=yes | |
else | |
t@@ -1628,7 +1632,281 @@ EOF | |
else | |
echo "$ac_t"""Configuring for Unix binary"" 1>&6 | |
- # Check whether --with-glib-prefix or --without-glib-prefix was given. | |
+ # Check whether --enable-glibtest or --disable-glibtest was given. | |
+if test "${enable_glibtest+set}" = set; then | |
+ enableval="$enable_glibtest" | |
+ : | |
+else | |
+ enable_glibtest=yes | |
+fi | |
+ | |
+ | |
+ pkg_config_args=glib-2.0 | |
+ for module in . | |
+ do | |
+ case "$module" in | |
+ gmodule) | |
+ pkg_config_args="$pkg_config_args gmodule-2.0" | |
+ ;; | |
+ gobject) | |
+ pkg_config_args="$pkg_config_args gobject-2.0" | |
+ ;; | |
+ gthread) | |
+ pkg_config_args="$pkg_config_args gthread-2.0" | |
+ ;; | |
+ esac | |
+ done | |
+ | |
+ # Extract the first word of "pkg-config", so it can be a program name with a… | |
+set dummy pkg-config; ac_word=$2 | |
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
+echo "configure:1664: checking for $ac_word" >&5 | |
+if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | |
+ echo $ac_n "(cached) $ac_c" 1>&6 | |
+else | |
+ case "$PKG_CONFIG" in | |
+ /*) | |
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a … | |
+ ;; | |
+ ?:/*) | |
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a … | |
+ ;; | |
+ *) | |
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" | |
+ ac_dummy="$PATH" | |
+ for ac_dir in $ac_dummy; do | |
+ test -z "$ac_dir" && ac_dir=. | |
+ if test -f $ac_dir/$ac_word; then | |
+ ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" | |
+ break | |
+ fi | |
+ done | |
+ IFS="$ac_save_ifs" | |
+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" | |
+ ;; | |
+esac | |
+fi | |
+PKG_CONFIG="$ac_cv_path_PKG_CONFIG" | |
+if test -n "$PKG_CONFIG"; then | |
+ echo "$ac_t""$PKG_CONFIG" 1>&6 | |
+else | |
+ echo "$ac_t""no" 1>&6 | |
+fi | |
+ | |
+ | |
+ no_glib="" | |
+ | |
+ if test x$PKG_CONFIG != xno ; then | |
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then | |
+ : | |
+ else | |
+ echo *** pkg-config too old; version 0.7 or better required. | |
+ no_glib=yes | |
+ PKG_CONFIG=no | |
+ fi | |
+ else | |
+ no_glib=yes | |
+ fi | |
+ | |
+ min_glib_version=2.0.0 | |
+ echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 | |
+echo "configure:1714: checking for GLIB - version >= $min_glib_version" >&5 | |
+ | |
+ if test x$PKG_CONFIG != xno ; then | |
+ ## don't try to run the test against uninstalled libtool libs | |
+ if $PKG_CONFIG --uninstalled $pkg_config_args; then | |
+ echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" | |
+ enable_glibtest=no | |
+ fi | |
+ | |
+ if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then | |
+ : | |
+ else | |
+ no_glib=yes | |
+ fi | |
+ fi | |
+ | |
+ if test x"$no_glib" = x ; then | |
+ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` | |
+ GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` | |
+ GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` | |
+ | |
+ GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` | |
+ GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` | |
+ glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ | |
+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` | |
+ glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ | |
+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` | |
+ glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ | |
+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` | |
+ if test "x$enable_glibtest" = "xyes" ; then | |
+ ac_save_CFLAGS="$CFLAGS" | |
+ ac_save_LIBS="$LIBS" | |
+ CFLAGS="$CFLAGS $GLIB_CFLAGS" | |
+ LIBS="$GLIB_LIBS $LIBS" | |
+ rm -f conf.glibtest | |
+ if test "$cross_compiling" = yes; then | |
+ echo $ac_n "cross compiling; assumed OK... $ac_c" | |
+else | |
+ cat > conftest.$ac_ext <<EOF | |
+#line 1753 "configure" | |
+#include "confdefs.h" | |
+ | |
+#include <glib.h> | |
+#include <stdio.h> | |
+#include <stdlib.h> | |
+ | |
+int | |
+main () | |
+{ | |
+ int major, minor, micro; | |
+ char *tmp_version; | |
+ | |
+ system ("touch conf.glibtest"); | |
+ | |
+ /* HP/UX 9 (%@#!) writes to sscanf strings */ | |
+ tmp_version = g_strdup("$min_glib_version"); | |
+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { | |
+ printf("%s, bad version string\n", "$min_glib_version"); | |
+ exit(1); | |
+ } | |
+ | |
+ if ((glib_major_version != $glib_config_major_version) || | |
+ (glib_minor_version != $glib_config_minor_version) || | |
+ (glib_micro_version != $glib_config_micro_version)) | |
+ { | |
+ printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but … | |
+ $glib_config_major_version, $glib_config_minor_version, $glib_con… | |
+ glib_major_version, glib_minor_version, glib_micro_version); | |
+ printf ("*** was found! If pkg-config was correct, then it is best\n"); | |
+ printf ("*** to remove the old version of GLib. You may also be able to … | |
+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by… | |
+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\… | |
+ printf("*** required on your system.\n"); | |
+ printf("*** If pkg-config was wrong, set the environment variable PKG_CO… | |
+ printf("*** to point to the correct configuration files\n"); | |
+ } | |
+ else if ((glib_major_version != GLIB_MAJOR_VERSION) || | |
+ (glib_minor_version != GLIB_MINOR_VERSION) || | |
+ (glib_micro_version != GLIB_MICRO_VERSION)) | |
+ { | |
+ printf("*** GLIB header files (version %d.%d.%d) do not match\n", | |
+ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); | |
+ printf("*** library (version %d.%d.%d)\n", | |
+ glib_major_version, glib_minor_version, glib_micro_version); | |
+ } | |
+ else | |
+ { | |
+ if ((glib_major_version > major) || | |
+ ((glib_major_version == major) && (glib_minor_version > minor)) || | |
+ ((glib_major_version == major) && (glib_minor_version == minor) && (gl… | |
+ { | |
+ return 0; | |
+ } | |
+ else | |
+ { | |
+ printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", | |
+ glib_major_version, glib_minor_version, glib_micro_version); | |
+ printf("*** You need a version of GLIB newer than %d.%d.%d. The latest… | |
+ major, minor, micro); | |
+ printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); | |
+ printf("***\n"); | |
+ printf("*** If you have already installed a sufficiently new version, … | |
+ printf("*** probably means that the wrong copy of the pkg-config shell… | |
+ printf("*** being found. The easiest way to fix this is to remove the … | |
+ printf("*** of GLIB, but you can also set the PKG_CONFIG environment t… | |
+ printf("*** correct copy of pkg-config. (In this case, you will have t… | |
+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /… | |
+ printf("*** so that the correct libraries are found at run-time))\n"); | |
+ } | |
+ } | |
+ return 1; | |
+} | |
+ | |
+EOF | |
+if { (eval echo configure:1828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+then | |
+ : | |
+else | |
+ echo "configure: failed program was:" >&5 | |
+ cat conftest.$ac_ext >&5 | |
+ rm -fr conftest* | |
+ no_glib=yes | |
+fi | |
+rm -fr conftest* | |
+fi | |
+ | |
+ CFLAGS="$ac_save_CFLAGS" | |
+ LIBS="$ac_save_LIBS" | |
+ fi | |
+ fi | |
+ if test "x$no_glib" = x ; then | |
+ echo "$ac_t""yes (version $glib_config_major_version.$glib_config_minor_v… | |
+ glib2_found="yes" | |
+ else | |
+ echo "$ac_t""no" 1>&6 | |
+ if test "$PKG_CONFIG" = "no" ; then | |
+ echo "*** A new enough version of pkg-config was not found." | |
+ echo "*** See http://www.freedesktop.org/software/pkgconfig/" | |
+ else | |
+ if test -f conf.glibtest ; then | |
+ : | |
+ else | |
+ echo "*** Could not run GLIB test program, checking why..." | |
+ CFLAGS="$CFLAGS $GLIB_CFLAGS" | |
+ LIBS="$LIBS $GLIB_LIBS" | |
+ cat > conftest.$ac_ext <<EOF | |
+#line 1860 "configure" | |
+#include "confdefs.h" | |
+ | |
+#include <glib.h> | |
+#include <stdio.h> | |
+ | |
+int main() { | |
+ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version))… | |
+; return 0; } | |
+EOF | |
+if { (eval echo configure:1870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+ rm -rf conftest* | |
+ echo "*** The test program compiled, but did not run. This usually means" | |
+ echo "*** that the run-time linker is not finding GLIB or finding th… | |
+ echo "*** version of GLIB. If it is not finding GLIB, you'll need to… | |
+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.c… | |
+ echo "*** to the installed location Also, make sure you have run ld… | |
+ echo "*** is required on your system" | |
+ echo "***" | |
+ echo "*** If you have an old version installed, it is best to remove… | |
+ echo "*** you may also be able to get things to work by modifying LD… | |
+else | |
+ echo "configure: failed program was:" >&5 | |
+ cat conftest.$ac_ext >&5 | |
+ rm -rf conftest* | |
+ echo "*** The test program failed to compile or link. See the file config.l… | |
+ echo "*** exact error that occured. This usually means GLIB was inco… | |
+ echo "*** or that you have moved GLIB since it was installed. In the… | |
+ echo "*** may want to edit the pkg-config script: $PKG_CONFIG" | |
+fi | |
+rm -f conftest* | |
+ CFLAGS="$ac_save_CFLAGS" | |
+ LIBS="$ac_save_LIBS" | |
+ fi | |
+ fi | |
+ GLIB_CFLAGS="" | |
+ GLIB_LIBS="" | |
+ GLIB_GENMARSHAL="" | |
+ GOBJECT_QUERY="" | |
+ GLIB_MKENUMS="" | |
+ glib2_found="no" | |
+ fi | |
+ | |
+ | |
+ | |
+ | |
+ | |
+ rm -f conf.glibtest | |
+ | |
+ if test "$glib2_found" = "no" ; then | |
+ # Check whether --with-glib-prefix or --without-glib-prefix was given. | |
if test "${with_glib_prefix+set}" = set; then | |
withval="$with_glib_prefix" | |
glib_config_prefix="$withval" | |
t@@ -1681,7 +1959,7 @@ fi | |
# Extract the first word of "glib-config", so it can be a program name with … | |
set dummy glib-config; ac_word=$2 | |
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
-echo "configure:1685: checking for $ac_word" >&5 | |
+echo "configure:1963: checking for $ac_word" >&5 | |
if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
t@@ -1716,7 +1994,7 @@ fi | |
min_glib_version=1.2.0 | |
echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 | |
-echo "configure:1720: checking for GLIB - version >= $min_glib_version" >&5 | |
+echo "configure:1998: checking for GLIB - version >= $min_glib_version" >&5 | |
no_glib="" | |
if test "$GLIB_CONFIG" = "no" ; then | |
no_glib=yes | |
t@@ -1739,7 +2017,7 @@ echo "configure:1720: checking for GLIB - version >= $mi… | |
echo $ac_n "cross compiling; assumed OK... $ac_c" | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 1743 "configure" | |
+#line 2021 "configure" | |
#include "confdefs.h" | |
#include <glib.h> | |
t@@ -1815,7 +2093,7 @@ main () | |
} | |
EOF | |
-if { (eval echo configure:1819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:2097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
: | |
else | |
t@@ -1849,7 +2127,7 @@ fi | |
CFLAGS="$CFLAGS $GLIB_CFLAGS" | |
LIBS="$LIBS $GLIB_LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 1853 "configure" | |
+#line 2131 "configure" | |
#include "confdefs.h" | |
#include <glib.h> | |
t@@ -1859,7 +2137,7 @@ int main() { | |
return ((glib_major_version) || (glib_minor_version) || (glib_micro_version))… | |
; return 0; } | |
EOF | |
-if { (eval echo configure:1863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:2141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
echo "*** The test program compiled, but did not run. This usually means" | |
echo "*** that the run-time linker is not finding GLIB or finding th… | |
t@@ -1897,10 +2175,11 @@ rm -f conftest* | |
rm -f conf.glibtest | |
+ fi | |
if test "$CURSES_CLIENT" != "no" ; then | |
echo $ac_n "checking for newterm in -lncurses""... $ac_c" 1>&6 | |
-echo "configure:1904: checking for newterm in -lncurses" >&5 | |
+echo "configure:2183: checking for newterm in -lncurses" >&5 | |
ac_lib_var=`echo ncurses'_'newterm | sed 'y%./+-%__p_%'` | |
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
t@@ -1908,7 +2187,7 @@ else | |
ac_save_LIBS="$LIBS" | |
LIBS="-lncurses $LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 1912 "configure" | |
+#line 2191 "configure" | |
#include "confdefs.h" | |
/* Override any gcc2 internal prototype to avoid an error. */ | |
/* We use char because int might match the return type of a gcc2 | |
t@@ -1919,7 +2198,7 @@ int main() { | |
newterm() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:1923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:2202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_lib_$ac_lib_var=yes" | |
else | |
t@@ -1948,7 +2227,7 @@ fi | |
if test "$ac_cv_lib_ncurses_newterm" = "no" ; then | |
echo $ac_n "checking for newterm in -lcurses""... $ac_c" 1>&6 | |
-echo "configure:1952: checking for newterm in -lcurses" >&5 | |
+echo "configure:2231: checking for newterm in -lcurses" >&5 | |
ac_lib_var=`echo curses'_'newterm | sed 'y%./+-%__p_%'` | |
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
t@@ -1956,7 +2235,7 @@ else | |
ac_save_LIBS="$LIBS" | |
LIBS="-lcurses $LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 1960 "configure" | |
+#line 2239 "configure" | |
#include "confdefs.h" | |
/* Override any gcc2 internal prototype to avoid an error. */ | |
/* We use char because int might match the return type of a gcc2 | |
t@@ -1967,7 +2246,7 @@ int main() { | |
newterm() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:1971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:2250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_lib_$ac_lib_var=yes" | |
else | |
t@@ -1996,7 +2275,7 @@ fi | |
if test "$ac_cv_lib_curses_newterm" = "no" ; then | |
echo $ac_n "checking for newterm in -lcur_colr""... $ac_c" 1>&6 | |
-echo "configure:2000: checking for newterm in -lcur_colr" >&5 | |
+echo "configure:2279: checking for newterm in -lcur_colr" >&5 | |
ac_lib_var=`echo cur_colr'_'newterm | sed 'y%./+-%__p_%'` | |
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
t@@ -2004,7 +2283,7 @@ else | |
ac_save_LIBS="$LIBS" | |
LIBS="-lcur_colr $LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 2008 "configure" | |
+#line 2287 "configure" | |
#include "confdefs.h" | |
/* Override any gcc2 internal prototype to avoid an error. */ | |
/* We use char because int might match the return type of a gcc2 | |
t@@ -2015,7 +2294,7 @@ int main() { | |
newterm() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:2019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:2298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_lib_$ac_lib_var=yes" | |
else | |
t@@ -2055,7 +2334,267 @@ fi | |
fi | |
if test "$GUI_CLIENT" != "no" -o "$GUI_SERVER" != "no"; then | |
- # Check whether --with-gtk-prefix or --without-gtk-prefix was give… | |
+ # Check whether --enable-gtktest or --disable-gtktest was given. | |
+if test "${enable_gtktest+set}" = set; then | |
+ enableval="$enable_gtktest" | |
+ : | |
+else | |
+ enable_gtktest=yes | |
+fi | |
+ | |
+ | |
+ pkg_config_args=gtk+-2.0 | |
+ for module in . | |
+ do | |
+ case "$module" in | |
+ gthread) | |
+ pkg_config_args="$pkg_config_args gthread-2.0" | |
+ ;; | |
+ esac | |
+ done | |
+ | |
+ no_gtk="" | |
+ | |
+ # Extract the first word of "pkg-config", so it can be a program name with a… | |
+set dummy pkg-config; ac_word=$2 | |
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
+echo "configure:2362: checking for $ac_word" >&5 | |
+if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | |
+ echo $ac_n "(cached) $ac_c" 1>&6 | |
+else | |
+ case "$PKG_CONFIG" in | |
+ /*) | |
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a … | |
+ ;; | |
+ ?:/*) | |
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a … | |
+ ;; | |
+ *) | |
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" | |
+ ac_dummy="$PATH" | |
+ for ac_dir in $ac_dummy; do | |
+ test -z "$ac_dir" && ac_dir=. | |
+ if test -f $ac_dir/$ac_word; then | |
+ ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" | |
+ break | |
+ fi | |
+ done | |
+ IFS="$ac_save_ifs" | |
+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" | |
+ ;; | |
+esac | |
+fi | |
+PKG_CONFIG="$ac_cv_path_PKG_CONFIG" | |
+if test -n "$PKG_CONFIG"; then | |
+ echo "$ac_t""$PKG_CONFIG" 1>&6 | |
+else | |
+ echo "$ac_t""no" 1>&6 | |
+fi | |
+ | |
+ | |
+ if test x$PKG_CONFIG != xno ; then | |
+ if pkg-config --atleast-pkgconfig-version 0.7 ; then | |
+ : | |
+ else | |
+ echo *** pkg-config too old; version 0.7 or better required. | |
+ no_gtk=yes | |
+ PKG_CONFIG=no | |
+ fi | |
+ else | |
+ no_gtk=yes | |
+ fi | |
+ | |
+ min_gtk_version=2.0.0 | |
+ echo $ac_n "checking for GTK+ - version >= $min_gtk_version""... $ac_c" 1>&6 | |
+echo "configure:2410: checking for GTK+ - version >= $min_gtk_version" >&5 | |
+ | |
+ if test x$PKG_CONFIG != xno ; then | |
+ ## don't try to run the test against uninstalled libtool libs | |
+ if $PKG_CONFIG --uninstalled $pkg_config_args; then | |
+ echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH" | |
+ enable_gtktest=no | |
+ fi | |
+ | |
+ if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then | |
+ : | |
+ else | |
+ no_gtk=yes | |
+ fi | |
+ fi | |
+ | |
+ if test x"$no_gtk" = x ; then | |
+ GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags` | |
+ GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs` | |
+ gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ | |
+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` | |
+ gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ | |
+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` | |
+ gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ | |
+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` | |
+ if test "x$enable_gtktest" = "xyes" ; then | |
+ ac_save_CFLAGS="$CFLAGS" | |
+ ac_save_LIBS="$LIBS" | |
+ CFLAGS="$CFLAGS $GTK_CFLAGS" | |
+ LIBS="$GTK_LIBS $LIBS" | |
+ rm -f conf.gtktest | |
+ if test "$cross_compiling" = yes; then | |
+ echo $ac_n "cross compiling; assumed OK... $ac_c" | |
+else | |
+ cat > conftest.$ac_ext <<EOF | |
+#line 2445 "configure" | |
+#include "confdefs.h" | |
+ | |
+#include <gtk/gtk.h> | |
+#include <stdio.h> | |
+#include <stdlib.h> | |
+ | |
+int | |
+main () | |
+{ | |
+ int major, minor, micro; | |
+ char *tmp_version; | |
+ | |
+ system ("touch conf.gtktest"); | |
+ | |
+ /* HP/UX 9 (%@#!) writes to sscanf strings */ | |
+ tmp_version = g_strdup("$min_gtk_version"); | |
+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { | |
+ printf("%s, bad version string\n", "$min_gtk_version"); | |
+ exit(1); | |
+ } | |
+ | |
+ if ((gtk_major_version != $gtk_config_major_version) || | |
+ (gtk_minor_version != $gtk_config_minor_version) || | |
+ (gtk_micro_version != $gtk_config_micro_version)) | |
+ { | |
+ printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but … | |
+ $gtk_config_major_version, $gtk_config_minor_version, $gtk_config… | |
+ gtk_major_version, gtk_minor_version, gtk_micro_version); | |
+ printf ("*** was found! If pkg-config was correct, then it is best\n"); | |
+ printf ("*** to remove the old version of GTK+. You may also be able to … | |
+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by… | |
+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\… | |
+ printf("*** required on your system.\n"); | |
+ printf("*** If pkg-config was wrong, set the environment variable PKG_CO… | |
+ printf("*** to point to the correct configuration files\n"); | |
+ } | |
+ else if ((gtk_major_version != GTK_MAJOR_VERSION) || | |
+ (gtk_minor_version != GTK_MINOR_VERSION) || | |
+ (gtk_micro_version != GTK_MICRO_VERSION)) | |
+ { | |
+ printf("*** GTK+ header files (version %d.%d.%d) do not match\n", | |
+ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); | |
+ printf("*** library (version %d.%d.%d)\n", | |
+ gtk_major_version, gtk_minor_version, gtk_micro_version); | |
+ } | |
+ else | |
+ { | |
+ if ((gtk_major_version > major) || | |
+ ((gtk_major_version == major) && (gtk_minor_version > minor)) || | |
+ ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_… | |
+ { | |
+ return 0; | |
+ } | |
+ else | |
+ { | |
+ printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", | |
+ gtk_major_version, gtk_minor_version, gtk_micro_version); | |
+ printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest… | |
+ major, minor, micro); | |
+ printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); | |
+ printf("***\n"); | |
+ printf("*** If you have already installed a sufficiently new version, … | |
+ printf("*** probably means that the wrong copy of the pkg-config shell… | |
+ printf("*** being found. The easiest way to fix this is to remove the … | |
+ printf("*** of GTK+, but you can also set the PKG_CONFIG environment t… | |
+ printf("*** correct copy of pkg-config. (In this case, you will have t… | |
+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /… | |
+ printf("*** so that the correct libraries are found at run-time))\n"); | |
+ } | |
+ } | |
+ return 1; | |
+} | |
+ | |
+EOF | |
+if { (eval echo configure:2520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+then | |
+ : | |
+else | |
+ echo "configure: failed program was:" >&5 | |
+ cat conftest.$ac_ext >&5 | |
+ rm -fr conftest* | |
+ no_gtk=yes | |
+fi | |
+rm -fr conftest* | |
+fi | |
+ | |
+ CFLAGS="$ac_save_CFLAGS" | |
+ LIBS="$ac_save_LIBS" | |
+ fi | |
+ fi | |
+ if test "x$no_gtk" = x ; then | |
+ echo "$ac_t""yes (version $gtk_config_major_version.$gtk_config_minor_ver… | |
+ gtk2_found="yes" | |
+ else | |
+ echo "$ac_t""no" 1>&6 | |
+ if test "$PKG_CONFIG" = "no" ; then | |
+ echo "*** A new enough version of pkg-config was not found." | |
+ echo "*** See http://pkgconfig.sourceforge.net" | |
+ else | |
+ if test -f conf.gtktest ; then | |
+ : | |
+ else | |
+ echo "*** Could not run GTK+ test program, checking why..." | |
+ CFLAGS="$CFLAGS $GTK_CFLAGS" | |
+ LIBS="$LIBS $GTK_LIBS" | |
+ cat > conftest.$ac_ext <<EOF | |
+#line 2552 "configure" | |
+#include "confdefs.h" | |
+ | |
+#include <gtk/gtk.h> | |
+#include <stdio.h> | |
+ | |
+int main() { | |
+ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); | |
+; return 0; } | |
+EOF | |
+if { (eval echo configure:2562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+ rm -rf conftest* | |
+ echo "*** The test program compiled, but did not run. This usually means" | |
+ echo "*** that the run-time linker is not finding GTK+ or finding th… | |
+ echo "*** version of GTK+. If it is not finding GTK+, you'll need to… | |
+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.c… | |
+ echo "*** to the installed location Also, make sure you have run ld… | |
+ echo "*** is required on your system" | |
+ echo "***" | |
+ echo "*** If you have an old version installed, it is best to remove… | |
+ echo "*** you may also be able to get things to work by modifying LD… | |
+else | |
+ echo "configure: failed program was:" >&5 | |
+ cat conftest.$ac_ext >&5 | |
+ rm -rf conftest* | |
+ echo "*** The test program failed to compile or link. See the file config.l… | |
+ echo "*** exact error that occured. This usually means GTK+ was inco… | |
+ echo "*** or that you have moved GTK+ since it was installed. In the… | |
+ echo "*** may want to edit the pkg-config script: $PKG_CONFIG" | |
+fi | |
+rm -f conftest* | |
+ CFLAGS="$ac_save_CFLAGS" | |
+ LIBS="$ac_save_LIBS" | |
+ fi | |
+ fi | |
+ GTK_CFLAGS="" | |
+ GTK_LIBS="" | |
+ gtk2_found="no" | |
+ fi | |
+ | |
+ | |
+ rm -f conf.gtktest | |
+ | |
+ if test "$gtk2_found" = "yes" ; then | |
+ HAVE_FIXED_GTK="yes" | |
+ else | |
+ # Check whether --with-gtk-prefix or --without-gtk-prefix was given. | |
if test "${with_gtk_prefix+set}" = set; then | |
withval="$with_gtk_prefix" | |
gtk_config_prefix="$withval" | |
t@@ -2105,7 +2644,7 @@ fi | |
# Extract the first word of "gtk-config", so it can be a program name with a… | |
set dummy gtk-config; ac_word=$2 | |
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
-echo "configure:2109: checking for $ac_word" >&5 | |
+echo "configure:2648: checking for $ac_word" >&5 | |
if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
t@@ -2140,7 +2679,7 @@ fi | |
min_gtk_version=1.2.0 | |
echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 | |
-echo "configure:2144: checking for GTK - version >= $min_gtk_version" >&5 | |
+echo "configure:2683: checking for GTK - version >= $min_gtk_version" >&5 | |
no_gtk="" | |
if test "$GTK_CONFIG" = "no" ; then | |
no_gtk=yes | |
t@@ -2163,7 +2702,7 @@ echo "configure:2144: checking for GTK - version >= $min… | |
echo $ac_n "cross compiling; assumed OK... $ac_c" | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 2167 "configure" | |
+#line 2706 "configure" | |
#include "confdefs.h" | |
#include <gtk/gtk.h> | |
t@@ -2241,7 +2780,7 @@ main () | |
} | |
EOF | |
-if { (eval echo configure:2245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:2784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
: | |
else | |
t@@ -2275,7 +2814,7 @@ fi | |
CFLAGS="$CFLAGS $GTK_CFLAGS" | |
LIBS="$LIBS $GTK_LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 2279 "configure" | |
+#line 2818 "configure" | |
#include "confdefs.h" | |
#include <gtk/gtk.h> | |
t@@ -2285,7 +2824,7 @@ int main() { | |
return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:2289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:2828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
echo "*** The test program compiled, but did not run. This usually means" | |
echo "*** that the run-time linker is not finding GTK or finding the… | |
t@@ -2323,42 +2862,40 @@ rm -f conftest* | |
rm -f conf.gtktest | |
- if test "$gtk_found" = "no" ; then | |
- if test "$GUI_CLIENT" = "yes" -o "$GUI_SERVER" = "yes" ; then | |
- { echo "configure: error: Cannot find GTK+" 1>&2; exit 1; } | |
- else | |
- echo "configure: warning: Cannot find GTK+" 1>&2 | |
- GUI_CLIENT="no" | |
- GUI_SERVER="no" | |
- fi | |
- else | |
- echo $ac_n "checking for non-buggy GTK+ ( >= 1.2.10 )""... $ac_c" 1>&6 | |
-echo "configure:2337: checking for non-buggy GTK+ ( >= 1.2.10 )" >&5 | |
- if test "$gtk_config_major_version" -gt 1 ; then | |
- HAVE_FIXED_GTK="yes" | |
- elif test "$gtk_config_major_version" -eq 1 ; then | |
- if test "$gtk_config_minor_version" -gt 2 ; then | |
- HAVE_FIXED_GTK="yes" | |
- elif test "$gtk_config_minor_version" -eq 2 -a \ | |
- "$gtk_config_micro_version" -ge 10 ; then | |
- HAVE_FIXED_GTK="yes" | |
- fi | |
- fi | |
- echo "$ac_t"""$HAVE_FIXED_GTK"" 1>&6 | |
- fi | |
+ if test "$gtk_found" = "no" ; then | |
+ if test "$GUI_CLIENT" = "yes" -o "$GUI_SERVER" = "yes" ; then | |
+ { echo "configure: error: Cannot find GTK+" 1>&2; exit 1; } | |
+ else | |
+ echo "configure: warning: Cannot find GTK+" 1>&2 | |
+ GUI_CLIENT="no" | |
+ GUI_SERVER="no" | |
+ fi | |
+ else | |
+ echo $ac_n "checking for non-buggy GTK+ ( >= 1.2.10 )""... $ac_c" 1… | |
+echo "configure:2876: checking for non-buggy GTK+ ( >= 1.2.10 )" >&5 | |
+ if test "$gtk_config_major_version" -gt 1 ; then | |
+ HAVE_FIXED_GTK="yes" | |
+ elif test "$gtk_config_major_version" -eq 1 ; then | |
+ if test "$gtk_config_minor_version" -gt 2 ; then | |
+ HAVE_FIXED_GTK="yes" | |
+ elif test "$gtk_config_minor_version" -eq 2 -a \ | |
+ "$gtk_config_micro_version" -ge 10 ; then | |
+ HAVE_FIXED_GTK="yes" | |
+ fi | |
+ fi | |
+ echo "$ac_t"""$HAVE_FIXED_GTK"" 1>&6 | |
+ fi | |
+ fi | |
fi | |
- CFLAGS="$CFLAGS `glib-config --cflags`" | |
- LDFLAGS="$LDFLAGS `glib-config --libs`" | |
- | |
if test "$GUI_SERVER" = "probe"; then | |
GUI_SERVER="no" | |
fi | |
echo $ac_n "checking for socklen_t data type""... $ac_c" 1>&6 | |
-echo "configure:2360: checking for socklen_t data type" >&5 | |
+echo "configure:2897: checking for socklen_t data type" >&5 | |
cat > conftest.$ac_ext <<EOF | |
-#line 2362 "configure" | |
+#line 2899 "configure" | |
#include "confdefs.h" | |
#include <sys/types.h> | |
#include <sys/socket.h> | |
t@@ -2366,7 +2903,7 @@ int main() { | |
socklen_t val | |
; return 0; } | |
EOF | |
-if { (eval echo configure:2370: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:2907: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
echo "$ac_t""yes" 1>&6 | |
cat >> confdefs.h <<\EOF | |
t@@ -2393,7 +2930,7 @@ ALL_LINGUAS="de pl pt_BR fr" | |
# Extract the first word of "ranlib", so it can be a program name with args. | |
set dummy ranlib; ac_word=$2 | |
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
-echo "configure:2397: checking for $ac_word" >&5 | |
+echo "configure:2934: checking for $ac_word" >&5 | |
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
t@@ -2421,12 +2958,12 @@ else | |
fi | |
echo $ac_n "checking for working const""... $ac_c" 1>&6 | |
-echo "configure:2425: checking for working const" >&5 | |
+echo "configure:2962: 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 <<EOF | |
-#line 2430 "configure" | |
+#line 2967 "configure" | |
#include "confdefs.h" | |
int main() { | |
t@@ -2475,7 +3012,7 @@ ccp = (char const *const *) p; | |
; return 0; } | |
EOF | |
-if { (eval echo configure:2479: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:3016: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
ac_cv_c_const=yes | |
else | |
t@@ -2496,21 +3033,21 @@ EOF | |
fi | |
echo $ac_n "checking for inline""... $ac_c" 1>&6 | |
-echo "configure:2500: checking for inline" >&5 | |
+echo "configure:3037: checking for inline" >&5 | |
if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
ac_cv_c_inline=no | |
for ac_kw in inline __inline__ __inline; do | |
cat > conftest.$ac_ext <<EOF | |
-#line 2507 "configure" | |
+#line 3044 "configure" | |
#include "confdefs.h" | |
int main() { | |
} $ac_kw foo() { | |
; return 0; } | |
EOF | |
-if { (eval echo configure:2514: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:3051: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
ac_cv_c_inline=$ac_kw; break | |
else | |
t@@ -2536,12 +3073,12 @@ EOF | |
esac | |
echo $ac_n "checking for off_t""... $ac_c" 1>&6 | |
-echo "configure:2540: checking for off_t" >&5 | |
+echo "configure:3077: checking for off_t" >&5 | |
if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 2545 "configure" | |
+#line 3082 "configure" | |
#include "confdefs.h" | |
#include <sys/types.h> | |
#if STDC_HEADERS | |
t@@ -2569,12 +3106,12 @@ EOF | |
fi | |
echo $ac_n "checking for size_t""... $ac_c" 1>&6 | |
-echo "configure:2573: checking for size_t" >&5 | |
+echo "configure:3110: checking for size_t" >&5 | |
if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 2578 "configure" | |
+#line 3115 "configure" | |
#include "confdefs.h" | |
#include <sys/types.h> | |
#if STDC_HEADERS | |
t@@ -2604,19 +3141,19 @@ fi | |
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works | |
# for constant arguments. Useless! | |
echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 | |
-echo "configure:2608: checking for working alloca.h" >&5 | |
+echo "configure:3145: checking for working alloca.h" >&5 | |
if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 2613 "configure" | |
+#line 3150 "configure" | |
#include "confdefs.h" | |
#include <alloca.h> | |
int main() { | |
char *p = alloca(2 * sizeof(int)); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:2620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_header_alloca_h=yes | |
else | |
t@@ -2637,12 +3174,12 @@ EOF | |
fi | |
echo $ac_n "checking for alloca""... $ac_c" 1>&6 | |
-echo "configure:2641: checking for alloca" >&5 | |
+echo "configure:3178: checking for alloca" >&5 | |
if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 2646 "configure" | |
+#line 3183 "configure" | |
#include "confdefs.h" | |
#ifdef __GNUC__ | |
t@@ -2670,7 +3207,7 @@ int main() { | |
char *p = (char *) alloca(1); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:2674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_func_alloca_works=yes | |
else | |
t@@ -2702,12 +3239,12 @@ EOF | |
echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 | |
-echo "configure:2706: checking whether alloca needs Cray hooks" >&5 | |
+echo "configure:3243: checking whether alloca needs Cray hooks" >&5 | |
if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 2711 "configure" | |
+#line 3248 "configure" | |
#include "confdefs.h" | |
#if defined(CRAY) && ! defined(CRAY2) | |
webecray | |
t@@ -2732,12 +3269,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6 | |
if test $ac_cv_os_cray = yes; then | |
for ac_func in _getb67 GETB67 getb67; do | |
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
-echo "configure:2736: checking for $ac_func" >&5 | |
+echo "configure:3273: checking for $ac_func" >&5 | |
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 2741 "configure" | |
+#line 3278 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char $ac_func(); below. */ | |
t@@ -2760,7 +3297,7 @@ $ac_func(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:2764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_$ac_func=yes" | |
else | |
t@@ -2787,7 +3324,7 @@ done | |
fi | |
echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 | |
-echo "configure:2791: checking stack direction for C alloca" >&5 | |
+echo "configure:3328: checking stack direction for C alloca" >&5 | |
if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
t@@ -2795,7 +3332,7 @@ else | |
ac_cv_c_stack_direction=0 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 2799 "configure" | |
+#line 3336 "configure" | |
#include "confdefs.h" | |
find_stack_direction () | |
{ | |
t@@ -2814,7 +3351,7 @@ main () | |
exit (find_stack_direction() < 0); | |
} | |
EOF | |
-if { (eval echo configure:2818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
ac_cv_c_stack_direction=1 | |
else | |
t@@ -2839,17 +3376,17 @@ for ac_hdr in stdlib.h unistd.h sys/stat.h sys/types.h | |
do | |
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | |
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | |
-echo "configure:2843: checking for $ac_hdr" >&5 | |
+echo "configure:3380: checking for $ac_hdr" >&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 | |
-#line 2848 "configure" | |
+#line 3385 "configure" | |
#include "confdefs.h" | |
#include <$ac_hdr> | |
EOF | |
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
-{ (eval echo configure:2853: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
+{ (eval echo configure:3390: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | |
if test -z "$ac_err"; then | |
rm -rf conftest* | |
t@@ -2878,12 +3415,12 @@ done | |
for ac_func in getpagesize | |
do | |
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
-echo "configure:2882: checking for $ac_func" >&5 | |
+echo "configure:3419: checking for $ac_func" >&5 | |
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 2887 "configure" | |
+#line 3424 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char $ac_func(); below. */ | |
t@@ -2906,7 +3443,7 @@ $ac_func(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:2910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_$ac_func=yes" | |
else | |
t@@ -2931,7 +3468,7 @@ fi | |
done | |
echo $ac_n "checking for working mmap""... $ac_c" 1>&6 | |
-echo "configure:2935: checking for working mmap" >&5 | |
+echo "configure:3472: checking for working mmap" >&5 | |
if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
t@@ -2939,7 +3476,7 @@ else | |
ac_cv_func_mmap_fixed_mapped=no | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 2943 "configure" | |
+#line 3480 "configure" | |
#include "confdefs.h" | |
/* Thanks to Mike Haertel and Jim Avera for this test. | |
t@@ -3092,7 +3629,7 @@ main() | |
} | |
EOF | |
-if { (eval echo configure:3096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
ac_cv_func_mmap_fixed_mapped=yes | |
else | |
t@@ -3116,12 +3653,12 @@ fi | |
echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""… | |
-echo "configure:3120: checking whether we are using the GNU C Library 2.1 or n… | |
+echo "configure:3657: checking whether we are using the GNU C Library 2.1 or n… | |
if eval "test \"`echo '$''{'ac_cv_gnu_library_2_1'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 3125 "configure" | |
+#line 3662 "configure" | |
#include "confdefs.h" | |
#include <features.h> | |
t@@ -3157,17 +3694,17 @@ stdlib.h string.h unistd.h sys/param.h | |
do | |
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | |
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | |
-echo "configure:3161: checking for $ac_hdr" >&5 | |
+echo "configure:3698: checking for $ac_hdr" >&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 | |
-#line 3166 "configure" | |
+#line 3703 "configure" | |
#include "confdefs.h" | |
#include <$ac_hdr> | |
EOF | |
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
-{ (eval echo configure:3171: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
+{ (eval echo configure:3708: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | |
if test -z "$ac_err"; then | |
rm -rf conftest* | |
t@@ -3198,12 +3735,12 @@ getgid getuid mempcpy munmap putenv setenv setlocale s… | |
strdup strtoul tsearch __argz_count __argz_stringify __argz_next | |
do | |
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
-echo "configure:3202: checking for $ac_func" >&5 | |
+echo "configure:3739: checking for $ac_func" >&5 | |
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 3207 "configure" | |
+#line 3744 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char $ac_func(); below. */ | |
t@@ -3226,7 +3763,7 @@ $ac_func(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_$ac_func=yes" | |
else | |
t@@ -3266,7 +3803,7 @@ fi | |
echo $ac_n "checking for iconv""... $ac_c" 1>&6 | |
-echo "configure:3270: checking for iconv" >&5 | |
+echo "configure:3807: checking for iconv" >&5 | |
if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
t@@ -3274,7 +3811,7 @@ else | |
am_cv_func_iconv="no, consider installing GNU libiconv" | |
am_cv_lib_iconv=no | |
cat > conftest.$ac_ext <<EOF | |
-#line 3278 "configure" | |
+#line 3815 "configure" | |
#include "confdefs.h" | |
#include <stdlib.h> | |
#include <iconv.h> | |
t@@ -3284,7 +3821,7 @@ iconv_t cd = iconv_open("",""); | |
iconv_close(cd); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
am_cv_func_iconv=yes | |
else | |
t@@ -3296,7 +3833,7 @@ rm -f conftest* | |
am_save_LIBS="$LIBS" | |
LIBS="$LIBS -liconv" | |
cat > conftest.$ac_ext <<EOF | |
-#line 3300 "configure" | |
+#line 3837 "configure" | |
#include "confdefs.h" | |
#include <stdlib.h> | |
#include <iconv.h> | |
t@@ -3306,7 +3843,7 @@ iconv_t cd = iconv_open("",""); | |
iconv_close(cd); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
am_cv_lib_iconv=yes | |
am_cv_func_iconv=yes | |
t@@ -3327,13 +3864,13 @@ echo "$ac_t""$am_cv_func_iconv" 1>&6 | |
EOF | |
echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6 | |
-echo "configure:3331: checking for iconv declaration" >&5 | |
+echo "configure:3868: checking for iconv declaration" >&5 | |
if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 3337 "configure" | |
+#line 3874 "configure" | |
#include "confdefs.h" | |
#include <stdlib.h> | |
t@@ -3352,7 +3889,7 @@ int main() { | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3356: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
+if { (eval echo configure:3893: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5… | |
rm -rf conftest* | |
am_cv_proto_iconv_arg1="" | |
else | |
t@@ -3381,19 +3918,19 @@ EOF | |
echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 | |
-echo "configure:3385: checking for nl_langinfo and CODESET" >&5 | |
+echo "configure:3922: checking for nl_langinfo and CODESET" >&5 | |
if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 3390 "configure" | |
+#line 3927 "configure" | |
#include "confdefs.h" | |
#include <langinfo.h> | |
int main() { | |
char* cs = nl_langinfo(CODESET); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
am_cv_langinfo_codeset=yes | |
else | |
t@@ -3416,19 +3953,19 @@ EOF | |
if test $ac_cv_header_locale_h = yes; then | |
echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 | |
-echo "configure:3420: checking for LC_MESSAGES" >&5 | |
+echo "configure:3957: checking for LC_MESSAGES" >&5 | |
if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 3425 "configure" | |
+#line 3962 "configure" | |
#include "confdefs.h" | |
#include <locale.h> | |
int main() { | |
return LC_MESSAGES | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:3969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
am_cv_val_LC_MESSAGES=yes | |
else | |
t@@ -3449,7 +3986,7 @@ EOF | |
fi | |
fi | |
echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 | |
-echo "configure:3453: checking whether NLS is requested" >&5 | |
+echo "configure:3990: checking whether NLS is requested" >&5 | |
# Check whether --enable-nls or --disable-nls was given. | |
if test "${enable_nls+set}" = set; then | |
enableval="$enable_nls" | |
t@@ -3471,7 +4008,7 @@ fi | |
EOF | |
echo $ac_n "checking whether included gettext is requested""... $ac_c" 1… | |
-echo "configure:3475: checking whether included gettext is requested" >&5 | |
+echo "configure:4012: checking whether included gettext is requested" >&5 | |
# Check whether --with-included-gettext or --without-included-gettext wa… | |
if test "${with_included_gettext+set}" = set; then | |
withval="$with_included_gettext" | |
t@@ -3491,17 +4028,17 @@ fi | |
ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` | |
echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 | |
-echo "configure:3495: checking for libintl.h" >&5 | |
+echo "configure:4032: checking for libintl.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 | |
-#line 3500 "configure" | |
+#line 4037 "configure" | |
#include "confdefs.h" | |
#include <libintl.h> | |
EOF | |
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
-{ (eval echo configure:3505: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
+{ (eval echo configure:4042: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | |
if test -z "$ac_err"; then | |
rm -rf conftest* | |
t@@ -3518,12 +4055,12 @@ fi | |
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then | |
echo "$ac_t""yes" 1>&6 | |
echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6 | |
-echo "configure:3522: checking for GNU gettext in libc" >&5 | |
+echo "configure:4059: checking for GNU gettext in libc" >&5 | |
if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libc'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 3527 "configure" | |
+#line 4064 "configure" | |
#include "confdefs.h" | |
#include <libintl.h> | |
extern int _nl_msg_cat_cntr; | |
t@@ -3532,7 +4069,7 @@ bindtextdomain ("", ""); | |
return (int) gettext ("") + _nl_msg_cat_cntr | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
gt_cv_func_gnugettext1_libc=yes | |
else | |
t@@ -3548,14 +4085,14 @@ echo "$ac_t""$gt_cv_func_gnugettext1_libc" 1>&6 | |
if test "$gt_cv_func_gnugettext1_libc" != "yes"; then | |
echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6 | |
-echo "configure:3552: checking for GNU gettext in libintl" >&5 | |
+echo "configure:4089: checking for GNU gettext in libintl" >&5 | |
if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libintl'+set}'`\" = set"; t… | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
gt_save_LIBS="$LIBS" | |
LIBS="$LIBS -lintl $LIBICONV" | |
cat > conftest.$ac_ext <<EOF | |
-#line 3559 "configure" | |
+#line 4096 "configure" | |
#include "confdefs.h" | |
#include <libintl.h> | |
extern int _nl_msg_cat_cntr; | |
t@@ -3564,7 +4101,7 @@ bindtextdomain ("", ""); | |
return (int) gettext ("") + _nl_msg_cat_cntr | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
gt_cv_func_gnugettext1_libintl=yes | |
else | |
t@@ -3597,12 +4134,12 @@ EOF | |
for ac_func in dcgettext | |
do | |
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
-echo "configure:3601: checking for $ac_func" >&5 | |
+echo "configure:4138: checking for $ac_func" >&5 | |
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 3606 "configure" | |
+#line 4143 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char $ac_func(); below. */ | |
t@@ -3625,7 +4162,7 @@ $ac_func(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:3629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_$ac_func=yes" | |
else | |
t@@ -3654,7 +4191,7 @@ done | |
# Extract the first word of "msgfmt", so it can be a program name… | |
set dummy msgfmt; ac_word=$2 | |
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
-echo "configure:3658: checking for $ac_word" >&5 | |
+echo "configure:4195: checking for $ac_word" >&5 | |
if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
t@@ -3688,7 +4225,7 @@ fi | |
# Extract the first word of "gmsgfmt", so it can be a program n… | |
set dummy gmsgfmt; ac_word=$2 | |
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
-echo "configure:3692: checking for $ac_word" >&5 | |
+echo "configure:4229: checking for $ac_word" >&5 | |
if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
t@@ -3726,7 +4263,7 @@ fi | |
# Extract the first word of "xgettext", so it can be a program na… | |
set dummy xgettext; ac_word=$2 | |
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
-echo "configure:3730: checking for $ac_word" >&5 | |
+echo "configure:4267: checking for $ac_word" >&5 | |
if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
t@@ -3776,7 +4313,7 @@ fi | |
# Extract the first word of "msgfmt", so it can be a program name with… | |
set dummy msgfmt; ac_word=$2 | |
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
-echo "configure:3780: checking for $ac_word" >&5 | |
+echo "configure:4317: checking for $ac_word" >&5 | |
if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
t@@ -3810,7 +4347,7 @@ fi | |
# Extract the first word of "gmsgfmt", so it can be a program name wit… | |
set dummy gmsgfmt; ac_word=$2 | |
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
-echo "configure:3814: checking for $ac_word" >&5 | |
+echo "configure:4351: checking for $ac_word" >&5 | |
if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
t@@ -3846,7 +4383,7 @@ fi | |
# Extract the first word of "xgettext", so it can be a program name wi… | |
set dummy xgettext; ac_word=$2 | |
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
-echo "configure:3850: checking for $ac_word" >&5 | |
+echo "configure:4387: checking for $ac_word" >&5 | |
if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
t@@ -3908,7 +4445,7 @@ do | |
# Extract the first word of "$ac_prog", so it can be a program name with args. | |
set dummy $ac_prog; ac_word=$2 | |
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
-echo "configure:3912: checking for $ac_word" >&5 | |
+echo "configure:4449: checking for $ac_word" >&5 | |
if eval "test \"`echo '$''{'ac_cv_prog_INTLBISON'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
t@@ -3941,7 +4478,7 @@ done | |
ac_verc_fail=yes | |
else | |
echo $ac_n "checking version of bison""... $ac_c" 1>&6 | |
-echo "configure:3945: checking version of bison" >&5 | |
+echo "configure:4482: checking version of bison" >&5 | |
ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison .* \… | |
case $ac_prog_version in | |
'') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; | |
t@@ -3988,7 +4525,7 @@ echo "configure:3945: checking version of bison" >&5 | |
LINGUAS= | |
else | |
echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 | |
-echo "configure:3992: checking for catalogs to be installed" >&5 | |
+echo "configure:4529: checking for catalogs to be installed" >&5 | |
NEW_LINGUAS= | |
for presentlang in $ALL_LINGUAS; do | |
useit=no | |
t@@ -4063,7 +4600,7 @@ EOF | |
fi | |
echo $ac_n "checking size of long long""... $ac_c" 1>&6 | |
-echo "configure:4067: checking size of long long" >&5 | |
+echo "configure:4604: checking size of long long" >&5 | |
if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
t@@ -4071,7 +4608,7 @@ else | |
{ echo "configure: error: can not run test program while cross compiling" … | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4075 "configure" | |
+#line 4612 "configure" | |
#include "confdefs.h" | |
#include <stdio.h> | |
int main() | |
t@@ -4082,7 +4619,7 @@ int main() | |
return(0); | |
} | |
EOF | |
-if { (eval echo configure:4086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
ac_cv_sizeof_long_long=`cat conftestval` | |
else | |
t@@ -4103,7 +4640,7 @@ EOF | |
echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 | |
-echo "configure:4107: checking for 8-bit clean memcmp" >&5 | |
+echo "configure:4644: checking for 8-bit clean memcmp" >&5 | |
if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
t@@ -4111,7 +4648,7 @@ else | |
ac_cv_func_memcmp_clean=no | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4115 "configure" | |
+#line 4652 "configure" | |
#include "confdefs.h" | |
main() | |
t@@ -4121,7 +4658,7 @@ main() | |
} | |
EOF | |
-if { (eval echo configure:4125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
ac_cv_func_memcmp_clean=yes | |
else | |
t@@ -4139,7 +4676,7 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 | |
test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" | |
echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6 | |
-echo "configure:4143: checking whether setvbuf arguments are reversed" >&5 | |
+echo "configure:4680: checking whether setvbuf arguments are reversed" >&5 | |
if eval "test \"`echo '$''{'ac_cv_func_setvbuf_reversed'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
t@@ -4147,7 +4684,7 @@ else | |
{ echo "configure: error: can not run test program while cross compiling" … | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4151 "configure" | |
+#line 4688 "configure" | |
#include "confdefs.h" | |
#include <stdio.h> | |
/* If setvbuf has the reversed format, exit 0. */ | |
t@@ -4161,7 +4698,7 @@ main () { | |
exit(0); /* Non-reversed systems segv here. */ | |
} | |
EOF | |
-if { (eval echo configure:4165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
then | |
ac_cv_func_setvbuf_reversed=yes | |
else | |
t@@ -4185,12 +4722,12 @@ EOF | |
fi | |
echo $ac_n "checking for strftime""... $ac_c" 1>&6 | |
-echo "configure:4189: checking for strftime" >&5 | |
+echo "configure:4726: checking for strftime" >&5 | |
if eval "test \"`echo '$''{'ac_cv_func_strftime'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4194 "configure" | |
+#line 4731 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char strftime(); below. */ | |
t@@ -4213,7 +4750,7 @@ strftime(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_strftime=yes" | |
else | |
t@@ -4235,7 +4772,7 @@ else | |
echo "$ac_t""no" 1>&6 | |
# strftime is in -lintl on SCO UNIX. | |
echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6 | |
-echo "configure:4239: checking for strftime in -lintl" >&5 | |
+echo "configure:4776: checking for strftime in -lintl" >&5 | |
ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'` | |
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
t@@ -4243,7 +4780,7 @@ else | |
ac_save_LIBS="$LIBS" | |
LIBS="-lintl $LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 4247 "configure" | |
+#line 4784 "configure" | |
#include "confdefs.h" | |
/* Override any gcc2 internal prototype to avoid an error. */ | |
/* We use char because int might match the return type of a gcc2 | |
t@@ -4254,7 +4791,7 @@ int main() { | |
strftime() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_lib_$ac_lib_var=yes" | |
else | |
t@@ -4283,12 +4820,12 @@ fi | |
for ac_func in strdup strstr getopt getopt_long fork | |
do | |
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
-echo "configure:4287: checking for $ac_func" >&5 | |
+echo "configure:4824: checking for $ac_func" >&5 | |
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4292 "configure" | |
+#line 4829 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char $ac_func(); below. */ | |
t@@ -4311,7 +4848,7 @@ $ac_func(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_$ac_func=yes" | |
else | |
t@@ -4342,14 +4879,14 @@ if test "$CYGWIN" = "yes" ; then | |
else | |
echo $ac_n "checking for library containing socket""... $ac_c" 1>&6 | |
-echo "configure:4346: checking for library containing socket" >&5 | |
+echo "configure:4883: checking for library containing socket" >&5 | |
if eval "test \"`echo '$''{'ac_cv_search_socket'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
ac_func_search_save_LIBS="$LIBS" | |
ac_cv_search_socket="no" | |
cat > conftest.$ac_ext <<EOF | |
-#line 4353 "configure" | |
+#line 4890 "configure" | |
#include "confdefs.h" | |
/* Override any gcc2 internal prototype to avoid an error. */ | |
/* We use char because int might match the return type of a gcc2 | |
t@@ -4360,7 +4897,7 @@ int main() { | |
socket() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_search_socket="none required" | |
else | |
t@@ -4371,7 +4908,7 @@ rm -f conftest* | |
test "$ac_cv_search_socket" = "no" && for i in socket; do | |
LIBS="-l$i $ac_func_search_save_LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 4375 "configure" | |
+#line 4912 "configure" | |
#include "confdefs.h" | |
/* Override any gcc2 internal prototype to avoid an error. */ | |
/* We use char because int might match the return type of a gcc2 | |
t@@ -4382,7 +4919,7 @@ int main() { | |
socket() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_search_socket="-l$i" | |
break | |
t@@ -4404,14 +4941,14 @@ else : | |
fi | |
echo $ac_n "checking for library containing gethostbyname""... $ac_c" 1>&6 | |
-echo "configure:4408: checking for library containing gethostbyname" >&5 | |
+echo "configure:4945: checking for library containing gethostbyname" >&5 | |
if eval "test \"`echo '$''{'ac_cv_search_gethostbyname'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
ac_func_search_save_LIBS="$LIBS" | |
ac_cv_search_gethostbyname="no" | |
cat > conftest.$ac_ext <<EOF | |
-#line 4415 "configure" | |
+#line 4952 "configure" | |
#include "confdefs.h" | |
/* Override any gcc2 internal prototype to avoid an error. */ | |
/* We use char because int might match the return type of a gcc2 | |
t@@ -4422,7 +4959,7 @@ int main() { | |
gethostbyname() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_search_gethostbyname="none required" | |
else | |
t@@ -4433,7 +4970,7 @@ rm -f conftest* | |
test "$ac_cv_search_gethostbyname" = "no" && for i in nsl socket; do | |
LIBS="-l$i $ac_func_search_save_LIBS" | |
cat > conftest.$ac_ext <<EOF | |
-#line 4437 "configure" | |
+#line 4974 "configure" | |
#include "confdefs.h" | |
/* Override any gcc2 internal prototype to avoid an error. */ | |
/* We use char because int might match the return type of a gcc2 | |
t@@ -4444,7 +4981,7 @@ int main() { | |
gethostbyname() | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:4985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
ac_cv_search_gethostbyname="-l$i" | |
break | |
t@@ -4467,12 +5004,12 @@ fi | |
for ac_func in socket gethostbyname select | |
do | |
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
-echo "configure:4471: checking for $ac_func" >&5 | |
+echo "configure:5008: checking for $ac_func" >&5 | |
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | |
echo $ac_n "(cached) $ac_c" 1>&6 | |
else | |
cat > conftest.$ac_ext <<EOF | |
-#line 4476 "configure" | |
+#line 5013 "configure" | |
#include "confdefs.h" | |
/* System header to define __stub macros and hopefully few prototypes, | |
which can conflict with char $ac_func(); below. */ | |
t@@ -4495,7 +5032,7 @@ $ac_func(); | |
; return 0; } | |
EOF | |
-if { (eval echo configure:4499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
+if { (eval echo configure:5036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&… | |
rm -rf conftest* | |
eval "ac_cv_func_$ac_func=yes" | |
else | |
t@@ -4759,12 +5296,16 @@ s%@host_cpu@%$host_cpu%g | |
s%@host_vendor@%$host_vendor%g | |
s%@host_os@%$host_os%g | |
s%@WNDRES@%$WNDRES%g | |
-s%@GLIB_CONFIG@%$GLIB_CONFIG%g | |
+s%@PKG_CONFIG@%$PKG_CONFIG%g | |
s%@GLIB_CFLAGS@%$GLIB_CFLAGS%g | |
s%@GLIB_LIBS@%$GLIB_LIBS%g | |
-s%@GTK_CONFIG@%$GTK_CONFIG%g | |
+s%@GLIB_GENMARSHAL@%$GLIB_GENMARSHAL%g | |
+s%@GOBJECT_QUERY@%$GOBJECT_QUERY%g | |
+s%@GLIB_MKENUMS@%$GLIB_MKENUMS%g | |
+s%@GLIB_CONFIG@%$GLIB_CONFIG%g | |
s%@GTK_CFLAGS@%$GTK_CFLAGS%g | |
s%@GTK_LIBS@%$GTK_LIBS%g | |
+s%@GTK_CONFIG@%$GTK_CONFIG%g | |
s%@RANLIB@%$RANLIB%g | |
s%@ALLOCA@%$ALLOCA%g | |
s%@GLIBC21@%$GLIBC21%g | |
diff --git a/configure.in b/configure.in | |
t@@ -85,7 +85,10 @@ else | |
AC_MSG_RESULT("Configuring for Unix binary") | |
dnl We NEED glib - so test for it first | |
- AM_PATH_GLIB(1.2.0,,[AC_MSG_ERROR(Cannot find glib - aborting)]) | |
+ AM_PATH_GLIB_2_0(2.0.0, glib2_found="yes", glib2_found="no") | |
+ if test "$glib2_found" = "no" ; then | |
+ AM_PATH_GLIB(1.2.0, , [AC_MSG_ERROR(Cannot find glib - aborting)]) | |
+ fi | |
dnl On true Unix systems, test for valid curses-like libraries | |
if test "$CURSES_CLIENT" != "no" ; then | |
t@@ -108,37 +111,38 @@ else | |
if test "$GUI_CLIENT" != "no" -o "$GUI_SERVER" != "no"; then | |
dnl Tests for GTK | |
- AM_PATH_GTK(1.2.0,gtk_found="yes",gtk_found="no") | |
- if test "$gtk_found" = "no" ; then | |
- if test "$GUI_CLIENT" = "yes" -o "$GUI_SERVER" = "yes" ; then | |
- AC_MSG_ERROR(Cannot find GTK+) | |
- else | |
- AC_MSG_WARN(Cannot find GTK+) | |
- GUI_CLIENT="no" | |
- GUI_SERVER="no" | |
- fi | |
+ AM_PATH_GTK_2_0(2.0.0,gtk2_found="yes",gtk2_found="no") | |
+ if test "$gtk2_found" = "yes" ; then | |
+ HAVE_FIXED_GTK="yes" | |
else | |
- AC_MSG_CHECKING([for non-buggy GTK+ ( >= 1.2.10 )]) | |
- dnl Versions older than 1.2.10 are buggy | |
- if test "$gtk_config_major_version" -gt 1 ; then | |
- HAVE_FIXED_GTK="yes" | |
- elif test "$gtk_config_major_version" -eq 1 ; then | |
- if test "$gtk_config_minor_version" -gt 2 ; then | |
- dnl We assume all 1.3.x releases are OK | |
- HAVE_FIXED_GTK="yes" | |
- elif test "$gtk_config_minor_version" -eq 2 -a \ | |
- "$gtk_config_micro_version" -ge 10 ; then | |
- HAVE_FIXED_GTK="yes" | |
- fi | |
- fi | |
- AC_MSG_RESULT("$HAVE_FIXED_GTK") | |
- fi | |
+ AM_PATH_GTK(1.2.0,gtk_found="yes",gtk_found="no") | |
+ if test "$gtk_found" = "no" ; then | |
+ if test "$GUI_CLIENT" = "yes" -o "$GUI_SERVER" = "yes" ; then | |
+ AC_MSG_ERROR(Cannot find GTK+) | |
+ else | |
+ AC_MSG_WARN(Cannot find GTK+) | |
+ GUI_CLIENT="no" | |
+ GUI_SERVER="no" | |
+ fi | |
+ else | |
+ AC_MSG_CHECKING([for non-buggy GTK+ ( >= 1.2.10 )]) | |
+ dnl Versions older than 1.2.10 are buggy | |
+ if test "$gtk_config_major_version" -gt 1 ; then | |
+ HAVE_FIXED_GTK="yes" | |
+ elif test "$gtk_config_major_version" -eq 1 ; then | |
+ if test "$gtk_config_minor_version" -gt 2 ; then | |
+ dnl We assume all 1.3.x releases are OK | |
+ HAVE_FIXED_GTK="yes" | |
+ elif test "$gtk_config_minor_version" -eq 2 -a \ | |
+ "$gtk_config_micro_version" -ge 10 ; then | |
+ HAVE_FIXED_GTK="yes" | |
+ fi | |
+ fi | |
+ AC_MSG_RESULT("$HAVE_FIXED_GTK") | |
+ fi | |
+ fi | |
fi | |
- dnl Glib stuff | |
- CFLAGS="$CFLAGS `glib-config --cflags`" | |
- LDFLAGS="$LDFLAGS `glib-config --libs`" | |
- | |
dnl Use console server by default | |
if test "$GUI_SERVER" = "probe"; then | |
GUI_SERVER="no" | |
diff --git a/doc/Makefile.in b/doc/Makefile.in | |
t@@ -68,9 +68,12 @@ GENCAT = @GENCAT@ | |
GLIBC21 = @GLIBC21@ | |
GLIB_CFLAGS = @GLIB_CFLAGS@ | |
GLIB_CONFIG = @GLIB_CONFIG@ | |
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ | |
GLIB_LIBS = @GLIB_LIBS@ | |
+GLIB_MKENUMS = @GLIB_MKENUMS@ | |
GMOFILES = @GMOFILES@ | |
GMSGFMT = @GMSGFMT@ | |
+GOBJECT_QUERY = @GOBJECT_QUERY@ | |
GTK_CFLAGS = @GTK_CFLAGS@ | |
GTK_CONFIG = @GTK_CONFIG@ | |
GTK_LIBS = @GTK_LIBS@ | |
t@@ -84,6 +87,7 @@ MAKEINFO = @MAKEINFO@ | |
MKINSTALLDIRS = @MKINSTALLDIRS@ | |
MSGFMT = @MSGFMT@ | |
PACKAGE = @PACKAGE@ | |
+PKG_CONFIG = @PKG_CONFIG@ | |
POFILES = @POFILES@ | |
POSUB = @POSUB@ | |
RANLIB = @RANLIB@ | |
diff --git a/src/Makefile.in b/src/Makefile.in | |
t@@ -68,9 +68,12 @@ GENCAT = @GENCAT@ | |
GLIBC21 = @GLIBC21@ | |
GLIB_CFLAGS = @GLIB_CFLAGS@ | |
GLIB_CONFIG = @GLIB_CONFIG@ | |
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ | |
GLIB_LIBS = @GLIB_LIBS@ | |
+GLIB_MKENUMS = @GLIB_MKENUMS@ | |
GMOFILES = @GMOFILES@ | |
GMSGFMT = @GMSGFMT@ | |
+GOBJECT_QUERY = @GOBJECT_QUERY@ | |
GTK_CFLAGS = @GTK_CFLAGS@ | |
GTK_CONFIG = @GTK_CONFIG@ | |
GTK_LIBS = @GTK_LIBS@ | |
t@@ -84,6 +87,7 @@ MAKEINFO = @MAKEINFO@ | |
MKINSTALLDIRS = @MKINSTALLDIRS@ | |
MSGFMT = @MSGFMT@ | |
PACKAGE = @PACKAGE@ | |
+PKG_CONFIG = @PKG_CONFIG@ | |
POFILES = @POFILES@ | |
POSUB = @POSUB@ | |
RANLIB = @RANLIB@ | |
diff --git a/src/curses_client/Makefile.am b/src/curses_client/Makefile.am | |
t@@ -1,4 +1,4 @@ | |
noinst_LIBRARIES = libcursesclient.a | |
libcursesclient_a_SOURCES = curses_client.c curses_client.h | |
-INCLUDES = -I../../intl -I${srcdir} -I${srcdir}/.. -I../.. | |
+INCLUDES = -I../../intl -I${srcdir} -I${srcdir}/.. -I../.. @GLIB_CFLAGS@ | |
DEFS = @DEFS@ -DLOCALEDIR=\"${localedir}\" | |
diff --git a/src/curses_client/Makefile.in b/src/curses_client/Makefile.in | |
t@@ -68,9 +68,12 @@ GENCAT = @GENCAT@ | |
GLIBC21 = @GLIBC21@ | |
GLIB_CFLAGS = @GLIB_CFLAGS@ | |
GLIB_CONFIG = @GLIB_CONFIG@ | |
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ | |
GLIB_LIBS = @GLIB_LIBS@ | |
+GLIB_MKENUMS = @GLIB_MKENUMS@ | |
GMOFILES = @GMOFILES@ | |
GMSGFMT = @GMSGFMT@ | |
+GOBJECT_QUERY = @GOBJECT_QUERY@ | |
GTK_CFLAGS = @GTK_CFLAGS@ | |
GTK_CONFIG = @GTK_CONFIG@ | |
GTK_LIBS = @GTK_LIBS@ | |
t@@ -84,6 +87,7 @@ MAKEINFO = @MAKEINFO@ | |
MKINSTALLDIRS = @MKINSTALLDIRS@ | |
MSGFMT = @MSGFMT@ | |
PACKAGE = @PACKAGE@ | |
+PKG_CONFIG = @PKG_CONFIG@ | |
POFILES = @POFILES@ | |
POSUB = @POSUB@ | |
RANLIB = @RANLIB@ | |
t@@ -95,7 +99,7 @@ localedir = @localedir@ | |
noinst_LIBRARIES = libcursesclient.a | |
libcursesclient_a_SOURCES = curses_client.c curses_client.h | |
-INCLUDES = -I../../intl -I${srcdir} -I${srcdir}/.. -I../.. | |
+INCLUDES = -I../../intl -I${srcdir} -I${srcdir}/.. -I../.. @GLIB_CFLAGS@ | |
DEFS = @DEFS@ -DLOCALEDIR=\"${localedir}\" | |
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs | |
CONFIG_HEADER = ../../config.h | |
diff --git a/src/cursesport/Makefile.in b/src/cursesport/Makefile.in | |
t@@ -68,9 +68,12 @@ GENCAT = @GENCAT@ | |
GLIBC21 = @GLIBC21@ | |
GLIB_CFLAGS = @GLIB_CFLAGS@ | |
GLIB_CONFIG = @GLIB_CONFIG@ | |
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ | |
GLIB_LIBS = @GLIB_LIBS@ | |
+GLIB_MKENUMS = @GLIB_MKENUMS@ | |
GMOFILES = @GMOFILES@ | |
GMSGFMT = @GMSGFMT@ | |
+GOBJECT_QUERY = @GOBJECT_QUERY@ | |
GTK_CFLAGS = @GTK_CFLAGS@ | |
GTK_CONFIG = @GTK_CONFIG@ | |
GTK_LIBS = @GTK_LIBS@ | |
t@@ -84,6 +87,7 @@ MAKEINFO = @MAKEINFO@ | |
MKINSTALLDIRS = @MKINSTALLDIRS@ | |
MSGFMT = @MSGFMT@ | |
PACKAGE = @PACKAGE@ | |
+PKG_CONFIG = @PKG_CONFIG@ | |
POFILES = @POFILES@ | |
POSUB = @POSUB@ | |
RANLIB = @RANLIB@ | |
diff --git a/src/gtkport/Makefile.in b/src/gtkport/Makefile.in | |
t@@ -68,9 +68,12 @@ GENCAT = @GENCAT@ | |
GLIBC21 = @GLIBC21@ | |
GLIB_CFLAGS = @GLIB_CFLAGS@ | |
GLIB_CONFIG = @GLIB_CONFIG@ | |
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ | |
GLIB_LIBS = @GLIB_LIBS@ | |
+GLIB_MKENUMS = @GLIB_MKENUMS@ | |
GMOFILES = @GMOFILES@ | |
GMSGFMT = @GMSGFMT@ | |
+GOBJECT_QUERY = @GOBJECT_QUERY@ | |
GTK_CFLAGS = @GTK_CFLAGS@ | |
GTK_CONFIG = @GTK_CONFIG@ | |
GTK_LIBS = @GTK_LIBS@ | |
t@@ -84,6 +87,7 @@ MAKEINFO = @MAKEINFO@ | |
MKINSTALLDIRS = @MKINSTALLDIRS@ | |
MSGFMT = @MSGFMT@ | |
PACKAGE = @PACKAGE@ | |
+PKG_CONFIG = @PKG_CONFIG@ | |
POFILES = @POFILES@ | |
POSUB = @POSUB@ | |
RANLIB = @RANLIB@ | |
diff --git a/src/gtkport/gtkport.c b/src/gtkport/gtkport.c | |
t@@ -25,6 +25,7 @@ | |
#endif | |
#ifndef CYGWIN | |
+#define GTK_ENABLE_BROKEN | |
#include <sys/types.h> /* For pid_t (fork) */ | |
#ifdef HAVE_UNISTD_H | |
#include <unistd.h> /* For fork and execv */ | |
t@@ -4981,7 +4982,7 @@ guint SetAccelerator(GtkWidget *labelparent, gchar *Text, | |
gtk_label_parse_uline(GTK_LABEL(GTK_BIN(labelparent)->child), Text); | |
if (sendto && AccelKey) { | |
gtk_widget_add_accelerator(sendto, signal, accel_group, AccelKey, 0, | |
- GTK_ACCEL_VISIBLE | GTK_ACCEL_SIGNAL_VISIBLE); | |
+ GTK_ACCEL_VISIBLE); | |
} | |
return AccelKey; | |
} | |
t@@ -5032,7 +5033,7 @@ gint GtkMessageBox(GtkWidget *parent, const gchar *Text, | |
}; | |
imm_return = Options & MB_IMMRETURN; | |
- dialog = gtk_window_new(GTK_WINDOW_DIALOG); | |
+ dialog = gtk_window_new(GTK_WINDOW_POPUP); | |
accel_group = gtk_accel_group_new(); | |
gtk_window_add_accel_group(GTK_WINDOW(dialog), accel_group); | |
gtk_window_set_modal(GTK_WINDOW(dialog), TRUE); | |
diff --git a/src/gui_client/Makefile.in b/src/gui_client/Makefile.in | |
t@@ -68,9 +68,12 @@ GENCAT = @GENCAT@ | |
GLIBC21 = @GLIBC21@ | |
GLIB_CFLAGS = @GLIB_CFLAGS@ | |
GLIB_CONFIG = @GLIB_CONFIG@ | |
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ | |
GLIB_LIBS = @GLIB_LIBS@ | |
+GLIB_MKENUMS = @GLIB_MKENUMS@ | |
GMOFILES = @GMOFILES@ | |
GMSGFMT = @GMSGFMT@ | |
+GOBJECT_QUERY = @GOBJECT_QUERY@ | |
GTK_CFLAGS = @GTK_CFLAGS@ | |
GTK_CONFIG = @GTK_CONFIG@ | |
GTK_LIBS = @GTK_LIBS@ | |
t@@ -84,6 +87,7 @@ MAKEINFO = @MAKEINFO@ | |
MKINSTALLDIRS = @MKINSTALLDIRS@ | |
MSGFMT = @MSGFMT@ | |
PACKAGE = @PACKAGE@ | |
+PKG_CONFIG = @PKG_CONFIG@ | |
POFILES = @POFILES@ | |
POSUB = @POSUB@ | |
RANLIB = @RANLIB@ | |
diff --git a/src/gui_client/gtk_client.c b/src/gui_client/gtk_client.c | |
t@@ -24,6 +24,8 @@ | |
#include <config.h> | |
#endif | |
+#define GTK_ENABLE_BROKEN | |
+ | |
#include <stdlib.h> | |
#include <ctype.h> | |
#include <string.h> | |
t@@ -249,7 +251,7 @@ void ListInventory(GtkWidget *widget, gpointer data) | |
if (IsShowingInventory) | |
return; | |
- window = gtk_window_new(GTK_WINDOW_DIALOG); | |
+ window = gtk_window_new(GTK_WINDOW_TOPLEVEL); | |
gtk_window_set_default_size(GTK_WINDOW(window), 550, 120); | |
accel_group = gtk_accel_group_new(); | |
gtk_window_add_accel_group(GTK_WINDOW(window), accel_group); | |
t@@ -542,7 +544,7 @@ void PrepareHighScoreDialog(void) | |
if (HiScoreDialog.dialog) | |
return; | |
- HiScoreDialog.dialog = dialog = gtk_window_new(GTK_WINDOW_DIALOG); | |
+ HiScoreDialog.dialog = dialog = gtk_window_new(GTK_WINDOW_TOPLEVEL); | |
/* Title of the GTK+ high score dialog */ | |
gtk_window_set_title(GTK_WINDOW(dialog), _("High Scores")); | |
t@@ -820,7 +822,7 @@ static void CreateFightDialog(void) | |
GArray *combatants; | |
gchar *buf; | |
- FightDialog = dialog = gtk_window_new(GTK_WINDOW_DIALOG); | |
+ FightDialog = dialog = gtk_window_new(GTK_WINDOW_TOPLEVEL); | |
gtk_window_set_default_size(GTK_WINDOW(dialog), 500, 300); | |
gtk_signal_connect(GTK_OBJECT(dialog), "delete_event", | |
GTK_SIGNAL_FUNC(DisallowDelete), NULL); | |
t@@ -1354,7 +1356,7 @@ void Jet(GtkWidget *parent) | |
accel_group = gtk_accel_group_new(); | |
- dialog = gtk_window_new(GTK_WINDOW_DIALOG); | |
+ dialog = gtk_window_new(GTK_WINDOW_TOPLEVEL); | |
/* Title of 'Jet' dialog */ | |
gtk_window_set_title(GTK_WINDOW(dialog), _("Jet to location")); | |
t@@ -1407,8 +1409,7 @@ void Jet(GtkWidget *parent) | |
if (i < 9) { | |
gtk_widget_add_accelerator(button, "clicked", accel_group, | |
GDK_KP_1 + i, 0, | |
- GTK_ACCEL_VISIBLE | | |
- GTK_ACCEL_SIGNAL_VISIBLE); | |
+ GTK_ACCEL_VISIBLE); | |
} | |
g_free(name); | |
} | |
t@@ -1572,7 +1573,7 @@ void DealDrugs(GtkWidget *widget, gpointer data) | |
text = g_string_new(NULL); | |
accel_group = gtk_accel_group_new(); | |
- dialog = DealDialog.dialog = gtk_window_new(GTK_WINDOW_DIALOG); | |
+ dialog = DealDialog.dialog = gtk_window_new(GTK_WINDOW_TOPLEVEL); | |
gtk_window_set_title(GTK_WINDOW(dialog), Action); | |
gtk_window_add_accel_group(GTK_WINDOW(dialog), accel_group); | |
gtk_container_set_border_width(GTK_CONTAINER(dialog), 7); | |
t@@ -1786,7 +1787,7 @@ void QuestionDialog(char *Data, Player *From) | |
Responses = split[0]; | |
LabelText = split[1]; | |
- dialog = gtk_window_new(GTK_WINDOW_DIALOG); | |
+ dialog = gtk_window_new(GTK_WINDOW_TOPLEVEL); | |
accel_group = gtk_accel_group_new(); | |
gtk_signal_connect(GTK_OBJECT(dialog), "delete_event", | |
GTK_SIGNAL_FUNC(DisallowDelete), NULL); | |
t@@ -2208,7 +2209,7 @@ void display_intro(GtkWidget *widget, gpointer data) | |
{N_("Unconstructive Criticism"), "James Matthews", NULL} | |
}; | |
- dialog = gtk_window_new(GTK_WINDOW_DIALOG); | |
+ dialog = gtk_window_new(GTK_WINDOW_TOPLEVEL); | |
/* Title of GTK+ 'about' dialog */ | |
gtk_window_set_title(GTK_WINDOW(dialog), _("About dopewars")); | |
t@@ -2362,7 +2363,7 @@ void TransferDialog(gboolean Debt) | |
text = g_string_new(""); | |
- dialog = gtk_window_new(GTK_WINDOW_DIALOG); | |
+ dialog = gtk_window_new(GTK_WINDOW_TOPLEVEL); | |
gtk_signal_connect(GTK_OBJECT(dialog), "destroy", | |
GTK_SIGNAL_FUNC(SendDoneMessage), NULL); | |
if (Debt) { | |
t@@ -2469,7 +2470,7 @@ void ListPlayers(GtkWidget *widget, gpointer data) | |
if (IsShowingPlayerList) | |
return; | |
- dialog = gtk_window_new(GTK_WINDOW_DIALOG); | |
+ dialog = gtk_window_new(GTK_WINDOW_TOPLEVEL); | |
/* Title of player list dialog */ | |
gtk_window_set_title(GTK_WINDOW(dialog), _("Player List")); | |
t@@ -2569,7 +2570,7 @@ void TalkDialog(gboolean TalkToAll) | |
if (IsShowingTalkList) | |
return; | |
- dialog = TalkData.dialog = gtk_window_new(GTK_WINDOW_DIALOG); | |
+ dialog = TalkData.dialog = gtk_window_new(GTK_WINDOW_TOPLEVEL); | |
/* Title of talk dialog */ | |
gtk_window_set_title(GTK_WINDOW(dialog), _("Talk to player(s)")); | |
t@@ -2706,7 +2707,7 @@ void ErrandDialog(gint ErrandType) | |
GtkWidget *dialog, *clist, *button, *vbox, *hbbox, *hsep, *label; | |
gchar *text; | |
- dialog = gtk_window_new(GTK_WINDOW_DIALOG); | |
+ dialog = gtk_window_new(GTK_WINDOW_TOPLEVEL); | |
gtk_container_set_border_width(GTK_CONTAINER(dialog), 7); | |
gtk_window_set_modal(GTK_WINDOW(dialog), TRUE); | |
t@@ -2921,7 +2922,7 @@ void NewNameDialog(void) | |
{ | |
GtkWidget *window, *button, *hsep, *vbox, *label, *entry; | |
- window = gtk_window_new(GTK_WINDOW_DIALOG); | |
+ window = gtk_window_new(GTK_WINDOW_TOPLEVEL); | |
/* Title of dialog for changing a player's name */ | |
gtk_window_set_title(GTK_WINDOW(window), _("Change Name")); | |
t@@ -2972,7 +2973,7 @@ void GunShopDialog(void) | |
GtkAccelGroup *accel_group; | |
gchar *text; | |
- window = gtk_window_new(GTK_WINDOW_DIALOG); | |
+ window = gtk_window_new(GTK_WINDOW_TOPLEVEL); | |
gtk_window_set_default_size(GTK_WINDOW(window), 600, 190); | |
gtk_signal_connect(GTK_OBJECT(window), "destroy", | |
GTK_SIGNAL_FUNC(SendDoneMessage), NULL); | |
t@@ -3043,7 +3044,7 @@ static void CreateSpyReports(void) | |
GtkWidget *window, *button, *vbox, *notebook; | |
GtkAccelGroup *accel_group; | |
- SpyReportsDialog = window = gtk_window_new(GTK_WINDOW_DIALOG); | |
+ SpyReportsDialog = window = gtk_window_new(GTK_WINDOW_TOPLEVEL); | |
accel_group = gtk_accel_group_new(); | |
gtk_object_set_data(GTK_OBJECT(window), "accel_group", accel_group); | |
gtk_window_add_accel_group(GTK_WINDOW(window), accel_group); | |
diff --git a/src/gui_client/newgamedia.c b/src/gui_client/newgamedia.c | |
t@@ -441,7 +441,7 @@ void NewGameDialog(Player *play) | |
#endif /* NETWORKING */ | |
stgam.play = play; | |
- stgam.dialog = dialog = gtk_window_new(GTK_WINDOW_DIALOG); | |
+ stgam.dialog = dialog = gtk_window_new(GTK_WINDOW_TOPLEVEL); | |
gtk_signal_connect(GTK_OBJECT(dialog), "destroy", | |
GTK_SIGNAL_FUNC(CloseNewGameDia), NULL); | |
t@@ -470,7 +470,7 @@ void NewGameDialog(Player *play) | |
entry = stgam.name = gtk_entry_new(); | |
gtk_widget_add_accelerator(entry, "grab-focus", accel_group, AccelKey, 0, | |
- GTK_ACCEL_VISIBLE | GTK_ACCEL_SIGNAL_VISIBLE); | |
+ GTK_ACCEL_VISIBLE); | |
gtk_entry_set_text(GTK_ENTRY(entry), GetPlayerName(stgam.play)); | |
gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0); | |
t@@ -661,7 +661,7 @@ void AuthDialog(HttpConnection *conn, gboolean proxy, gcha… | |
{ | |
GtkWidget *window, *button, *hsep, *vbox, *label, *entry, *table, *hbbox; | |
- window = gtk_window_new(GTK_WINDOW_DIALOG); | |
+ window = gtk_window_new(GTK_WINDOW_TOPLEVEL); | |
gtk_signal_connect(GTK_OBJECT(window), "destroy", | |
GTK_SIGNAL_FUNC(DestroyAuthDialog), NULL); | |
gtk_object_set_data(GTK_OBJECT(window), "proxy", GINT_TO_POINTER(proxy)); | |
t@@ -777,7 +777,7 @@ static void RealSocksAuthDialog(NetworkBuffer *netbuf, gbo… | |
{ | |
GtkWidget *window, *button, *hsep, *vbox, *label, *entry, *table, *hbbox; | |
- window = gtk_window_new(GTK_WINDOW_DIALOG); | |
+ window = gtk_window_new(GTK_WINDOW_TOPLEVEL); | |
gtk_signal_connect(GTK_OBJECT(window), "destroy", | |
GTK_SIGNAL_FUNC(DestroySocksAuth), NULL); | |
gtk_object_set_data(GTK_OBJECT(window), "netbuf", (gpointer)netbuf); | |
diff --git a/src/gui_client/optdialog.c b/src/gui_client/optdialog.c | |
t@@ -699,7 +699,7 @@ void OptDialog(GtkWidget *widget, gpointer data) | |
{ NULL, NULL } | |
}; | |
- dialog = gtk_window_new(GTK_WINDOW_DIALOG); | |
+ dialog = gtk_window_new(GTK_WINDOW_TOPLEVEL); | |
gtk_window_set_title(GTK_WINDOW(dialog), _("Options")); | |
gtk_container_set_border_width(GTK_CONTAINER(dialog), 7); |