X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=buildconf.sh;h=20df4b690014346ab98d469eaf8a61f62eeeadb4;hb=a60c186e884b033ed25db9cd5775d72272e4b3d6;hp=a889bdb99a2a7e61d8d85d40d4f6a77ca53fe117;hpb=a0042915b20e2a1d15efa254c35e22cf09e0796a;p=yazpp-moved-to-github.git

diff --git a/buildconf.sh b/buildconf.sh
index a889bdb..20df4b6 100755
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -4,6 +4,7 @@ automake=automake
 aclocal=aclocal
 autoconf=autoconf
 libtoolize=libtoolize
+autoheader=autoheader
 
 test -d config || mkdir config
 if [ -d .git ]; then
@@ -13,10 +14,11 @@ fi
 if [ "`uname -s`" = FreeBSD ]; then
     # FreeBSD intalls the various auto* tools with version numbers
     echo "Using special configuration for FreeBSD ..."
-    automake=automake19
-    aclocal="aclocal19 -I /usr/local/share/aclocal"
-    autoconf=autoconf259
-    libtoolize=libtoolize15
+    automake=automake
+    aclocal="aclocal -I /usr/local/share/aclocal"
+    autoconf=autoconf
+    libtoolize=libtoolize
+    autoheader=autoheader
 fi
 
 if [ "`uname -s`" = Darwin ]; then
@@ -35,6 +37,9 @@ fi
 
 set -x
 $aclocal -I m4
+if grep AC_CONFIG_HEADERS configure.ac >/dev/null; then
+    $autoheader
+fi
 $libtoolize --automake --force 
 $automake --add-missing 
 $autoconf
@@ -66,7 +71,8 @@ esac
 
 if $enable_configure; then
     if [ -n "$sh_cflags" ]; then
-	CFLAGS="$sh_cflags" CXXFLAGS="$sh_cxxflags" ./configure --disable-shared --enable-static $*
+	CFLAGS="$sh_cflags" CXXFLAGS="$sh_cxxflags" ./configure \
+		--disable-shared --enable-static --with-pic $*
     else
 	./configure $*
     fi
@@ -113,8 +119,9 @@ EOF
     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
+  pkg_add -r autoconf262 automake110 libtool bison tcl84 \\
+             docbook-xsl libxml2 libxslt
+  pkg_add -r icu4
 EOF
     fi
 fi