summaryrefslogtreecommitdiff
path: root/autogen.sh
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2012-02-18 13:49:02 -0500
committerGaetan Nadon <memsize@videotron.ca>2012-02-23 14:43:34 -0500
commitf8ca50818cd4f82e0ad8eeb245e8ee838b083056 (patch)
treedd5d359e264526fd3bdf59a4694b287c0f751d42 /autogen.sh
parenta647aff5124674b638ef52152a5c16c27466eed7 (diff)
Revert "Update autotools configuration"
This reverts commit 9184af921bc2f332fcb6c9b47001414378eab8e2. All X.Org modules must be able to be configured with autoconf 2.60. In addition, version 2.63 has GPL licensing issues which prevents some vendor to release software based on it. The AM_SILENT_RULES are already handled by XORG_DEFAULT_OPTIONS. All X.Org modules must be able to be configured with libtool 1.5. AM_MAINTAINER_MODE default value is "enabled" already. We use the same autogen script for all x.org modules. There are proposals for changes which should be reviewed and eventually applied to all modules together. The lt*.m4 patterns are already included in the root .gitignore file. This can be proposed as a change to all modules, but it invloves changing the topvel .gitignore, the m4/.gitignore, the ACLOCAL_AMFLAGS and the AC_CONFIG_MACRO_DIR together. For more information on project wide configuration guidelines, consult http://www.x.org/wiki/ModularDevelopersGuide and http://www.x.org/wiki/NewModuleGuidelines. Acked-by: Matthieu Herrb <matthieu.herrb@laas.fr> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Diffstat (limited to 'autogen.sh')
-rwxr-xr-xautogen.sh14
1 files changed, 10 insertions, 4 deletions
diff --git a/autogen.sh b/autogen.sh
index 30d679f4..904cd674 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,6 +1,12 @@
#! /bin/sh
-test -n "$srcdir" || srcdir=`dirname "$0"`
-test -n "$srcdir" || srcdir=.
-autoreconf --force --install --verbose "$srcdir"
-test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
+autoreconf -v --install || exit 1
+cd $ORIGDIR || exit $?
+
+$srcdir/configure --enable-maintainer-mode "$@"