summaryrefslogtreecommitdiff
path: root/m4macros
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2001-06-07 16:40:01 +0000
committerHavoc Pennington <hp@src.gnome.org>2001-06-07 16:40:01 +0000
commit5aba82da8ffda12f94ef2064b2eb296a9fd5fb60 (patch)
treea840d9f1895e0cc8db4f559ebc116b4c52f6fee7 /m4macros
parent2d18f2f420b165b6c52f320185cd276ef2e56835 (diff)
downloadgtk+-5aba82da8ffda12f94ef2064b2eb296a9fd5fb60.tar.gz
subst GLIB_GENMARSHAL, GOBJECT_QUERY, GLIB_MKENUMS variables
2001-06-07 Havoc Pennington <hp@redhat.com> * m4macros/glib-2.0.m4: subst GLIB_GENMARSHAL, GOBJECT_QUERY, GLIB_MKENUMS variables * gmodule-2.0.pc.in: add gmodule_supported variable * glib-2.0.pc.in: add glib_genmarshal, gobject_query, glib_mkenums variables * configure.in: put G_MODULE_SUPPORTED value into .pc files * autogen.sh: support AUTOGEN_SUBDIR_MODE * Makefile.am: add -uninstalled.pc.in to EXTRA_DIST 2001-06-07 Havoc Pennington <hp@redhat.com> * pango/Makefile.am: add libpango.la to _DEPENDENCIES for the other libs * configure.in: use AM_PATH_GLIB_2_0 * autogen.sh: support AUTOGEN_SUBDIR_MODE * Makefile.am: dist the .pc.in files 2001-06-07 Havoc Pennington <hp@redhat.com> * atk/Makefile.am: use @GLIB_GENMARSHAL@ so we can use uninstalled glib-genmarshal * configure.in: rearrange the library checks to support uninstalled linking * autogen.sh: add support for AUTOGEN_SUBDIR_MODE * atk-uninstalled.pc.in: new file, allows linking to uninstalled ATK in giant GTK tarball 2001-06-07 Havoc Pennington <hp@redhat.com> * tests/Makefile.am: add missing -I flag * gtk/Makefile.am: use @GLIB_MKENUMS@, @GLIB_GENMARSHAL@, etc. * configure.in: use pkg-config to see if GModule is supported; fix to properly turn on included loaders when GModule isn't supported; don't use AC_CHECK_LIB when libs are not installed yet * autogen.sh: add support for AUTOGEN_SUBDIR_MODE * Makefile.am (SUBDIRS): add m4macros subdir * gtk/Makefile.am: $(srcdir)/foo targets must be $(srcdir)/foo in dependencies also.
Diffstat (limited to 'm4macros')
-rw-r--r--m4macros/Makefile.am7
-rw-r--r--m4macros/gtk-2.0.m423
2 files changed, 25 insertions, 5 deletions
diff --git a/m4macros/Makefile.am b/m4macros/Makefile.am
new file mode 100644
index 0000000000..9d96a58252
--- /dev/null
+++ b/m4macros/Makefile.am
@@ -0,0 +1,7 @@
+
+installed_m4= gtk-2.0.m4
+
+EXTRA_DIST=$(installed_m4)
+
+m4datadir = $(datadir)/aclocal
+m4data_DATA = $(installed_m4)
diff --git a/m4macros/gtk-2.0.m4 b/m4macros/gtk-2.0.m4
index ef847d7149..8358f5e2ed 100644
--- a/m4macros/gtk-2.0.m4
+++ b/m4macros/gtk-2.0.m4
@@ -22,23 +22,36 @@ AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run
esac
done
- min_gtk_version=ifelse([$1], ,1.3.3,$1)
- AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
-
no_gtk=""
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
if test x$PKG_CONFIG != xno ; then
- if pkg-config --atleast-pkgconfig-version 0.5 ; then
+ if pkg-config --atleast-pkgconfig-version 0.7 ; then
:
else
- echo *** pkg-config too old; version 0.5 or better required.
+ echo *** pkg-config too old; version 0.7 or better required.
no_gtk=yes
PKG_CONFIG=no
fi
fi
+ ## 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
+
+ min_gtk_version=ifelse([$1], ,1.3.3,$1)
+ AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
+
+
+ if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
+ :
+ else
+ no_gtk = yes
+ fi
+
if test x"$no_gtk" = x ; then
GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`