X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=buildconf.sh;h=dff34677984839817c620389dd0256adf1db5e42;hb=76f5f8bd7124c8643be25e0d9838e5897e19df8a;hp=b0edd6cf8748c0a3bc4b8c121548463a1fe52827;hpb=90aa30aeb696ad039711db3c1404406b53df4dd3;p=yaz-moved-to-github.git

diff --git a/buildconf.sh b/buildconf.sh
index b0edd6c..dff3467 100755
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -19,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
@@ -45,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
@@ -60,8 +66,8 @@ case $1 in
 esac
 
 if $enable_configure; then
-    if test -n "$sh_flags"; then
-	CFLAGS="$sh_flags" ./configure --disable-shared --enable-static $*
+    if test -n "$sh_cflags"; then
+	CFLAGS="$sh_cflags" CXXFLAGS="$sh_cxxflags" ./configure --disable-shared --enable-static $*
     else
 	./configure $*
     fi
@@ -97,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