X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=autogen.sh;h=5e9822c2ce9e9458c3425f9d73f6317f571dff9c;hb=8a2e76b7021b9b960d7c30801a1a14461d9b5939;hp=c1e8ad42cd62e61ee367fdd71b1cc0af52b0f5bb;hpb=9e54d0d278226f084a01468ac4a5cc4ba87d5ec3;p=inkscape.git diff --git a/autogen.sh b/autogen.sh index c1e8ad42c..5e9822c2c 100755 --- a/autogen.sh +++ b/autogen.sh @@ -155,7 +155,7 @@ test $TEST_TYPE $FILE || { if test -z "$ACLOCAL_FLAGS"; then acdir=`$ACLOCAL --print-ac-dir` - m4list="glib-2.0.m4 glib-gettext.m4 gtk-2.0.m4 intltool.m4 pkg.m4" + m4list="glib-2.0.m4 glib-gettext.m4 gtk-2.0.m4 intltool.m4 pkg.m4 libtool.m4" for file in $m4list do @@ -182,6 +182,10 @@ attempt_command 'underquoted definition of|[\)\#]Extending' \ attempt_command '' autoheader } +# use glibtoolize if it is available (darwin) +(glibtoolize --version) < /dev/null > /dev/null 2>&1 && LIBTOOLIZE=glibtoolize || LIBTOOLIZE=libtoolize + +attempt_command '' $LIBTOOLIZE attempt_command '' $AUTOMAKE --copy --force --add-missing attempt_command '' autoconf attempt_command '^(Please add the files| codeset| progtest|from the|or directly|You will also|ftp://ftp.gnu.org|$)' \