X-Git-Url: http://git.indexdata.com/?p=yazproxy-moved-to-github.git;a=blobdiff_plain;f=buildconf.sh;h=d6d56c22d6d7ea62b66f3e1d1dfc728660901b32;hp=69239a1d133cdd4a8dfcad0c366714f06b8eea4f;hb=ce9c34c8d11accbe042cdae74954274e5e4863fe;hpb=67667a51aefad50499f3861dd080e16974fe979e

diff --git a/buildconf.sh b/buildconf.sh
index 69239a1..d6d56c2 100755
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -1,57 +1,12 @@
 #!/bin/sh
 
-test -d config || mkdir config
-if test .git; then
+if [ -d .git ]; then
     git submodule init
     git submodule update
 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
-        echo " sudo apt-get install automake1.9"
-        echo " sudo update-alternatives --config automake"
-    fi
-    exit 1
-fi
-
-set -x
-# I am tired of underquoted warnings for Tcl macros
-aclocal -I m4 2>&1 | grep -v aclocal/tcl.m4
-libtoolize --automake --force 
-automake --add-missing 
-autoconf
-set -
-if [ -f config.cache ]; then
-	rm config.cache
-fi
+. m4/id-config.sh
 
-enable_configure=false
-enable_help=true
-sh_flags=""
-conf_flags=""
-case $1 in
-    -d)
-	sh_flags="-g -Wall"
-	enable_configure=true
-	enable_help=false
-	shift
-	;;
-    -c)
-	sh_flags=""
-	enable_configure=true
-	enable_help=false
-	shift
-	;;
-esac
-
-if $enable_configure; then
-    if test -n "$sh_flags"; then
-	CXXFLAGS="$sh_flags" ./configure --disable-shared --enable-static $*
-    else
-	./configure $*
-    fi
-fi
 if $enable_help; then
     cat <<EOF
 
@@ -72,12 +27,30 @@ Build distribution tarball with
 Verify distribution tarball with
   make distcheck
 
+EOF
+    if [ -f /etc/debian_version ]; then
+        cat <<EOF
 Or just build the Debian packages without configuring
   dpkg-buildpackage -rfakeroot
 
-When building from a CVS checkout, you need these Debian tools:
-  autoconf, automake, libtool, gcc, g++, make,
+When building from Git, you need these Debian packages:
+  autoconf, automake, libtool, gcc, bison, any tcl,
   xsltproc, docbook, docbook-xml, docbook-xsl,
-  libxslt1-dev, libyazpp1-dev
+  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 Git, you need these FreeBSD Ports:
+  autoconf259, automake19, libtool15, bison, tcl84,
+  docbook-xsl, libxml2, libxslt, g++-4.0, make
+EOF
+    fi
 fi