From: Owen Taylor Date: Fri, 13 Apr 2001 18:00:02 +0000 (+0000) Subject: Fix up to refer to GTK+, not to GLib; fix some wording problems. (Compared X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=21f13fb7e0ec9a48926167152e06b7301fe34546;hp=fb37aa1cfaeca471637e20fce6b2b3dc49716258;p=~andy%2Fgtk Fix up to refer to GTK+, not to GLib; fix some wording problems. (Compared Thu Apr 12 17:41:17 2001 Owen Taylor * gtk-2.0.m4: Fix up to refer to GTK+, not to GLib; fix some wording problems. (Compared to version from Johannes Stezenbach to check correctness.) --- diff --git a/ChangeLog b/ChangeLog index 6bf573564..4c9a6d363 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Apr 12 17:41:17 2001 Owen Taylor + + * gtk-2.0.m4: Fix up to refer to GTK+, not to GLib; fix some + wording problems. (Compared to version from Johannes Stezenbach to + check correctness.) + Thu Apr 12 21:04:26 2001 Tim Janik * gtk/gtktreeview.c (_gtk_tree_view_column_start_drag): get diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 6bf573564..4c9a6d363 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Thu Apr 12 17:41:17 2001 Owen Taylor + + * gtk-2.0.m4: Fix up to refer to GTK+, not to GLib; fix some + wording problems. (Compared to version from Johannes Stezenbach to + check correctness.) + Thu Apr 12 21:04:26 2001 Tim Janik * gtk/gtktreeview.c (_gtk_tree_view_column_start_drag): get diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6bf573564..4c9a6d363 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Thu Apr 12 17:41:17 2001 Owen Taylor + + * gtk-2.0.m4: Fix up to refer to GTK+, not to GLib; fix some + wording problems. (Compared to version from Johannes Stezenbach to + check correctness.) + Thu Apr 12 21:04:26 2001 Tim Janik * gtk/gtktreeview.c (_gtk_tree_view_column_start_drag): get diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 6bf573564..4c9a6d363 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Thu Apr 12 17:41:17 2001 Owen Taylor + + * gtk-2.0.m4: Fix up to refer to GTK+, not to GLib; fix some + wording problems. (Compared to version from Johannes Stezenbach to + check correctness.) + Thu Apr 12 21:04:26 2001 Tim Janik * gtk/gtktreeview.c (_gtk_tree_view_column_start_drag): get diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 6bf573564..4c9a6d363 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Thu Apr 12 17:41:17 2001 Owen Taylor + + * gtk-2.0.m4: Fix up to refer to GTK+, not to GLib; fix some + wording problems. (Compared to version from Johannes Stezenbach to + check correctness.) + Thu Apr 12 21:04:26 2001 Tim Janik * gtk/gtktreeview.c (_gtk_tree_view_column_start_drag): get diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 6bf573564..4c9a6d363 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Thu Apr 12 17:41:17 2001 Owen Taylor + + * gtk-2.0.m4: Fix up to refer to GTK+, not to GLib; fix some + wording problems. (Compared to version from Johannes Stezenbach to + check correctness.) + Thu Apr 12 21:04:26 2001 Tim Janik * gtk/gtktreeview.c (_gtk_tree_view_column_start_drag): get diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 6bf573564..4c9a6d363 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Thu Apr 12 17:41:17 2001 Owen Taylor + + * gtk-2.0.m4: Fix up to refer to GTK+, not to GLib; fix some + wording problems. (Compared to version from Johannes Stezenbach to + check correctness.) + Thu Apr 12 21:04:26 2001 Tim Janik * gtk/gtktreeview.c (_gtk_tree_view_column_start_drag): get diff --git a/gtk-2.0.m4 b/gtk-2.0.m4 index 54c57e688..ef847d714 100644 --- a/gtk-2.0.m4 +++ b/gtk-2.0.m4 @@ -1,16 +1,16 @@ -# Configure paths for GLIB +# Configure paths for GTK+ # Owen Taylor 1997-2001 -dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or -dnl gthread is specified in MODULES, pass to glib-config +dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) +dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, +dnl pass to pkg-config dnl -AC_DEFUN(AM_PATH_GLIB_2_0, +AC_DEFUN(AM_PATH_GTK_2_0, [dnl -dnl Get the cflags and libraries from the glib-config-2.0 script +dnl Get the cflags and libraries from pkg-config dnl -AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and run a test GLIB program], - , enable_glibtest=yes) +AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK+ program], + , enable_gtktest=yes) pkg_config_args=gtk+-2.0 for module in . $4 @@ -22,10 +22,10 @@ AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and ru esac done - min_glib_version=ifelse([$1], ,1.3.3,$1) - AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) + min_gtk_version=ifelse([$1], ,1.3.3,$1) + AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version) - no_glib="" + no_gtk="" AC_PATH_PROG(PKG_CONFIG, pkg-config, no) @@ -34,32 +34,32 @@ AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and ru : else echo *** pkg-config too old; version 0.5 or better required. - no_glib=yes + no_gtk=yes PKG_CONFIG=no fi fi - if test x"$no_glib" = x ; then - 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 | \ + 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/'` - glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ + gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ + gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_glibtest" = "xyes" ; then + if test "x$enable_gtktest" = "xyes" ; then ac_save_CFLAGS="$CFLAGS" ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$GLIB_LIBS $LIBS" + CFLAGS="$CFLAGS $GTK_CFLAGS" + LIBS="$GTK_LIBS $LIBS" dnl -dnl Now check if the installed GLIB is sufficiently new. (Also sanity -dnl checks the results of glib-config-2.0 to some extent +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.glibtest + rm -f conf.gtktest AC_TRY_RUN([ -#include +#include #include #include @@ -69,59 +69,59 @@ main () int major, minor, micro; char *tmp_version; - system ("touch conf.glibtest"); + system ("touch conf.gtktest"); /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_glib_version"); + tmp_version = g_strdup("$min_gtk_version"); if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_glib_version"); + printf("%s, bad version string\n", "$min_gtk_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)) + 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 glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", - $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, - glib_major_version, glib_minor_version, glib_micro_version); + printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", + $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, + 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 GLib. You may also be able to fix the error\n"); + printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); printf("*** required on your system.\n"); printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); 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)) + else if ((gtk_major_version != GTK_MAJOR_VERSION) || + (gtk_minor_version != GTK_MINOR_VERSION) || + (gtk_micro_version != GTK_MICRO_VERSION)) { - printf("*** GLIB header files (version %d.%d.%d) do not match\n", - GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_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", - glib_major_version, glib_minor_version, glib_micro_version); + gtk_major_version, gtk_minor_version, gtk_micro_version); } else { - if ((glib_major_version > major) || - ((glib_major_version == major) && (glib_minor_version > minor)) || - ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) + if ((gtk_major_version > major) || + ((gtk_major_version == major) && (gtk_minor_version > minor)) || + ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) { 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 version of\n", + 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 version of\n", major, minor, micro); - printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); + printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); printf("***\n"); printf("*** If you have already installed a sufficiently new version, this error\n"); printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); + printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n"); printf("*** correct copy of pkg-config. (In this case, you will have to\n"); printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); printf("*** so that the correct libraries are found at run-time))\n"); @@ -129,13 +129,13 @@ main () } return 1; } -],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) +],, 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_glib" = x ; then - AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) + if test "x$no_gtk" = x ; then + AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)) ifelse([$2], , :, [$2]) else AC_MSG_RESULT(no) @@ -143,43 +143,38 @@ main () echo "*** A new enough version of pkg-config was not found." echo "*** See http://pkgconfig.sourceforge.net" else - if test -f conf.glibtest ; then + if test -f conf.gtktest ; then : else - echo "*** Could not run GLIB test program, checking why..." - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$LIBS $GLIB_LIBS" + echo "*** Could not run GTK+ test program, checking why..." + CFLAGS="$CFLAGS $GTK_CFLAGS" + LIBS="$LIBS $GTK_LIBS" AC_TRY_LINK([ -#include +#include #include -], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], +], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ], [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GLIB or finding the wrong" - echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" + echo "*** that the run-time linker is not finding GTK+ or finding the wrong" + echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your" echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" echo "*** to the installed location Also, make sure you have run ldconfig if that" echo "*** is required on your system" echo "***" echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" - echo "***" - echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" - echo "*** came with the system with the command" - echo "***" - echo "*** rpm --erase --nodeps gtk gtk-devel" ], + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GLIB was incorrectly installed" - echo "*** or that you have moved GLIB since it was installed. In the latter case, you" + echo "*** exact error that occured. This usually means GTK+ was incorrectly installed" + echo "*** or that you have moved GTK+ since it was installed. In the latter case, you" 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="" + GTK_CFLAGS="" + GTK_LIBS="" ifelse([$3], , :, [$3]) fi - AC_SUBST(GLIB_CFLAGS) - AC_SUBST(GLIB_LIBS) - rm -f conf.glibtest + AC_SUBST(GTK_CFLAGS) + AC_SUBST(GTK_LIBS) + rm -f conf.gtktest ]) diff --git a/m4macros/gtk-2.0.m4 b/m4macros/gtk-2.0.m4 index 54c57e688..ef847d714 100644 --- a/m4macros/gtk-2.0.m4 +++ b/m4macros/gtk-2.0.m4 @@ -1,16 +1,16 @@ -# Configure paths for GLIB +# Configure paths for GTK+ # Owen Taylor 1997-2001 -dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or -dnl gthread is specified in MODULES, pass to glib-config +dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) +dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, +dnl pass to pkg-config dnl -AC_DEFUN(AM_PATH_GLIB_2_0, +AC_DEFUN(AM_PATH_GTK_2_0, [dnl -dnl Get the cflags and libraries from the glib-config-2.0 script +dnl Get the cflags and libraries from pkg-config dnl -AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and run a test GLIB program], - , enable_glibtest=yes) +AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK+ program], + , enable_gtktest=yes) pkg_config_args=gtk+-2.0 for module in . $4 @@ -22,10 +22,10 @@ AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and ru esac done - min_glib_version=ifelse([$1], ,1.3.3,$1) - AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) + min_gtk_version=ifelse([$1], ,1.3.3,$1) + AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version) - no_glib="" + no_gtk="" AC_PATH_PROG(PKG_CONFIG, pkg-config, no) @@ -34,32 +34,32 @@ AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and ru : else echo *** pkg-config too old; version 0.5 or better required. - no_glib=yes + no_gtk=yes PKG_CONFIG=no fi fi - if test x"$no_glib" = x ; then - 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 | \ + 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/'` - glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ + gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ + gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_glibtest" = "xyes" ; then + if test "x$enable_gtktest" = "xyes" ; then ac_save_CFLAGS="$CFLAGS" ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$GLIB_LIBS $LIBS" + CFLAGS="$CFLAGS $GTK_CFLAGS" + LIBS="$GTK_LIBS $LIBS" dnl -dnl Now check if the installed GLIB is sufficiently new. (Also sanity -dnl checks the results of glib-config-2.0 to some extent +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.glibtest + rm -f conf.gtktest AC_TRY_RUN([ -#include +#include #include #include @@ -69,59 +69,59 @@ main () int major, minor, micro; char *tmp_version; - system ("touch conf.glibtest"); + system ("touch conf.gtktest"); /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_glib_version"); + tmp_version = g_strdup("$min_gtk_version"); if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_glib_version"); + printf("%s, bad version string\n", "$min_gtk_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)) + 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 glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", - $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, - glib_major_version, glib_minor_version, glib_micro_version); + printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", + $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, + 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 GLib. You may also be able to fix the error\n"); + printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); printf("*** required on your system.\n"); printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); 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)) + else if ((gtk_major_version != GTK_MAJOR_VERSION) || + (gtk_minor_version != GTK_MINOR_VERSION) || + (gtk_micro_version != GTK_MICRO_VERSION)) { - printf("*** GLIB header files (version %d.%d.%d) do not match\n", - GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_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", - glib_major_version, glib_minor_version, glib_micro_version); + gtk_major_version, gtk_minor_version, gtk_micro_version); } else { - if ((glib_major_version > major) || - ((glib_major_version == major) && (glib_minor_version > minor)) || - ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) + if ((gtk_major_version > major) || + ((gtk_major_version == major) && (gtk_minor_version > minor)) || + ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) { 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 version of\n", + 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 version of\n", major, minor, micro); - printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); + printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); printf("***\n"); printf("*** If you have already installed a sufficiently new version, this error\n"); printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); + printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n"); printf("*** correct copy of pkg-config. (In this case, you will have to\n"); printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); printf("*** so that the correct libraries are found at run-time))\n"); @@ -129,13 +129,13 @@ main () } return 1; } -],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) +],, 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_glib" = x ; then - AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) + if test "x$no_gtk" = x ; then + AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)) ifelse([$2], , :, [$2]) else AC_MSG_RESULT(no) @@ -143,43 +143,38 @@ main () echo "*** A new enough version of pkg-config was not found." echo "*** See http://pkgconfig.sourceforge.net" else - if test -f conf.glibtest ; then + if test -f conf.gtktest ; then : else - echo "*** Could not run GLIB test program, checking why..." - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$LIBS $GLIB_LIBS" + echo "*** Could not run GTK+ test program, checking why..." + CFLAGS="$CFLAGS $GTK_CFLAGS" + LIBS="$LIBS $GTK_LIBS" AC_TRY_LINK([ -#include +#include #include -], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], +], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ], [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GLIB or finding the wrong" - echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" + echo "*** that the run-time linker is not finding GTK+ or finding the wrong" + echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your" echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" echo "*** to the installed location Also, make sure you have run ldconfig if that" echo "*** is required on your system" echo "***" echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" - echo "***" - echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" - echo "*** came with the system with the command" - echo "***" - echo "*** rpm --erase --nodeps gtk gtk-devel" ], + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GLIB was incorrectly installed" - echo "*** or that you have moved GLIB since it was installed. In the latter case, you" + echo "*** exact error that occured. This usually means GTK+ was incorrectly installed" + echo "*** or that you have moved GTK+ since it was installed. In the latter case, you" 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="" + GTK_CFLAGS="" + GTK_LIBS="" ifelse([$3], , :, [$3]) fi - AC_SUBST(GLIB_CFLAGS) - AC_SUBST(GLIB_LIBS) - rm -f conf.glibtest + AC_SUBST(GTK_CFLAGS) + AC_SUBST(GTK_LIBS) + rm -f conf.gtktest ])