projects
/
metaproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ignore three more generated binaries.
[metaproxy-moved-to-github.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
8b00725
..
666de4b
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-3,7
+3,7
@@
# Autoconf and automake setup
AC_PREREQ(2.59)
# Autoconf and automake setup
AC_PREREQ(2.59)
-AC_INIT([metaproxy],[1.0.5.1], [adam@indexdata.dk])
+AC_INIT([metaproxy],[1.0.6], [adam@indexdata.dk])
AC_CONFIG_HEADERS(src/config.hpp)
AC_CONFIG_HEADERS(src/config.hpp)
@@
-34,6
+34,16
@@
fi
# Checks for libraries.
AC_CHECK_LIB(dl,dlopen)
# Checks for libraries.
AC_CHECK_LIB(dl,dlopen)
+boostdir="yes"
+AC_ARG_WITH(boost, [ ---with-boost=PREFIX Boost library in PREFIX],[boostdir=$withval])
+
+if test "$openssl" != "yes"; then
+ CPPFLAGS="-I${boostdir}/include"
+ LIBS="-L${boostdir}/lib"
+fi
+
+AC_CHECK_LIB(pthread, main)
+
AC_CHECK_LIB(boost_thread, main, [],[
AC_MSG_NOTICE([boost thread library not found.])
AC_MSG_ERROR([Install libboost-thread-dev (or similar)])
AC_CHECK_LIB(boost_thread, main, [],[
AC_MSG_NOTICE([boost thread library not found.])
AC_MSG_ERROR([Install libboost-thread-dev (or similar)])
@@
-105,6
+115,9
@@
AC_CONFIG_FILES([
Makefile
src/Makefile
src/Jamfile
Makefile
src/Makefile
src/Jamfile
+ xml/Makefile
+ xml/schema/Makefile
+ xml/xslt/Makefile
doc/Makefile
doc/local.ent
doc/common/Makefile
doc/Makefile
doc/local.ent
doc/common/Makefile
@@
-117,11
+130,14
@@
AC_OUTPUT
# postamble
# postamble
+
echo \
"------------------------------------------------------------------------
echo \
"------------------------------------------------------------------------
-Configuration:
+ Package: ${PACKAGE}
+ Version: ${VERSION}
Source code location: ${srcdir}
Source code location: ${srcdir}
+ CPP Preprocessor: ${CPP}
CPP Preprocessor flags: ${CPPFLAGS}
CXX Compiler: ${CXX}
CXX Compiler flags: ${CXXFLAGS}
CPP Preprocessor flags: ${CPPFLAGS}
CXX Compiler: ${CXX}
CXX Compiler flags: ${CXXFLAGS}
@@
-130,5
+146,12
@@
Configuration:
Host System Type: ${host}
Install path: ${prefix}
Automake: ${AUTOMAKE}
Host System Type: ${host}
Install path: ${prefix}
Automake: ${AUTOMAKE}
+ Archiver: ${AR}
+ Ranlib: ${RANLIB}
+ YAZPP Version: ${YAZPPVERSION}
+ YAZPP Include: ${YAZPPINC}
+ YAZPP La Lib: ${YAZPPLALIB}
+ YAZPP Lib: ${YAZPPLIB}
+ Bugreport: ${PACKAGE_BUGREPORT}
------------------------------------------------------------------------"
------------------------------------------------------------------------"