diff options
author | marha <marha@users.sourceforge.net> | 2013-01-16 08:45:43 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-01-16 08:45:43 +0100 |
commit | b8219a4680768e14b7fe4930adf86e9be261b31f (patch) | |
tree | 193855ef8d48765d67cc11153a15e3c1e2568e50 /libfontenc | |
parent | 15cdb95b194cb051a5d469cc9eb73eb0eed4db41 (diff) | |
parent | 811d1bcf6d61ea49551abdd7f2294c5af2776913 (diff) | |
download | vcxsrv-b8219a4680768e14b7fe4930adf86e9be261b31f.tar.gz vcxsrv-b8219a4680768e14b7fe4930adf86e9be261b31f.tar.bz2 vcxsrv-b8219a4680768e14b7fe4930adf86e9be261b31f.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
Switched to xcalc-1.0.5
Switched to bdftopcf-1.0.4
libxtrans fontconfig glproto libX11 libXau libXext libXft libXinerama libXmu libfontenc mesa xkeyboard-config
Diffstat (limited to 'libfontenc')
-rw-r--r-- | libfontenc/autogen.sh | 4 | ||||
-rw-r--r-- | libfontenc/configure.ac | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libfontenc/autogen.sh b/libfontenc/autogen.sh index 904cd6746..fc34bd55c 100644 --- a/libfontenc/autogen.sh +++ b/libfontenc/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/libfontenc/configure.ac b/libfontenc/configure.ac index 37089c211..953a81f86 100644 --- a/libfontenc/configure.ac +++ b/libfontenc/configure.ac @@ -28,7 +28,6 @@ AC_CONFIG_HEADERS([config.h]) # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AM_MAINTAINER_MODE # Initialize libtool AC_PROG_LIBTOOL |