From: Adam Dickmeiss Date: Thu, 25 Dec 2008 12:07:28 +0000 (+0100) Subject: Same buildconf.sh as YAZ X-Git-Tag: v1.1.0~55 X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=2311dd7029190f566a9def35709c1c6606e58612;p=pazpar2-moved-to-github.git Same buildconf.sh as YAZ --- diff --git a/buildconf.sh b/buildconf.sh index c62d047..a889bdb 100755 --- a/buildconf.sh +++ b/buildconf.sh @@ -4,14 +4,12 @@ automake=automake aclocal=aclocal autoconf=autoconf libtoolize=libtoolize -autoheader=autoheader test -d config || mkdir config -if test .git; then +if [ -d .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 ..." @@ -19,27 +17,30 @@ if [ "`uname -s`" = FreeBSD ]; then aclocal="aclocal19 -I /usr/local/share/aclocal" autoconf=autoconf259 libtoolize=libtoolize15 - autoheader=autoheader259 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 - echo " sudo apt-get install automake1.9" - echo " sudo update-alternatives --config automake" + if [ -f /etc/debian_version ]; then + echo " sudo apt-get install automake1.9" + echo " sudo update-alternatives --config automake" fi exit 1 fi set -x - -# I am tired of underquoted warnings for Tcl macros -$aclocal -I m4 2>&1 | grep -v aclocal/tcl.m4 -$autoheader +$aclocal -I m4 +$libtoolize --automake --force $automake --add-missing $autoconf set - if [ -f config.cache ]; then - rm config.cache + rm config.cache fi enable_configure=false @@ -48,33 +49,34 @@ sh_flags="" conf_flags="" case $1 in -d) - #sh_flags="-g -Wall -Wdeclaration-after-statement" - sh_flags="-g -Wall" - enable_configure=true - enable_help=false - shift - ;; + sh_cflags="-g -Wall -Wdeclaration-after-statement -Wstrict-prototypes" + sh_cxxflags="-g -Wall" + enable_configure=true + enable_help=false + shift + ;; -c) - sh_flags="" - enable_configure=true - enable_help=false - shift - ;; + sh_cflags="" + sh_cxxflags="" + enable_configure=true + enable_help=false + shift + ;; esac if $enable_configure; then - if test -n "$sh_flags"; then - CFLAGS="$sh_flags" ./configure $* + if [ -n "$sh_cflags" ]; then + CFLAGS="$sh_cflags" CXXFLAGS="$sh_cxxflags" ./configure --disable-shared --enable-static $* else ./configure $* fi fi if $enable_help; then cat <