X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=buildconf.sh;h=5ce967ccd6db65cc41d65f621ea66f80f63a2c4c;hb=a624e2e9e2271292147cb432411464bd5eab8da6;hp=6ba4f293b8863d84e7fb5ef7f17a0e36b8c3e1f8;hpb=689ff444ffea343f202398ee3eacf5a4cf94154e;p=yaz-moved-to-github.git

diff --git a/buildconf.sh b/buildconf.sh
index 6ba4f29..5ce967c 100755
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
-# $Id: buildconf.sh,v 1.46 2007-02-20 09:53:01 adam Exp $
 
 automake=automake
 aclocal=aclocal
@@ -7,7 +6,10 @@ 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 ..."
@@ -17,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
@@ -43,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
@@ -59,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
@@ -95,6 +103,12 @@ When building from a CVS checkout, you need these Debian packages:
   xsltproc, docbook, docbook-xml, docbook-xsl,
   libxslt1-dev, libssl-dev, libreadline5-dev, libwrap0-dev,
   libpcap0.8-dev
+
+Also perhaps: libgnutls-dev libicu-dev
+
+And if you want to make a Debian package: dpkg-dev fakeroot debhelper
+(Then run "dpkg-buildpackage -rfakeroot" in this directory.)
+
 EOF
     fi
     if [ "`uname -s`" = FreeBSD ]; then