diff options
| author | Matthieu Herrb <matthieu@herrb.eu> | 2014-06-07 21:37:37 +0200 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@herrb.eu> | 2014-06-07 21:37:37 +0200 |
| commit | b306997ebf1f012a9d0745b10172b5e39a528950 (patch) | |
| tree | 67454785ac63041a017bc57d2d898c2fe480c047 | |
| parent | 2061a359a1f8968c88fa8ff5b9cb4739361ac33d (diff) | |
| parent | 5502aaf99f4e723e96791e8f4cf01e0c200ec269 (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 02cb80c..ce40168 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.19 or later for TRADITIONALCPPFLAGS m4_ifndef([XORG_MACROS_VERSION], |