projects
/
platform
/
upstream
/
fontconfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Re-scan font directories only when it contains subdirs
[platform/upstream/fontconfig.git]
/
autogen.sh
diff --git
a/autogen.sh
b/autogen.sh
index
c3d11ca
..
1482e40
100755
(executable)
--- a/
autogen.sh
+++ b/
autogen.sh
@@
-19,6
+19,7
@@
PROJECT=Fontconfig
TEST_TYPE=-f
FILE=fontconfig/fontconfig.h
ACLOCAL=${ACLOCAL-aclocal}
TEST_TYPE=-f
FILE=fontconfig/fontconfig.h
ACLOCAL=${ACLOCAL-aclocal}
+ACLOCAL_FLAGS="-I m4"
LIBTOOLIZE=${LIBTOOLIZE-libtoolize}
AUTOMAKE=${AUTOMAKE-automake}
AUTOHEADER=${AUTOHEADER-autoheader}
LIBTOOLIZE=${LIBTOOLIZE-libtoolize}
AUTOMAKE=${AUTOMAKE-automake}
AUTOHEADER=${AUTOHEADER-autoheader}
@@
-29,7
+30,7
@@
DIE=0
have_libtool=false
if $LIBTOOLIZE --version < /dev/null > /dev/null 2>&1 ; then
have_libtool=false
if $LIBTOOLIZE --version < /dev/null > /dev/null 2>&1 ; then
- libtool_version=`$LIBTOOLIZE --version | sed 's/^
[^0-9]*\([0-9].[0-9.]*\).*
/\1/'`
+ libtool_version=`$LIBTOOLIZE --version | sed 's/^
.* \([0-9][.][0-9.]*\)[^ ]*$
/\1/'`
case $libtool_version in
1.4*|1.5*|1.6*|1.7*|2*)
have_libtool=true
case $libtool_version in
1.4*|1.5*|1.6*|1.7*|2*)
have_libtool=true
@@
-85,7
+86,7
@@
test $TEST_TYPE $FILE || {
exit 1
}
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."
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."
@@
-114,9
+115,9
@@
echo Running $AUTOCONF
$AUTOCONF
cd $ORIGDIR
$AUTOCONF
cd $ORIGDIR
-if test -z "$AUTOGEN_SUBDIR_MODE"; then
- echo Running $srcdir/configure
--enable-maintainer-mode
"$@"
- $srcdir/configure
--enable-maintainer-mode
"$@"
+if test -z "$AUTOGEN_SUBDIR_MODE"
-a -z "$NOCONFIGURE"
; then
+ echo Running $srcdir/configure "$@"
+ $srcdir/configure "$@"
echo
echo "Now type 'make' to compile $PROJECT."
echo
echo "Now type 'make' to compile $PROJECT."