projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add new test solr spellcheck test. Not added to dist test for now.
[pazpar2-moved-to-github.git]
/
buildconf.sh
diff --git
a/buildconf.sh
b/buildconf.sh
index
dc0ba93
..
82bd895
100755
(executable)
--- a/
buildconf.sh
+++ b/
buildconf.sh
@@
-7,15
+7,10
@@
libtoolize=libtoolize
autoheader=autoheader
test -d config || mkdir config
autoheader=autoheader
test -d config || mkdir config
-if test .git; then
- if test -d m4/.git -a -d doc/common/.git; then
- :
- else
- git submodule init
- fi
+if [ -d .git ]; then
+ git submodule init
git submodule update
fi
git submodule update
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 ..."
@@
-25,25
+20,38
@@
if [ "`uname -s`" = FreeBSD ]; then
libtoolize=libtoolize15
autoheader=autoheader259
fi
libtoolize=libtoolize15
autoheader=autoheader259
fi
+
+if [ "`uname -s`" = Darwin ]; then
+ echo "Using special configuration for Darwin/MacOS ..."
+ libtoolize=glibtoolize
+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 $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"
+ if [ -f /etc/debian_version ]; then
+ echo " sudo apt-get install automake1.9"
+ echo " sudo update-alternatives --config automake"
fi
exit 1
fi
set -x
fi
exit 1
fi
set -x
+$aclocal -I m4
+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
-# I am tired of underquoted warnings for Tcl macros
-$aclocal -I m4 2>&1 | grep -v aclocal/tcl.m4
-$autoheader
+$libtoolize --automake --force
$automake --add-missing
$autoconf
set -
if [ -f config.cache ]; then
$automake --add-missing
$autoconf
set -
if [ -f config.cache ]; then
- rm config.cache
+ rm config.cache
fi
enable_configure=false
fi
enable_configure=false
@@
-52,33
+60,38
@@
sh_flags=""
conf_flags=""
case $1 in
-d)
conf_flags=""
case $1 in
-d)
- #sh_flags="-g -Wall -Wdeclaration-after-statement"
- sh_flags="-g -Wall"
- enable_configure=true
- enable_help=false
- shift
- ;;
+ sh_cflags="-g -Wall -Wdeclaration-after-statement -Wstrict-prototypes"
+ sh_cxxflags="-g -Wall"
+ enable_configure=true
+ enable_help=false
+ shift
+ ;;
-c)
-c)
- sh_flags=""
- enable_configure=true
- enable_help=false
- shift
- ;;
+ sh_cflags=""
+ sh_cxxflags=""
+ enable_configure=true
+ enable_help=false
+ shift
+ ;;
esac
if $enable_configure; then
esac
if $enable_configure; then
- if test -n "$sh_flags"; then
- CFLAGS="$sh_flags" ./configure $*
+ if [ -n "$sh_cflags" ]; then
+ if $has_libtool; then
+ CFLAGS="$sh_cflags" CXXFLAGS="$sh_cxxflags" ./configure --disable-shared --enable-static $*
+ else
+ CFLAGS="$sh_cflags" CXXFLAGS="$sh_cxxflags" ./configure $*
+ fi
else
./configure $*
fi
fi
if $enable_help; then
cat <<EOF
else
./configure $*
fi
fi
if $enable_help; then
cat <<EOF
-
+
Build the Makefiles with the configure command.
./configure [--someoption=somevalue ...]
Build the Makefiles with the configure command.
./configure [--someoption=somevalue ...]
-
+
For help on options or configuring run
./configure --help
For help on options or configuring run
./configure --help
@@
-93,16
+106,27
@@
Build distribution tarball with
Verify distribution tarball with
make distcheck
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
Or just build the Debian packages without configuring
dpkg-buildpackage -rfakeroot
-When building from a CVS checkout, you need these Debian tools:
- libyaz-dev
+When building from Git, you need these Debian packages:
+ autoconf automake libtool gcc tcl8.4
+ xsltproc docbook docbook-xml docbook-xsl
+ libxslt1-dev libgnutls-dev libreadline5-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
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
fi
-# Local Variables:
-# mode:shell-script
-# sh-indentation: 2
-# sh-basic-offset: 4
-# End: