projects
/
yazpp-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yazpp
[yazpp-moved-to-github.git]
/
buildconf.sh
diff --git
a/buildconf.sh
b/buildconf.sh
index
a889bdb
..
20df4b6
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
@@
-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 ..."
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
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
@@
-113,8
+119,9
@@
EOF
if [ "`uname -s`" = FreeBSD ]; then
cat <<EOF
When building from a Git, you need these FreeBSD Ports:
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
EOF
fi
fi