Update m4

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

diff --git a/buildconf.sh b/buildconf.sh
index a889bdb..fc07d69 100755 (executable)
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -4,6 +4,7 @@ automake=automake
 aclocal=aclocal
 autoconf=autoconf
 libtoolize=libtoolize
 aclocal=aclocal
 autoconf=autoconf
 libtoolize=libtoolize

+autoheader=autoheader

 
 test -d config || mkdir config
 if [ -d .git ]; then
 
 test -d config || mkdir config
 if [ -d .git ]; then

@@ -17,6 +18,7 @@ if [ "`uname -s`" = FreeBSD ]; then
     aclocal="aclocal19 -I /usr/local/share/aclocal"
     autoconf=autoconf259
     libtoolize=libtoolize15
     aclocal="aclocal19 -I /usr/local/share/aclocal"
     autoconf=autoconf259
     libtoolize=libtoolize15

+    autoheader=autoheader259

 fi
 
 if [ "`uname -s`" = Darwin ]; then
 fi
 
 if [ "`uname -s`" = Darwin ]; then

@@ -35,6 +37,9 @@ fi
 
 set -x
 $aclocal -I m4
 
 set -x
 $aclocal -I m4

+if grep AC_CONFIG_HEADERS configure.ac >/dev/null; then
+    $autoheader
+fi

 $libtoolize --automake --force 
 $automake --add-missing 
 $autoconf
 $libtoolize --automake --force 
 $automake --add-missing 
 $autoconf

@@ -66,7 +71,8 @@ esac
 
 if $enable_configure; then
     if [ -n "$sh_cflags" ]; then
 
 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
     else
        ./configure $*
     fi