Re-format and check of return value from fread.

[yaz-moved-to-github.git] / buildconf.sh

diff --git a/buildconf.sh b/buildconf.sh
index 7e6581d..ee0d1be 100755 (executable)
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -6,13 +6,10 @@ autoconf=autoconf
 libtoolize=libtoolize
 
 test -d config || mkdir config
-if test -d m4/.git -a -d doc/common/.git; then
-    :
-else
+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 ..."
@@ -22,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
@@ -48,14 +50,15 @@ sh_flags=""
 conf_flags=""
 case $1 in
     -d)
-       #sh_flags="-g -Wall -Wdeclaration-after-statement -Werror -Wstrict-prototypes"
-       sh_flags="-g -Wall -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
@@ -64,7 +67,7 @@ esac
 
 if $enable_configure; then
     if test -n "$sh_flags"; then
-       CFLAGS="$sh_flags" ./configure --disable-shared --enable-static $*
+       CFLAGS="$sh_cflags" CXXFLAGS="$sh_cxxflags" ./configure --disable-shared --enable-static $*
     else
        ./configure $*
     fi