Move a line of code so that it matches other cases.

[cycript.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index b10be3f1d881cf766343172aac013443d5fbb3cc..e307073096187649192f29828b1070448309dd72 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,19 +1,22 @@
 #!/usr/bin/env bash
 set -e
 #!/usr/bin/env bash
 set -e

-shopt -s expand_aliases
+shopt -s expand_aliases extglob

 unalias -a
 unalias -a

+libdirs=()

 case `uname` in
 (Linux)
        libdirs=('/usr/share/gettext')
        ;;
 (FreeBSD)
        alias sed=gsed
 case `uname` in
 (Linux)
        libdirs=('/usr/share/gettext')
        ;;
 (FreeBSD)
        alias sed=gsed

-       libdirs=()
+       ;;
+(Darwin)
+       alias sed=gsed libtoolize=glibtoolize

        ;;
 esac
 aclocal
 sed -e 's/AC_PROG_AWK/dnl &/' -i aclocal.m4
        ;;
 esac
 aclocal
 sed -e 's/AC_PROG_AWK/dnl &/' -i aclocal.m4

-cat `aclocal --print-ac-dir`/check_gnu_make.m4 find_apr.m4 >> aclocal.m4
+cat `aclocal --print-ac-dir`/ax_check_gnu_make.m4 !(aclocal).m4 >> aclocal.m4

 function filter()
 {
        sed -e '/no proper invocation of AM_INIT_AUTOMAKE was found\./d' \
 function filter()
 {
        sed -e '/no proper invocation of AM_INIT_AUTOMAKE was found\./d' \


@@ -22,7 +25,7 @@ function filter()
                -e '/and that aclocal\.m4 was recently regenerated (using aclocal)\./d' \
                -e "/no \`Makefile\.am' found for any configure output/d" \
                -e "/Consider adding \`AC_CONFIG_MACRO_DIR(\[m4\])' to configure\.ac and/d" \
                -e '/and that aclocal\.m4 was recently regenerated (using aclocal)\./d' \
                -e "/no \`Makefile\.am' found for any configure output/d" \
                -e "/Consider adding \`AC_CONFIG_MACRO_DIR(\[m4\])' to configure\.ac and/d" \

-               -e '/rerunning libtoolize, to keep the correct libtool macros in-tree\./d' \
+               -e '/rerunning g\?libtoolize, to keep the correct libtool macros in-tree\./d' \

                -e "/Consider adding \`-I m4' to ACLOCAL_AMFLAGS in Makefile\.am\./d"
 }
 automake -acf 2>&1 | filter
                -e "/Consider adding \`-I m4' to ACLOCAL_AMFLAGS in Makefile\.am\./d"
 }
 automake -acf 2>&1 | filter