diff options
| author | Matthieu Herrb <matthieu@herrb.eu> | 2014-06-07 21:33:34 +0200 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@herrb.eu> | 2014-06-07 21:33:34 +0200 |
| commit | 7bab1b1baf39a17052c4ad889263b7360de10b8d (patch) | |
| tree | 6829e2886b742ab89a52fcb05384a75c1851346a | |
| parent | b95d937da5f2372abd9b1a62dc7b61028c459349 (diff) | |
| parent | 4676f2fa92057c94a39830fb1215e9944f958c91 (diff) | |
Merge remote-tracking branch 'origin/master' into obsd
| -rwxr-xr-x | autogen.sh | 5 | ||||
| -rw-r--r-- | configure.ac | 1 |
2 files changed, 3 insertions, 3 deletions
@@ -9,5 +9,6 @@ cd $srcdir autoreconf -v --install || exit 1 cd $ORIGDIR || exit $? -$srcdir/configure --enable-maintainer-mode "$@" - +if test -z "$NOCONFIGURE"; then + $srcdir/configure "$@" +fi diff --git a/configure.ac b/configure.ac index a72b8bb..055b77e 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,6 @@ AC_CONFIG_HEADERS([config.h]) # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AM_MAINTAINER_MODE # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], |