projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yaz-icu.c refactor and cleanup
[yaz-moved-to-github.git]
/
buildconf.sh
diff --git
a/buildconf.sh
b/buildconf.sh
index
ec44e4c
..
c82194a
100755
(executable)
--- a/
buildconf.sh
+++ b/
buildconf.sh
@@
-14,11
+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
- autoheader=autoheader259
+ 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
@@
-40,6
+40,12
@@
$aclocal -I m4
if grep AC_CONFIG_HEADERS configure.ac >/dev/null; then
$autoheader
fi
if grep AC_CONFIG_HEADERS configure.ac >/dev/null; then
$autoheader
fi
+if grep AM_PROG_LIBTOOL configure.ac >/dev/null; then
+ has_libtool=true
+else
+ has_libtool=false
+fi
+
$libtoolize --automake --force
$automake --add-missing
$autoconf
$libtoolize --automake --force
$automake --add-missing
$autoconf
@@
-71,7
+77,12
@@
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 $*
+ if $has_libtool; then
+ CFLAGS="$sh_cflags" CXXFLAGS="$sh_cxxflags" ./configure \
+ --disable-shared --enable-static --with-pic $*
+ else
+ CFLAGS="$sh_cflags" CXXFLAGS="$sh_cxxflags" ./configure $*
+ fi
else
./configure $*
fi
else
./configure $*
fi
@@
-118,8
+129,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