X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.ac;h=753551247eabe3c65e0d37af0b7737b18104da61;hb=94e341af1ed1bcb064089db64836015844c3dcd7;hp=b611303df9efabd1a1c08a83d2cd2858e81dcb56;hpb=74420da6f0c5cffc13ac62d7d845fade996e7c0f;p=metaproxy-moved-to-github.git

diff --git a/configure.ac b/configure.ac
index b611303..7535512 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,18 +2,17 @@
 ## Process this file with autoconf to produce a configure script.
 
 # Autoconf and automake setup
-AC_PREREQ(2.57)
-AC_INIT(yp2, 0.0.1, marc@indexdata.dk)
-AM_CONFIG_HEADER(src/config.hpp)
+AC_PREREQ(2.59)
+AC_INIT([metaproxy],[1.0.10],[metaproxy-help@indexdata.dk])
 
+AC_CONFIG_HEADERS(src/config.hpp)
 
-AC_CONFIG_SRCDIR(configure.ac) 
-AC_CONFIG_AUX_DIR(config)
+AC_CONFIG_SRCDIR([configure.ac]) 
+AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_SYSTEM
 ##AC_PREFIX_DEFAULT(`pwd`/install) 
 
-AM_INIT_AUTOMAKE
-
+AM_INIT_AUTOMAKE([1.8])
 
 # Checks for programs.
 AC_PROG_CXX
@@ -24,92 +23,73 @@ AC_PROG_MAKE_SET
 AC_PROG_RANLIB
 AM_PROG_LIBTOOL
 
-# Use C++ compilers only for tests
-AC_LANG(C++)
+# Default language to use for tests (some tests may switch to C++)
+AC_LANG(C)
 
-# Checks for libraries.
-##AC_CHECK_LIB(ibrary, main)
-AC_CHECK_LIB(boost_thread, main, [],[
-	AC_MSG_ERROR([boost thread library not found. Install libboost-thread-dev (or similar)])
-])
+if test "$enable_shared" = "yes"; then
+    AC_DEFINE([HAVE_DL_SUPPORT],[1],
+	[Define to 1 if you have shared module support])
+fi
 
-AC_MSG_CHECKING([for boost_unit_test_framework presence])
-OLIBS=$LIBS
-LIBS="$LIBS -lboost_unit_test_framework"
-AC_TRY_LINK([
-#define BOOST_AUTO_TEST_MAIN
-#include <boost/test/auto_unit_test.hpp> 
-BOOST_AUTO_TEST_CASE( test )
-{
- BOOST_CHECK(true);
-}
-],[],
-[
-	AC_MSG_RESULT([yes])
-	LIBS=$OLIBS
-],
-[
-	AC_MSG_RESULT([no])
-	AC_MSG_ERROR([Install libboost-test-dev (or similar)])
-])
+# Checks for libraries.
+AC_CHECK_LIB(dl,dlopen)
+AC_CHECK_LIB(m,main)
 
 ## YAZPP checks
-YAZPP_INIT(threads,1.0)
+YAZPP_INIT([threads],[1.0.3])
 if test -z "$YAZPPLIB"; then
-	AC_MSG_ERROR([YAZ++ development libraries missing])
+    AC_MSG_ERROR([YAZ++ development libraries missing])
 fi
-##YAZ_DOC
-
-## libxslt checks
-AC_SUBST(XSLT_LIBS)
-AC_SUBST(XSLT_CFLAGS)
-xsltdir=default
-AC_ARG_WITH(xslt,[[  --with-xslt[=PREFIX]    use libxslt in PREFIX]],xsltdir=$withval)
-if test "$xsltdir" = "yes" -o "$xsltdir" = "default"; then
-	for d in /usr /usr/local; do
-		if test -x $d/bin/xslt-config; then
-			xsltdir=$d
-		fi
-	done
+YAZ_DOC
+CPPFLAGS="$YAZPPINC $CPPFLAGS"
+
+# check for Boost C++ development libs and headers
+
+AX_BOOST([1.32])
+if test "$ax_cv_boost_base" = "no"; then
+    AC_MSG_ERROR([install libboost-dev or similar])
+fi
+if test "$ax_cv_boost_date_time" = "no"; then
+    AC_MSG_ERROR([install libboost-date-time-dev or similar])
+fi
+if test "$ax_cv_boost_program_options" = "no"; then
+    AC_MSG_ERROR([install libboost-program-options-dev or similar])
 fi
-if test "$xsltdir" != "no"; then
-	AC_MSG_CHECKING(for libXSLT)
-	if test -x $xsltdir/bin/xslt-config; then
-		XSLT_LIBS=`$xsltdir/bin/xslt-config --libs`
-		XSLT_CFLAGS=`$xsltdir/bin/xslt-config --cflags`
-		XSLT_VER=`$xsltdir/bin/xslt-config --version`
-		AC_MSG_RESULT($XSLT_VER)
-		AC_DEFINE([HAVE_XSLT],[1],
-                [Define to 1 if you have libxslt installed])
-	else
-		AC_MSG_RESULT(Not found)
-                if test "$xsltdir" = "default"; then
-                        AC_MSG_WARN([Libxslt development libraries not found.])
-                else
-                        AC_MSG_ERROR([libxslt development libraries not found.])                fi
-	fi
+if test "$ax_cv_boost_thread" = "no"; then
+    AC_MSG_ERROR([install libboost-thread-dev or similar])
 fi
+if test "$ax_cv_boost_unit_test_framework" = "no"; then
+    AC_MSG_ERROR([install libboost-test-dev or similar])
+fi
+    
 
 
 # Checks for header files.
 ##AC_HEADER_STDC
 ##AC_HEADER_SYS_WAIT
 ##AC_HEADER_TIME 
-AC_CHECK_HEADERS(iostream list vector stdexcept)
-AC_CHECK_HEADERS(boost/thread/mutex.hpp boost/test/auto_unit_test.hpp)
+AC_CHECK_HEADERS(sys/select.h sys/socket.h)
 
 # Checks for typedefs, structures, and compiler characteristics.
 ##AC_TYPE_SIZE_T 
 ##AC_CHECK_SIZEOF(int)
 ##AC_CHECK_SIZEOF(long int)
 
-
 # Checks for library functions.
 
 AC_CONFIG_FILES([
         Doxyfile
 	Makefile
 	src/Makefile
+	src/Jamfile
+	xml/Makefile
+	xml/schema/Makefile
+	xml/xslt/Makefile
+	doc/Makefile
+	doc/local.ent
+        doc/common/Makefile
+	doc/common/print.dsl
+	etc/Makefile
 ])
 
 AC_OUTPUT
@@ -117,11 +97,14 @@ AC_OUTPUT
 
 # postamble
 
+
 echo \
 "------------------------------------------------------------------------
-Configuration:
 
+  Package:                    ${PACKAGE}
+  Version:                    ${VERSION}
   Source code location:       ${srcdir}
+  CPP Preprocessor:           ${CPP}
   CPP Preprocessor flags:     ${CPPFLAGS}
   CXX Compiler:               ${CXX}
   CXX Compiler flags:         ${CXXFLAGS}
@@ -130,5 +113,21 @@ Configuration:
   Host System Type:           ${host}
   Install path:               ${prefix}
   Automake:                   ${AUTOMAKE}
+  Archiver:                   ${AR}
+  Ranlib:                     ${RANLIB}
+  Boost Version:              ${BOOST_VERSION}               
+  Boost Include:              ${BOOST_CPPFLAGS}               
+  Boost linker flags:         ${BOOST_LDFLAGS}               
+  Boost Libs:                 ${BOOST_DATE_TIME_LIB} ${BOOST_PROGRAM_OPTIONS_LIB} ${BOOST_THREAD_LIB}               
+  YAZPP Version:              ${YAZPPVERSION}
+  YAZPP Include:              ${YAZPPINC}
+  YAZPP La Lib:               ${YAZPPLALIB}
+  YAZPP Lib:                  ${YAZPPLIB}
+  Bugreport:                  ${PACKAGE_BUGREPORT}
 
 ------------------------------------------------------------------------"
+dnl Local Variables:
+dnl mode:shell-script
+dnl sh-indentation: 2
+dnl sh-basic-offset: 4
+dnl End: