Update autogen.sh

1 files changed, 37 insertions, 9 deletions

diff --git a/autogen.sh b/autogen.sh
index ab07a98..c44a6b6 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,24 +1,52 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
+test -n "$srcdir" || srcdir=$(dirname "$0")
+test -n "$srcdir" || srcdir=.
+
+olddir=$(pwd)
+
+cd "$srcdir"
 
 PKG_NAME="ibus-libpinyin"
 
-(test -f $srcdir/configure.ac \
-  && test -f $srcdir/README ) || {
+(test -f configure.ac && test -f README ) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
     echo " top-level $PKG_NAME directory"
     exit 1
 }
 
-which gnome-autogen.sh || {
-    echo "You need to install gnome-common from the GNOME CVS"
-    exit 1
+if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
+        echo "*** WARNING: I am going to run 'configure' with no arguments." >&2
+        echo "*** If you wish to pass any to it, please specify them on the" >&2
+        echo "*** '$0' command line." >&2
+        echo "" >&2
+fi
+
+glib-gettextize --force --copy || exit 1
+
+autoreconf --verbose --force --install || exit 1
+
+(test -f ChangeLog) || {
+    touch ChangeLog
 }
 
-ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4"
+cd "$olddir"
+
+CFLAGS=${CFLAGS-"-Wall -Werror"}
+
+ACLOCAL_FLAGS="$ACLOCAL_FLAGS"
 REQUIRED_AUTOMAKE_VERSION=1.8
 
-. gnome-autogen.sh "$@"
+cd "$olddir"
+if [ "$NOCONFIGURE" = "" ]; then
+        $srcdir/configure "$@" || exit 1
+
+        if [ "$1" = "--help" ]; then
+                exit 0
+        else
+                echo "Now type 'make' to compile $PKG_NAME" || exit 1
+        fi
+else
+        echo "Skipping configure process."
+fi