On 17/7/10 06:38, ~suv wrote:
On 17/7/10 06:20, ~suv wrote:
As of revision 9618 Inkscape builds again on osx - with DBUS disabled.
Forgot to mention: I still have the change in 'autogen.sh' (the simple workaround for the libtoolize issue on osx platforms, diff attached), but did not manually run autogen.sh again, just 'make' after updating from trunk (console log attached).
Attaching a revised diff (against r9627) for autogen.sh, hopefully allowing to autogen/configure on osx without breaking it on linux [1].
@Michael - could you test it with the osx development snapshots? @anyone on linux - could you review and test?
Note: configure option "--enable-dbusapi" not tested on osx, fix tested with default (with_dbus="no").
~suv
[1] code heavily borrowed from Wireshark, which has a similarly structured autogen.sh as Inkscape AFAICT.
http://anonsvn.wireshark.org/viewvc/trunk/autogen.sh?revision=26209&view=markup
=== modified file 'autogen.sh' --- autogen.sh 2010-03-26 04:34:25 +0000 +++ autogen.sh 2010-07-19 21:36:17 +0000 @@ -18,6 +18,7 @@ AUTOMAKE_REQUIRED_VERSION=1.10 GLIB_REQUIRED_VERSION=2.0.0 INTLTOOL_REQUIRED_VERSION=0.17 +LIBTOOL_REQUIRED_VERSION=1.4
srcdir=`dirname "$0"` test -z "$srcdir" && srcdir=. @@ -136,6 +137,33 @@ DIE=1 fi
+echo -n "checking for libtool >= $LIBTOOL_REQUIRED_VERSION ... " +# +# Apple's Developer Tools have a "libtool" that has nothing to do with +# the GNU libtool; they call the latter "glibtool". They also call +# libtoolize "glibtoolize". +# +# Check for "glibtool" first. +# +if (glibtool --version) < /dev/null > /dev/null 2>&1; then + VER=`glibtool --version \ + | grep libtool | sed -n 's/.* ([0-9.]*)/\1/p'` + if test -z "$VER"; then + VER=`libtool --version \ + | grep libtool | sed -n 's/.* ([0-9.]*)/\1/p'` + LIBTOOLIZE=libtoolize + else + LIBTOOLIZE=glibtoolize + fi + check_version "$VER" "$LIBTOOL_REQUIRED_VERSION" +else + echo + echo " You must have libtool installed to compile $PROJECT." + echo " Get the latest version from" + echo " ftp://ftp.gnome.org/pub/GNOME/sources/libtool/" + DIE=1 +fi + if test "$DIE" -eq 1; then echo echo "Please install/upgrade the missing tools and call me again." @@ -182,7 +210,7 @@ attempt_command '' autoheader }
-attempt_command '' 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|$)' \