From 5a1dff056342561c67f92e4751fc85853ac65a59 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Fri, 7 Nov 2008 14:00:34 +0100 Subject: [PATCH] Same buildconf.sh as yaz --- buildconf.sh | 49 +++++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/buildconf.sh b/buildconf.sh index 037546b..ee0d1be 100755 --- a/buildconf.sh +++ b/buildconf.sh @@ -10,7 +10,6 @@ if test .git; then git submodule init git submodule update fi - if [ "`uname -s`" = FreeBSD ]; then # FreeBSD intalls the various auto* tools with version numbers echo "Using special configuration for FreeBSD ..." @@ -20,6 +19,11 @@ if [ "`uname -s`" = FreeBSD ]; then libtoolize=libtoolize15 fi +if [ "`uname -s`" = Darwin ]; then + echo "Using special configuration for Darwin/MacOS ..." + libtoolize=glibtoolize +fi + if $automake --version|head -1 |grep '1\.[4-7]'; then echo "automake 1.4-1.7 is active. You should use automake 1.8 or later" if test -f /etc/debian_version; then @@ -31,9 +35,9 @@ fi set -x # I am tired of underquoted warnings for Tcl macros -$aclocal -I m4 2>&1 | grep -v aclocal/tcl.m4 +$aclocal -I m4 $libtoolize --automake --force -$automake -a +$automake --add-missing $autoconf set - if [ -f config.cache ]; then @@ -46,25 +50,15 @@ sh_flags="" conf_flags="" case $1 in -d) - sh_flags="-g -Wall -O0 -Wdeclaration-after-statement -Wstrict-prototypes" - enable_configure=true - enable_help=false - shift - ;; - -p) - sh_flags="-g -pg -Wall -Wdeclaration-after-statement -Wstrict-prototypes" - enable_configure=true - enable_help=false - shift - ;; - -o) - sh_flags="-g -Wall -O3 -Wdeclaration-after-statement -Wstrict-prototypes" + sh_cflags="-g -Wall -Wdeclaration-after-statement -Wstrict-prototypes" + sh_cxxflags="-g -Wall" enable_configure=true enable_help=false shift ;; -c) - sh_flags="" + sh_cflags="" + sh_cxxflags="" enable_configure=true enable_help=false shift @@ -73,7 +67,7 @@ esac if $enable_configure; then if test -n "$sh_flags"; then - CFLAGS="$sh_flags" ./configure --disable-shared $* + CFLAGS="$sh_cflags" CXXFLAGS="$sh_cxxflags" ./configure --disable-shared --enable-static $* else ./configure $* fi @@ -98,13 +92,24 @@ Build distribution tarball with Verify distribution tarball with make distcheck +EOF + if [ -f /etc/debian_version ]; then + cat <