diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-17 09:25:28 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-17 09:25:28 +0100 |
| commit | 50c07563e17397daf040a32d8fdd3ab397e72371 (patch) | |
| tree | ae9c109e16ba86a498c43ab62830bca3641a78aa /xkbcomp | |
| parent | dc163f625ef006c8550791122bda28fb3eb67e3d (diff) | |
| parent | 4fc6b34d1c14cc61f553ca59264d0909656933f3 (diff) | |
| download | vcxsrv-50c07563e17397daf040a32d8fdd3ab397e72371.tar.gz vcxsrv-50c07563e17397daf040a32d8fdd3ab397e72371.tar.bz2 vcxsrv-50c07563e17397daf040a32d8fdd3ab397e72371.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libxcb mesa xkbcomp git update 17 jan 2013
Diffstat (limited to 'xkbcomp')
| -rw-r--r-- | xkbcomp/autogen.sh | 5 | ||||
| -rw-r--r-- | xkbcomp/configure.ac | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/xkbcomp/autogen.sh b/xkbcomp/autogen.sh index e81f98910..fc34bd55c 100644 --- a/xkbcomp/autogen.sh +++ b/xkbcomp/autogen.sh @@ -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/xkbcomp/configure.ac b/xkbcomp/configure.ac index f9175b649..81ec27b2f 100644 --- a/xkbcomp/configure.ac +++ b/xkbcomp/configure.ac @@ -24,7 +24,6 @@ AC_PREREQ([2.60]) AC_INIT([xkbcomp], [1.2.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xkbcomp]) 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], |