aboutsummaryrefslogtreecommitdiffstats
path: root/macros/autogen.sh
diff options
context:
space:
mode:
authorJulian Missig <julianm@src.gnome.org>2000-05-22 06:40:15 +0800
committerJulian Missig <julianm@src.gnome.org>2000-05-22 06:40:15 +0800
commit3f5d9cb60827ca2a5e032e95aa241cc8376ab46f (patch)
treed81dd49033b11d4da7e14ad4426e8f95acd82c5b /macros/autogen.sh
parent2093028eb9f76648de7a01b73271800b4250ab2b (diff)
downloadgsoc2013-evolution-3f5d9cb60827ca2a5e032e95aa241cc8376ab46f.tar
gsoc2013-evolution-3f5d9cb60827ca2a5e032e95aa241cc8376ab46f.tar.gz
gsoc2013-evolution-3f5d9cb60827ca2a5e032e95aa241cc8376ab46f.tar.bz2
gsoc2013-evolution-3f5d9cb60827ca2a5e032e95aa241cc8376ab46f.tar.lz
gsoc2013-evolution-3f5d9cb60827ca2a5e032e95aa241cc8376ab46f.tar.xz
gsoc2013-evolution-3f5d9cb60827ca2a5e032e95aa241cc8376ab46f.tar.zst
gsoc2013-evolution-3f5d9cb60827ca2a5e032e95aa241cc8376ab46f.zip
Fixed my mess-up, sorry about that.
svn path=/trunk/; revision=3151
Diffstat (limited to 'macros/autogen.sh')
-rw-r--r--macros/autogen.sh10
1 files changed, 6 insertions, 4 deletions
diff --git a/macros/autogen.sh b/macros/autogen.sh
index f08dc52149..18cfd60720 100644
--- a/macros/autogen.sh
+++ b/macros/autogen.sh
@@ -105,7 +105,7 @@ do
aclocalinclude="$ACLOCAL_FLAGS"
for k in $aclocalinclude; do
if test -d $k; then
- if [ -f $k/gnome.m4 -a "$GNOME_INTERFACE_VERSION" = "1.0" ]; then
+ if [ -f $k/gnome.m4 -a "$GNOME_INTERFACE_VERSION" = "1" ]; then
rm -f $DELETEFILES
fi
fi
@@ -113,7 +113,7 @@ do
for k in $macrodirs; do
if test -d $k; then
aclocalinclude="$aclocalinclude -I $k"
- if [ -f $k/gnome.m4 -a "$GNOME_INTERFACE_VERSION" = "1.0" ]; then
+ if [ -f $k/gnome.m4 -a "$GNOME_INTERFACE_VERSION" = "1" ]; then
rm -f $DELETEFILES
fi
fi
@@ -139,8 +139,10 @@ do
test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
fi
if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
- echo "Running libtoolize..."
- libtoolize --force --copy
+ if test -z "$NO_LIBTOOLIZE" ; then
+ echo "Running libtoolize..."
+ libtoolize --force --copy
+ fi
fi
echo "Running aclocal $aclocalinclude ..."
aclocal $aclocalinclude