From 72942b6650af98632103a0908882b71c4113e153 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Fri, 1 May 2009 11:00:54 +0200 Subject: [PATCH] buildconf.sh uses only Libtool flags when present --- buildconf.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/buildconf.sh b/buildconf.sh index ec44e4c..9671592 100755 --- a/buildconf.sh +++ b/buildconf.sh @@ -40,6 +40,12 @@ $aclocal -I m4 if grep AC_CONFIG_HEADERS configure.ac >/dev/null; then $autoheader fi +if grep AM_PROG_LIBTOOL configure.ac >/dev/null; then + has_libtool=true +else + has_libtool=false +fi + $libtoolize --automake --force $automake --add-missing $autoconf @@ -71,7 +77,11 @@ esac if $enable_configure; then if [ -n "$sh_cflags" ]; then - CFLAGS="$sh_cflags" CXXFLAGS="$sh_cxxflags" ./configure --disable-shared --enable-static $* + if $has_libtool; then + CFLAGS="$sh_cflags" CXXFLAGS="$sh_cxxflags" ./configure --disable-shared --enable-static $* + else + CFLAGS="$sh_cflags" CXXFLAGS="$sh_cxxflags" ./configure $* + fi else ./configure $* fi -- 1.7.10.4