diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-11 08:22:46 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-11 08:22:46 +0100 |
| commit | 0e1adc84d471955eaabe26486154e8ec44e91dd4 (patch) | |
| tree | e2363fb022bfa7b730b0032b4c35379aa2a997d6 /fontconfig/autogen.sh | |
| parent | e59b1896b907c5ecfe184723d4c6adc2c20fa678 (diff) | |
| parent | ddc05759f098f06bd93253a7bffe38640963dfb3 (diff) | |
| download | vcxsrv-0e1adc84d471955eaabe26486154e8ec44e91dd4.tar.gz vcxsrv-0e1adc84d471955eaabe26486154e8ec44e91dd4.tar.bz2 vcxsrv-0e1adc84d471955eaabe26486154e8ec44e91dd4.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libX11 mesa mkfontscale xserver git update 11 jan 2013
Conflicts:
mesalib/src/glsl/.gitignore
mesalib/src/glsl/glcpp/.gitignore
mesalib/src/mapi/glapi/gen/.gitignore
mesalib/src/mesa/program/.gitignore
Diffstat (limited to 'fontconfig/autogen.sh')
| -rw-r--r-- | fontconfig/autogen.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fontconfig/autogen.sh b/fontconfig/autogen.sh index 93855cb2f..1482e401c 100644 --- a/fontconfig/autogen.sh +++ b/fontconfig/autogen.sh @@ -86,7 +86,7 @@ test $TEST_TYPE $FILE || { exit 1 } -if test -z "$AUTOGEN_SUBDIR_MODE"; then +if test -z "$AUTOGEN_SUBDIR_MODE" -a -z "$NOCONFIGURE"; then if test -z "$*"; then echo "I am going to run ./configure with no arguments - if you wish " echo "to pass any to it, please specify them on the $0 command line." @@ -115,7 +115,7 @@ echo Running $AUTOCONF $AUTOCONF cd $ORIGDIR -if test -z "$AUTOGEN_SUBDIR_MODE"; then +if test -z "$AUTOGEN_SUBDIR_MODE" -a -z "$NOCONFIGURE"; then echo Running $srcdir/configure "$@" $srcdir/configure "$@" |