author | Michael Krelin <hacker@klever.net> | 2009-04-25 19:00:57 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2009-04-25 19:00:57 (UTC) |
commit | ad2d5d7e3a84d35b819e959d6ebab782f5d75b83 (patch) (side-by-side diff) | |
tree | 1be9c783b56d04a3946939d81eb61a8c2d7fbe1a | |
parent | f2ddaefebeed168a9fdf1b5f5065b1850e616fc0 (diff) | |
parent | 18ae3c58d51547bc087e7a2b85b63dd87d395f25 (diff) | |
download | libopkele-ad2d5d7e3a84d35b819e959d6ebab782f5d75b83.zip libopkele-ad2d5d7e3a84d35b819e959d6ebab782f5d75b83.tar.gz libopkele-ad2d5d7e3a84d35b819e959d6ebab782f5d75b83.tar.bz2 |
Merge commit 'cheetah/master' into next
Conflicts:
autogen.sh
-rwxr-xr-x | autogen.sh | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -1,7 +1,9 @@ #!/bin/sh -WANT_AUTOMAKE=1.8 -export WANT_AUTOMAKE -libtoolize -f \ +tool_libtoolize="$(type -P glibtoolize || type -P libtoolize)" +if test -z "$tool_libtoolize" ; then + echo "Failed to find libtoolize." ; exit 1; +fi + "$tool_libtoolize" -f \ && aclocal -I aclocal.d \ && autoheader \ && automake -a \ |