summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rwxr-xr-xautogen.sh11
-rw-r--r--scripts/xdt-autogen.in12
3 files changed, 21 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index fce9849..b7fd470 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-27 Benedikt Meurer <benny@xfce.org>
+
+ * autogen.sh, scripts/xdt-autogen.in: Don't run the configure script
+ if the environment variable NOCONFIGURE is set.
+
2005-01-26 Benedikt Meurer <benny@xfce.org>
* m4macros/xdt-i18n.m4: Need to use AC_DEFINE_UNQUOTED() when
diff --git a/autogen.sh b/autogen.sh
index 565697c..0909c7e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,9 +13,14 @@ if (type xdt-autogen) >/dev/null 2>&1; then
else
(aclocal &&
automake --add-missing --copy --gnu &&
- autoconf &&
- ./configure --enable-maintainer-mode $@ &&
- echo "Now type \"make\" to build.") || exit 1
+ autoconf) || exit 1
+
+ if test x"${NOCONFIGURE}" = x""; then
+ (./configure --enable-maintainer-mode $@ &&
+ echo "Now type \"make\" to build.") || exit 1
+ else
+ echo "Skipping configure process."
+ fi
fi
# vi:set ts=2 sw=2 et ai:
diff --git a/scripts/xdt-autogen.in b/scripts/xdt-autogen.in
index f6cbb4b..71b55ae 100644
--- a/scripts/xdt-autogen.in
+++ b/scripts/xdt-autogen.in
@@ -208,10 +208,14 @@ fi
##
## Run configure
##
-(echo "Running ${SOURCE_DIR}/configure ${CONFIGURE_FLAGS}..." &&
- cd "${SOURCE_DIR}" &&
- ./configure ${CONFIGURE_FLAGS} &&
- echo "Now type \"make\" to compile.") || exit 1
+if test x"${NOCONFIGURE}" = x""; then
+ (echo "Running ${SOURCE_DIR}/configure ${CONFIGURE_FLAGS}..." &&
+ cd "${SOURCE_DIR}" &&
+ ./configure ${CONFIGURE_FLAGS} &&
+ echo "Now type \"make\" to compile.") || exit 1
+else
+ echo "Skipping configure process."
+fi
# vi:set ts=2 sw=2 et ai: