summaryrefslogtreecommitdiff
path: root/autogen.sh
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 /autogen.sh
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 'autogen.sh')
-rwxr-xr-xautogen.sh16
1 files changed, 10 insertions, 6 deletions
diff --git a/autogen.sh b/autogen.sh
index 5a2e43be64..bdaf6699c9 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -65,9 +65,11 @@ test $TEST_TYPE $FILE || {
exit 1
}
-if test -z "$*"; then
- echo "I am going to run ./configure with no arguments - if you wish "
- echo "to pass any to it, please specify them on the $0 command line."
+if test -z "$AUTOGEN_SUBDIR_MODE"; then
+ if test -z "$*"; then
+ echo "I am going to run ./configure with no arguments - if you wish "
+ echo "to pass any to it, please specify them on the $0 command line."
+ fi
fi
case $CC in
@@ -102,7 +104,9 @@ automake -a $am_opt
autoconf
cd $ORIGDIR
-$srcdir/configure --enable-maintainer-mode "$@"
+if test -z "$AUTOGEN_SUBDIR_MODE"; then
+ $srcdir/configure --enable-maintainer-mode "$@"
-echo
-echo "Now type 'make' to compile $PROJECT."
+ echo
+ echo "Now type 'make' to compile $PROJECT."
+fi \ No newline at end of file