atspi: not accept redundant leaf object

[platform/upstream/elementary.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index b7397d4..d7ab123 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,36 +1,47 @@
 #!/bin/sh
 
-touch README
-touch ABOUT-NLS
-
-echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1
-echo "Running autoheader..." ; autoheader || exit 1
-echo "Running autoconf..." ; autoconf || exit 1
-echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1
-echo "Running automake..." ; automake --add-missing --copy --gnu || exit 1
-
-W=0
-
-rm -f config.cache-env.tmp
-echo "OLD_PARM=\"$@\"" >> config.cache-env.tmp
-echo "OLD_CFLAGS=\"$CFLAGS\"" >> config.cache-env.tmp
-echo "OLD_PATH=\"$PATH\"" >> config.cache-env.tmp
-echo "OLD_PKG_CONFIG_PATH=\"$PKG_CONFIG_PATH\"" >> config.cache-env.tmp
-echo "OLD_LDFLAGS=\"$LDFLAGS\"" >> config.cache-env.tmp
-
-cmp config.cache-env.tmp config.cache-env >> /dev/null
-if [ $? -ne 0 ]; then
-       W=1;
-fi
+test -n "$srcdir" || srcdir=`dirname "$0"`
+test -n "$srcdir" || srcdir=.
+(
+  cd "$srcdir" &&
+    (
+      rm -rf autom4te.cache
+      rm -f aclocal.m4 ltmain.sh
 
-if [ $W -ne 0 ]; then
-       echo "Cleaning configure cache...";
-       rm -f config.cache config.cache-env
-       mv config.cache-env.tmp config.cache-env
-else
-       rm -f config.cache-env.tmp
-fi
+      touch README
+      touch ABOUT-NLS
+
+      echo "Running autopoint..." ; autopoint -f || :
+      echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1
+      echo "Running autoheader..." ; autoheader || exit 1
+      echo "Running autoconf..." ; autoconf || exit 1
+      echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1
+      echo "Running automake..." ; automake --add-missing --copy --gnu || exit 1
+    )
+
+  W=0
+
+  rm -f config.cache-env.tmp
+  echo "OLD_PARM=\"$@\"" >> config.cache-env.tmp
+  echo "OLD_CFLAGS=\"$CFLAGS\"" >> config.cache-env.tmp
+  echo "OLD_PATH=\"$PATH\"" >> config.cache-env.tmp
+  echo "OLD_PKG_CONFIG_PATH=\"$PKG_CONFIG_PATH\"" >> config.cache-env.tmp
+  echo "OLD_LDFLAGS=\"$LDFLAGS\"" >> config.cache-env.tmp
+
+  cmp config.cache-env.tmp config.cache-env >> /dev/null
+  if [ $? -ne 0 ]; then
+    W=1;
+  fi
+
+  if [ $W -ne 0 ]; then
+    echo "Cleaning configure cache...";
+    rm -f config.cache config.cache-env
+    mv config.cache-env.tmp config.cache-env
+  else
+    rm -f config.cache-env.tmp
+  fi
+)
 
 if [ -z "$NOCONFIGURE" ]; then
-       ./configure -C "$@"
+  $srcdir/configure -C "$@"
 fi