X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=buildconf.sh;h=ee0d1be9efcb4161a2009a3f670217d60e952639;hp=d86b2701d8b9f0924f3c7d2643c93a4ab4af1e71;hb=1ffd6698cc631866391bf0d646f58907c32ab086;hpb=e77ab47ef9cea60b0c7acedef78a0c9913f493fd

diff --git a/buildconf.sh b/buildconf.sh
index d86b270..ee0d1be 100755
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -7,11 +7,7 @@ libtoolize=libtoolize
 
 test -d config || mkdir config
 if test .git; then
-    if test -d m4/.git -a -d doc/common/.git; then
-	:
-    else
-	git submodule init
-    fi
+    git submodule init
     git submodule update
 fi
 if [ "`uname -s`" = FreeBSD ]; then
@@ -23,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
@@ -49,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
@@ -65,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