Check for GTK+ 2.0.

2000-07-24  Martin Baulig  <baulig@suse.de>

	* gnome-x-checks.m4: Check for GTK+ 2.0.

svn path=/trunk/; revision=1319

diff --git a/macros2/ChangeLog b/macros2/ChangeLog
index edd50eb..4d96d5d 100644 (file)
--- a/macros2/ChangeLog
+++ b/macros2/ChangeLog
@@ -1,5 +1,9 @@
 2000-07-24  Martin Baulig  <baulig@suse.de>
 
+       * gnome-x-checks.m4: Check for GTK+ 2.0.
+
+2000-07-24  Martin Baulig  <baulig@suse.de>
+
        * autogen.sh: Make it work with AM_GNOME2_GETTEXT.
        * check-utmp.m4: New file.
 

diff --git a/macros2/gnome-common.m4 b/macros2/gnome-common.m4
index 83bb00d..114e054 100644 (file)
--- a/macros2/gnome-common.m4
+++ b/macros2/gnome-common.m4
@@ -7,8 +7,10 @@ dnl GNOME_COMMON_INIT
 AC_DEFUN([GNOME_COMMON_INIT],
 [
        GNOME_ACLOCAL_DIR="$GNOME_COMMON_MACROS_DIR"
+       GNOME_ACLOCAL_FLAGS="$ACLOCAL_FLAGS"
        AC_SUBST(GNOME_ACLOCAL_DIR)
+       AC_SUBST(GNOME_ACLOCAL_FLAGS)
 
-       ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
+       ACLOCAL="$ACLOCAL $GNOME_ACLOCAL_FLAGS"
 ])
 

diff --git a/macros2/gnome-x-checks.m4 b/macros2/gnome-x-checks.m4
index 1e397ef..dbb56ff 100644 (file)
--- a/macros2/gnome-x-checks.m4
+++ b/macros2/gnome-x-checks.m4
@@ -15,7 +15,7 @@ dnl   gnome_cv_passdown_{x_libs,X_LIBS,X_CFLAGS}
 dnl
 AC_DEFUN([GNOME_X_CHECKS],
 [
-       AM_PATH_GTK(1.2.0,,AC_MSG_ERROR(GTK not installed, or gtk-config not in path))
+       AM_PATH_GTK_2_0(1.3.1,,AC_MSG_ERROR(GTK not installed, or gtk-config not in path))
        dnl Hope that GTK_CFLAGS have only -I and -D.  Otherwise, we could
        dnl   test -z "$x_includes" || CPPFLAGS="$CPPFLAGS -I$x_includes"
        dnl