From 6102d9c8e73ee414dc2d5654b4cba83432d1f15a Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Fri, 7 Nov 2008 13:59:44 +0100 Subject: [PATCH] Same buildconf.sh as yaz --- buildconf.sh | 56 ++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 44 insertions(+), 12 deletions(-) diff --git a/buildconf.sh b/buildconf.sh index 4e7fff0..ee0d1be 100755 --- a/buildconf.sh +++ b/buildconf.sh @@ -1,12 +1,30 @@ #!/bin/sh +automake=automake +aclocal=aclocal +autoconf=autoconf +libtoolize=libtoolize + test -d config || mkdir config 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 ..." + automake=automake19 + aclocal="aclocal19 -I /usr/local/share/aclocal" + autoconf=autoconf259 + 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 +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 echo " sudo apt-get install automake1.9" @@ -17,10 +35,10 @@ fi set -x # I am tired of underquoted warnings for Tcl macros -aclocal -I m4 2>&1 | grep -v aclocal/tcl.m4 -libtoolize --automake --force -automake --add-missing -autoconf +$aclocal -I m4 +$libtoolize --automake --force +$automake --add-missing +$autoconf set - if [ -f config.cache ]; then rm config.cache @@ -32,13 +50,15 @@ sh_flags="" conf_flags="" case $1 in -d) - sh_flags="-g -Wall" + 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 @@ -47,7 +67,7 @@ esac if $enable_configure; then if test -n "$sh_flags"; then - CFLAGS="$sh_flags" CXXFLAGS="$sh_flags" ./configure --disable-shared --enable-static $* + CFLAGS="$sh_cflags" CXXFLAGS="$sh_cxxflags" ./configure --disable-shared --enable-static $* else ./configure $* fi @@ -72,12 +92,24 @@ Build distribution tarball with Verify distribution tarball with make distcheck +EOF + if [ -f /etc/debian_version ]; then + cat <