diff options
| author | Matthieu Herrb <matthieu@herrb.eu> | 2014-06-07 21:21:37 +0200 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@herrb.eu> | 2014-06-07 21:21:37 +0200 |
| commit | 44518d890f8a2de0f532fc7c5246dbc7166e6608 (patch) | |
| tree | a70dcecac8c36f367bc14723e196a8a56813f9c1 | |
| parent | 6ab99861db7f01eba5336a9e1a9380e574049eb5 (diff) | |
| parent | 0cb43e864b2e9972630556e98caa24abf8928122 (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 4af570c..52d6f5d 100644 --- a/configure.ac +++ b/configure.ac @@ -30,7 +30,6 @@ AC_USE_SYSTEM_EXTENSIONS # 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], |