callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix up to refer to GTK+, not to GLib; fix some wording problems. (Compared

Browse Source 
Thu Apr 12 17:41:17 2001  Owen Taylor  <otaylor@redhat.com>

        * 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.)
This commit is contained in:
Owen Taylor
2001-04-13 18:00:02 +00:00
committed by Owen Taylor
parent fb37aa1cfa
commit 21f13fb7e0
9 changed files with 178 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Thu Apr 12 17:41:17 2001 Owen Taylor <otaylor@redhat.com>
* 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 <timj@gtk.org> Thu Apr 12 21:04:26 2001 Tim Janik <timj@gtk.org>
* gtk/gtktreeview.c (_gtk_tree_view_column_start_drag): get * gtk/gtktreeview.c (_gtk_tree_view_column_start_drag): get

6
ChangeLog.pre-2-0
View File

@ -1,3 +1,9 @@
Thu Apr 12 17:41:17 2001 Owen Taylor <otaylor@redhat.com>
* 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 <timj@gtk.org> Thu Apr 12 21:04:26 2001 Tim Janik <timj@gtk.org>
* gtk/gtktreeview.c (_gtk_tree_view_column_start_drag): get * gtk/gtktreeview.c (_gtk_tree_view_column_start_drag): get

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
Thu Apr 12 17:41:17 2001 Owen Taylor <otaylor@redhat.com>
* 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 <timj@gtk.org> Thu Apr 12 21:04:26 2001 Tim Janik <timj@gtk.org>
* gtk/gtktreeview.c (_gtk_tree_view_column_start_drag): get * gtk/gtktreeview.c (_gtk_tree_view_column_start_drag): get

6
ChangeLog.pre-2-2
View File

@ -1,3 +1,9 @@
Thu Apr 12 17:41:17 2001 Owen Taylor <otaylor@redhat.com>
* 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 <timj@gtk.org> Thu Apr 12 21:04:26 2001 Tim Janik <timj@gtk.org>
* gtk/gtktreeview.c (_gtk_tree_view_column_start_drag): get * gtk/gtktreeview.c (_gtk_tree_view_column_start_drag): get

6
ChangeLog.pre-2-4
View File

@ -1,3 +1,9 @@
Thu Apr 12 17:41:17 2001 Owen Taylor <otaylor@redhat.com>
* 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 <timj@gtk.org> Thu Apr 12 21:04:26 2001 Tim Janik <timj@gtk.org>
* gtk/gtktreeview.c (_gtk_tree_view_column_start_drag): get * gtk/gtktreeview.c (_gtk_tree_view_column_start_drag): get

6
ChangeLog.pre-2-6
View File

@ -1,3 +1,9 @@
Thu Apr 12 17:41:17 2001 Owen Taylor <otaylor@redhat.com>
* 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 <timj@gtk.org> Thu Apr 12 21:04:26 2001 Tim Janik <timj@gtk.org>
* gtk/gtktreeview.c (_gtk_tree_view_column_start_drag): get * gtk/gtktreeview.c (_gtk_tree_view_column_start_drag): get

6
ChangeLog.pre-2-8
View File

@ -1,3 +1,9 @@
Thu Apr 12 17:41:17 2001 Owen Taylor <otaylor@redhat.com>
* 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 <timj@gtk.org> Thu Apr 12 21:04:26 2001 Tim Janik <timj@gtk.org>
* gtk/gtktreeview.c (_gtk_tree_view_column_start_drag): get * gtk/gtktreeview.c (_gtk_tree_view_column_start_drag): get

141
gtk-2.0.m4
View File

@ -1,16 +1,16 @@
# Configure paths for GLIB # Configure paths for GTK+
# Owen Taylor 1997-2001 # Owen Taylor 1997-2001
dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) dnl AM_PATH_GTK_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 Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES,
dnl gthread is specified in MODULES, pass to glib-config dnl pass to pkg-config
dnl dnl
AC_DEFUN(AM_PATH_GLIB_2_0, AC_DEFUN(AM_PATH_GTK_2_0,
[dnl [dnl
dnl Get the cflags and libraries from the glib-config-2.0 script dnl Get the cflags and libraries from pkg-config
dnl dnl
AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and run a test GLIB program], AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK+ program],
, enable_glibtest=yes) , enable_gtktest=yes)
pkg_config_args=gtk+-2.0 pkg_config_args=gtk+-2.0
for module in . $4 for module in . $4
@ -22,10 +22,10 @@ AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and ru
esac esac
done done
min_glib_version=ifelse([$1], ,1.3.3,$1) min_gtk_version=ifelse([$1], ,1.3.3,$1)
AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
no_glib="" no_gtk=""
AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 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 else
echo *** pkg-config too old; version 0.5 or better required. echo *** pkg-config too old; version 0.5 or better required.
no_glib=yes no_gtk=yes
PKG_CONFIG=no PKG_CONFIG=no
fi fi
fi fi
if test x"$no_glib" = x ; then if test x"$no_gtk" = x ; then
GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` 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/'` 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/'` 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_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GLIB_CFLAGS" CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$GLIB_LIBS $LIBS" LIBS="$GTK_LIBS $LIBS"
dnl dnl
dnl Now check if the installed GLIB is sufficiently new. (Also sanity dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
dnl checks the results of glib-config-2.0 to some extent dnl checks the results of pkg-config to some extent)
dnl dnl
rm -f conf.glibtest rm -f conf.gtktest
AC_TRY_RUN([ AC_TRY_RUN([
#include <glib.h> #include <gtk/gtk.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -69,59 +69,59 @@ main ()
int major, minor, micro; int major, minor, micro;
char *tmp_version; char *tmp_version;
system ("touch conf.glibtest"); system ("touch conf.gtktest");
/* HP/UX 9 (%@#!) writes to sscanf strings */ /* 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, &micro) != 3) { if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
printf("%s, bad version string\n", "$min_glib_version"); printf("%s, bad version string\n", "$min_gtk_version");
exit(1); exit(1);
} }
if ((glib_major_version != $glib_config_major_version) || if ((gtk_major_version != $gtk_config_major_version) ||
(glib_minor_version != $glib_config_minor_version) || (gtk_minor_version != $gtk_config_minor_version) ||
(glib_micro_version != $glib_config_micro_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", printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
$glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
glib_major_version, glib_minor_version, glib_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 ("*** 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("*** 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("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
printf("*** required on your system.\n"); printf("*** required on your system.\n");
printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
printf("*** to point to the correct configuration files\n"); printf("*** to point to the correct configuration files\n");
} }
else if ((glib_major_version != GLIB_MAJOR_VERSION) || else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
(glib_minor_version != GLIB_MINOR_VERSION) || (gtk_minor_version != GTK_MINOR_VERSION) ||
(glib_micro_version != GLIB_MICRO_VERSION)) (gtk_micro_version != GTK_MICRO_VERSION))
{ {
printf("*** GLIB header files (version %d.%d.%d) do not match\n", printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
printf("*** library (version %d.%d.%d)\n", 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 else
{ {
if ((glib_major_version > major) || if ((gtk_major_version > major) ||
((glib_major_version == major) && (glib_minor_version > minor)) || ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
{ {
return 0; return 0;
} }
else else
{ {
printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
glib_major_version, glib_minor_version, glib_micro_version); gtk_major_version, gtk_minor_version, gtk_micro_version);
printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
major, minor, micro); 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("***\n");
printf("*** If you have already installed a sufficiently new version, this error\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("*** 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("*** 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("*** 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("*** 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"); printf("*** so that the correct libraries are found at run-time))\n");
@ -129,13 +129,13 @@ main ()
} }
return 1; 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" CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS" LIBS="$ac_save_LIBS"
fi fi
fi fi
if test "x$no_glib" = x ; then if test "x$no_gtk" = x ; then
AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
ifelse([$2], , :, [$2]) ifelse([$2], , :, [$2])
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
@ -143,43 +143,38 @@ main ()
echo "*** A new enough version of pkg-config was not found." echo "*** A new enough version of pkg-config was not found."
echo "*** See http://pkgconfig.sourceforge.net" echo "*** See http://pkgconfig.sourceforge.net"
else else
if test -f conf.glibtest ; then if test -f conf.gtktest ; then
: :
else else
echo "*** Could not run GLIB test program, checking why..." echo "*** Could not run GTK+ test program, checking why..."
CFLAGS="$CFLAGS $GLIB_CFLAGS" CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$LIBS $GLIB_LIBS" LIBS="$LIBS $GTK_LIBS"
AC_TRY_LINK([ AC_TRY_LINK([
#include <glib.h> #include <gtk/gtk.h>
#include <stdio.h> #include <stdio.h>
], [ 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 "*** 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 "*** that the run-time linker is not finding GTK+ or finding the wrong"
echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" 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 "*** 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 "*** to the installed location Also, make sure you have run ldconfig if that"
echo "*** is required on your system" echo "*** is required on your system"
echo "***" echo "***"
echo "*** If you have an old version installed, it is best to remove it, although" 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 "*** 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 "*** The test program failed to compile or link. See the file config.log for the" [ 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 "*** exact error that occured. This usually means GTK+ was incorrectly installed"
echo "*** or that you have moved GLIB since it was installed. In the latter case, you" 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" ]) echo "*** may want to edit the pkg-config script: $PKG_CONFIG" ])
CFLAGS="$ac_save_CFLAGS" CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS" LIBS="$ac_save_LIBS"
fi fi
fi fi
GLIB_CFLAGS="" GTK_CFLAGS=""
GLIB_LIBS="" GTK_LIBS=""
ifelse([$3], , :, [$3]) ifelse([$3], , :, [$3])
fi fi
AC_SUBST(GLIB_CFLAGS) AC_SUBST(GTK_CFLAGS)
AC_SUBST(GLIB_LIBS) AC_SUBST(GTK_LIBS)
rm -f conf.glibtest rm -f conf.gtktest
]) ])

141
m4macros/gtk-2.0.m4
View File

@ -1,16 +1,16 @@
# Configure paths for GLIB # Configure paths for GTK+
# Owen Taylor 1997-2001 # Owen Taylor 1997-2001
dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) dnl AM_PATH_GTK_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 Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES,
dnl gthread is specified in MODULES, pass to glib-config dnl pass to pkg-config
dnl dnl
AC_DEFUN(AM_PATH_GLIB_2_0, AC_DEFUN(AM_PATH_GTK_2_0,
[dnl [dnl
dnl Get the cflags and libraries from the glib-config-2.0 script dnl Get the cflags and libraries from pkg-config
dnl dnl
AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and run a test GLIB program], AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK+ program],
, enable_glibtest=yes) , enable_gtktest=yes)
pkg_config_args=gtk+-2.0 pkg_config_args=gtk+-2.0
for module in . $4 for module in . $4
@ -22,10 +22,10 @@ AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and ru
esac esac
done done
min_glib_version=ifelse([$1], ,1.3.3,$1) min_gtk_version=ifelse([$1], ,1.3.3,$1)
AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
no_glib="" no_gtk=""
AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 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 else
echo *** pkg-config too old; version 0.5 or better required. echo *** pkg-config too old; version 0.5 or better required.
no_glib=yes no_gtk=yes
PKG_CONFIG=no PKG_CONFIG=no
fi fi
fi fi
if test x"$no_glib" = x ; then if test x"$no_gtk" = x ; then
GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` 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/'` 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/'` 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_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GLIB_CFLAGS" CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$GLIB_LIBS $LIBS" LIBS="$GTK_LIBS $LIBS"
dnl dnl
dnl Now check if the installed GLIB is sufficiently new. (Also sanity dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
dnl checks the results of glib-config-2.0 to some extent dnl checks the results of pkg-config to some extent)
dnl dnl
rm -f conf.glibtest rm -f conf.gtktest
AC_TRY_RUN([ AC_TRY_RUN([
#include <glib.h> #include <gtk/gtk.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -69,59 +69,59 @@ main ()
int major, minor, micro; int major, minor, micro;
char *tmp_version; char *tmp_version;
system ("touch conf.glibtest"); system ("touch conf.gtktest");
/* HP/UX 9 (%@#!) writes to sscanf strings */ /* 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, &micro) != 3) { if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
printf("%s, bad version string\n", "$min_glib_version"); printf("%s, bad version string\n", "$min_gtk_version");
exit(1); exit(1);
} }
if ((glib_major_version != $glib_config_major_version) || if ((gtk_major_version != $gtk_config_major_version) ||
(glib_minor_version != $glib_config_minor_version) || (gtk_minor_version != $gtk_config_minor_version) ||
(glib_micro_version != $glib_config_micro_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", printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
$glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
glib_major_version, glib_minor_version, glib_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 ("*** 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("*** 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("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
printf("*** required on your system.\n"); printf("*** required on your system.\n");
printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
printf("*** to point to the correct configuration files\n"); printf("*** to point to the correct configuration files\n");
} }
else if ((glib_major_version != GLIB_MAJOR_VERSION) || else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
(glib_minor_version != GLIB_MINOR_VERSION) || (gtk_minor_version != GTK_MINOR_VERSION) ||
(glib_micro_version != GLIB_MICRO_VERSION)) (gtk_micro_version != GTK_MICRO_VERSION))
{ {
printf("*** GLIB header files (version %d.%d.%d) do not match\n", printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
printf("*** library (version %d.%d.%d)\n", 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 else
{ {
if ((glib_major_version > major) || if ((gtk_major_version > major) ||
((glib_major_version == major) && (glib_minor_version > minor)) || ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
{ {
return 0; return 0;
} }
else else
{ {
printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
glib_major_version, glib_minor_version, glib_micro_version); gtk_major_version, gtk_minor_version, gtk_micro_version);
printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
major, minor, micro); 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("***\n");
printf("*** If you have already installed a sufficiently new version, this error\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("*** 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("*** 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("*** 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("*** 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"); printf("*** so that the correct libraries are found at run-time))\n");
@ -129,13 +129,13 @@ main ()
} }
return 1; 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" CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS" LIBS="$ac_save_LIBS"
fi fi
fi fi
if test "x$no_glib" = x ; then if test "x$no_gtk" = x ; then
AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
ifelse([$2], , :, [$2]) ifelse([$2], , :, [$2])
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
@ -143,43 +143,38 @@ main ()
echo "*** A new enough version of pkg-config was not found." echo "*** A new enough version of pkg-config was not found."
echo "*** See http://pkgconfig.sourceforge.net" echo "*** See http://pkgconfig.sourceforge.net"
else else
if test -f conf.glibtest ; then if test -f conf.gtktest ; then
: :
else else
echo "*** Could not run GLIB test program, checking why..." echo "*** Could not run GTK+ test program, checking why..."
CFLAGS="$CFLAGS $GLIB_CFLAGS" CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$LIBS $GLIB_LIBS" LIBS="$LIBS $GTK_LIBS"
AC_TRY_LINK([ AC_TRY_LINK([
#include <glib.h> #include <gtk/gtk.h>
#include <stdio.h> #include <stdio.h>
], [ 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 "*** 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 "*** that the run-time linker is not finding GTK+ or finding the wrong"
echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" 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 "*** 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 "*** to the installed location Also, make sure you have run ldconfig if that"
echo "*** is required on your system" echo "*** is required on your system"
echo "***" echo "***"
echo "*** If you have an old version installed, it is best to remove it, although" 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 "*** 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 "*** The test program failed to compile or link. See the file config.log for the" [ 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 "*** exact error that occured. This usually means GTK+ was incorrectly installed"
echo "*** or that you have moved GLIB since it was installed. In the latter case, you" 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" ]) echo "*** may want to edit the pkg-config script: $PKG_CONFIG" ])
CFLAGS="$ac_save_CFLAGS" CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS" LIBS="$ac_save_LIBS"
fi fi
fi fi
GLIB_CFLAGS="" GTK_CFLAGS=""
GLIB_LIBS="" GTK_LIBS=""
ifelse([$3], , :, [$3]) ifelse([$3], , :, [$3])
fi fi
AC_SUBST(GLIB_CFLAGS) AC_SUBST(GTK_CFLAGS)
AC_SUBST(GLIB_LIBS) AC_SUBST(GTK_LIBS)
rm -f conf.glibtest rm -f conf.gtktest
]) ])