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 /libxcb | |
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 'libxcb')
-rw-r--r-- | libxcb/autogen.sh | 4 | ||||
-rw-r--r-- | libxcb/xcb-proto/autogen.sh | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libxcb/autogen.sh b/libxcb/autogen.sh index 904cd6746..fc34bd55c 100644 --- a/libxcb/autogen.sh +++ b/libxcb/autogen.sh @@ -9,4 +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/libxcb/xcb-proto/autogen.sh b/libxcb/xcb-proto/autogen.sh index 904cd6746..fc34bd55c 100644 --- a/libxcb/xcb-proto/autogen.sh +++ b/libxcb/xcb-proto/autogen.sh @@ -9,4 +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 |