Permalink
Browse files

using pandora config/autorun.sh

  • Loading branch information...
1 parent 7d51b68 commit 5a1e1f4b0e20ab0f2c4b0127e065223e9d6caa59 @steveyen steveyen committed Jun 8, 2010
Showing with 820 additions and 30 deletions.
  1. +1 −1 README.markdown
  2. +0 −29 autogen.sh
  3. +101 −0 config/autorun.sh
  4. +666 −0 config/config.rpath
  5. +52 −0 config/version.pl
View
@@ -8,7 +8,7 @@ First, you need to build and install libstrophe:
cd libstrophe
git submodule init
git submodule update
- ./bootstrap.sh
+ ./config/autorun.sh
./configure
make
View
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-mkdir -p m4
-UNAME=`uname -s`
-
-if [ $UNAME = "Darwin" ]; then
-glibtoolize --automake
-else
-libtoolize --automake
-fi
-
-ACLOCAL=`which aclocal || which aclocal-1.11 || which aclocal-1.10 || which aclocal-1.9 || which aclocal19 || which aclocal-1.7 || which aclocal17 || which aclocal-1.5 || which aclocal15`
-# ACLOCALFLAGS may need to be defined if you have macros in non-standard
-# locations, i.e. MacOS
-$ACLOCAL $ACLOCALFLAGS || exit 1
-
-AUTOHEADER=${AUTOHEADER:-autoheader}
-$AUTOHEADER || exit 1
-
-AUTOMAKE=`which automake-1.11 || which automake-1.10 || which automake-1.9 || which automake-1.7 || exit 1`
-$AUTOMAKE --foreign --add-missing || automake --gnu --add-missing || exit 1
-
-AUTOCONF=${AUTOCONF:-autoconf}
-$AUTOCONF || exit 1
-
-# if (test -f libstrophe/bootstrap.sh) && ! (test -f libstrophe/configure); then
-# echo "libstrophe..."
-# (cd libstrophe; ./bootstrap.sh)
-# fi
View
@@ -0,0 +1,101 @@
+#!/bin/sh
+
+LIBTOOLIZE_FLAGS="--automake --copy --force"
+AUTOMAKE_FLAGS="--add-missing --copy --force --foreign --warning=portability"
+ACLOCAL_FLAGS="-I m4"
+AUTOHEADER_FLAGS="--warnings=error"
+AUTOCONF_CLAGS="--warnings=error --force"
+
+
+ARGV0=$0
+ARGS="$@"
+
+die() { echo "$@"; exit 1; }
+
+run() {
+ echo "$ARGV0: running \`$@' $ARGS"
+ $@ $ARGS
+}
+
+# Try to locate a program by using which, and verify that the file is an
+# executable
+locate_binary() {
+ for f in $@
+ do
+ file=`which $f 2>/dev/null | grep -v '^no '`
+ if test -n "$file" -a -x "$file"; then
+ echo $file
+ return 0
+ fi
+ done
+
+ echo ""
+ return 1
+}
+
+if test -f config/pre_hook.sh
+then
+ . config/pre_hook.sh
+fi
+
+if [ -d .git ]
+then
+ perl config/version.pl || die "Failed to run config/version.pl"
+fi
+
+# Try to detect the supported binaries if the user didn't
+# override that by pushing the environment variable
+if test x$LIBTOOLIZE = x; then
+ LIBTOOLIZE=`locate_binary libtoolize glibtoolize`
+ if test x$LIBTOOLIZE = x; then
+ die "Did not find a supported libtoolize"
+ fi
+fi
+
+if test x$ACLOCAL = x; then
+ ACLOCAL=`locate_binary aclocal-1.11 aclocal-1.10 aclocal`
+ if test x$ACLOCAL = x; then
+ die "Did not find a supported aclocal"
+ fi
+fi
+
+if test x$AUTOMAKE = x; then
+ AUTOMAKE=`locate_binary automake-1.11 automake-1.10 automake`
+ if test x$AUTOMAKE = x; then
+ die "Did not find a supported automake"
+ fi
+fi
+
+if test x$AUTOCONF = x; then
+ AUTOCONF=`locate_binary autoconf`
+ if test x$AUTOCONF = x; then
+ die "Did not find a supported autoconf"
+ fi
+fi
+
+if test x$AUTOHEADER = x; then
+ AUTOHEADER=`locate_binary autoheader`
+ if test x$AUTOHEADER = x; then
+ die "Did not find a supported autoheader"
+ fi
+fi
+
+run $LIBTOOLIZE $LIBTOOLIZE_FLAGS || die "Can't execute libtoolize"
+run $ACLOCAL $ACLOCAL_FLAGS || die "Can't execute aclocal"
+run $AUTOHEADER $AUTOHEADER_FLAGS || die "Can't execute autoheader"
+run $AUTOMAKE $AUTOMAKE_FLAGS || die "Can't execute automake"
+run $AUTOCONF $AUTOCONF_FLAGS || die "Can't execute autoconf"
+
+if test -f config/post_hook.sh
+then
+ . config/post_hook.sh
+fi
+
+echo "---"
+echo "Configured with the following tools:"
+echo " * `$LIBTOOLIZE --version | head -1`"
+echo " * `$ACLOCAL --version | head -1`"
+echo " * `$AUTOHEADER --version | head -1`"
+echo " * `$AUTOMAKE --version | head -1`"
+echo " * `$AUTOCONF --version | head -1`"
+echo "---"
Oops, something went wrong.

0 comments on commit 5a1e1f4

Please sign in to comment.