Mention Git instead of CVS. Use [ instead of test where appropriate.

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

diff --git a/buildconf.sh b/buildconf.sh
index 5f60670..a889bdb 100755 (executable)
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -6,7 +6,7 @@ autoconf=autoconf
 libtoolize=libtoolize
 
 test -d config || mkdir config
-if test .git; then
+if [ -d .git ]; then
     git submodule init
     git submodule update
 fi
@@ -26,7 +26,7 @@ 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
+    if [ -f /etc/debian_version ]; then
         echo " sudo apt-get install automake1.9"
         echo " sudo update-alternatives --config automake"
     fi
@@ -34,7 +34,6 @@ if $automake --version|head -1 |grep '1\.[4-7]'; then
 fi
 
 set -x
-# I am tired of underquoted warnings for Tcl macros
 $aclocal -I m4
 $libtoolize --automake --force 
 $automake --add-missing 
@@ -50,14 +49,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,8 +65,8 @@ case $1 in
 esac
 
 if $enable_configure; then
-    if test -n "$sh_flags"; then
-       CFLAGS="$sh_flags" ./configure --disable-shared --enable-static $*
+    if [ -n "$sh_cflags" ]; then
+       CFLAGS="$sh_cflags" CXXFLAGS="$sh_cxxflags" ./configure --disable-shared --enable-static $*
     else
        ./configure $*
     fi
@@ -97,16 +97,22 @@ EOF
 Or just build the Debian packages without configuring
   dpkg-buildpackage -rfakeroot
 
-When building from a CVS checkout, you need these Debian packages:
+When building from Git, you need these Debian packages:
   autoconf, automake, libtool, gcc, bison, any tcl,
   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
         cat <<EOF
-When building from a CVS checkout, you need these FreeBSD Ports:
+When building from a Git, you need these FreeBSD Ports:
   autoconf259, automake19, libtool15, bison, tcl84,
   docbook-xsl, libxml2, libxslt, g++-4.0, make
 EOF