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
protecting dereferencing of void pointer by if statement
[metaproxy-moved-to-github.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
593a1db
..
6658ba9
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-23,64
+23,58
@@
AC_PROG_MAKE_SET
AC_PROG_RANLIB
AM_PROG_LIBTOOL
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)
if test "$enable_shared" = "yes"; then
if test "$enable_shared" = "yes"; then
- AC_DEFINE([HAVE_DL_SUPPORT],[1],
- [Define to 1 if you have shared module support])
+ AC_DEFINE([HAVE_DL_SUPPORT],[1],
+ [Define to 1 if you have shared module support])
fi
# Checks for libraries.
AC_CHECK_LIB(dl,dlopen)
fi
# Checks for libraries.
AC_CHECK_LIB(dl,dlopen)
+AC_CHECK_LIB(m,main)
+## YAZPP checks
+YAZPP_INIT(threads,1.0.2)
+if test -z "$YAZPPLIB"; then
+ AC_MSG_ERROR([YAZ++ development libraries missing])
+fi
+YAZ_DOC
+CPPFLAGS="$YAZPPINC $CPPFLAGS"
# check for Boost C++ development libs and headers
# check for Boost C++ development libs and headers
-AX_BOOST_BASE(1.33)
-AX_BOOST_DATE_TIME(1.33)
-AX_BOOST_PROGRAM_OPTIONS(1.33)
-AX_BOOST_THREAD(1.33)
-AX_BOOST_UNIT_TEST_FRAMEWORK(1.33)
-
-LIBS="$LIBS\
-$BOOST_DATE_TIME_LIB $BOOST_PROGRAM_OPTIONS_LIB $BOOST_THREAD_LIB";
+AX_BOOST([1.32])
if test "$ax_cv_boost_base" = "no"; then
if test "$ax_cv_boost_base" = "no"; then
- AC_MSG_ERROR([install libboost-dev or similar])
+ AC_MSG_ERROR([install libboost-dev or similar])
fi
if test "$ax_cv_boost_date_time" = "no"; then
fi
if test "$ax_cv_boost_date_time" = "no"; then
- AC_MSG_ERROR([install libboost-date-time-dev or similar])
+ AC_MSG_ERROR([install libboost-date-time-dev or similar])
fi
if test "$ax_cv_boost_program_options" = "no"; then
fi
if test "$ax_cv_boost_program_options" = "no"; then
- AC_MSG_ERROR([install libboost-program-options-dev or similar])
+ AC_MSG_ERROR([install libboost-program-options-dev or similar])
fi
if test "$ax_cv_boost_thread" = "no"; then
fi
if test "$ax_cv_boost_thread" = "no"; then
- AC_MSG_ERROR([install libboost-thread-dev or similar])
+ AC_MSG_ERROR([install libboost-thread-dev or similar])
fi
if test "$ax_cv_boost_unit_test_framework" = "no"; then
fi
if test "$ax_cv_boost_unit_test_framework" = "no"; then
- AC_MSG_ERROR([install libboost-test-dev or similar])
+ AC_MSG_ERROR([install libboost-test-dev or similar])
fi
fi
-## YAZPP checks
-YAZPP_INIT(threads,1.0.2)
-if test -z "$YAZPPLIB"; then
- AC_MSG_ERROR([YAZ++ development libraries missing])
-fi
-YAZ_DOC
# Checks for header files.
##AC_HEADER_STDC
##AC_HEADER_SYS_WAIT
##AC_HEADER_TIME
# Checks for header files.
##AC_HEADER_STDC
##AC_HEADER_SYS_WAIT
##AC_HEADER_TIME
-AC_CHECK_HEADERS(sys/select.h sys/socket.h iostream list vector stdexcept)
+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 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([
# Checks for library functions.
AC_CONFIG_FILES([
@@
-121,6
+115,10
@@
echo \
Automake: ${AUTOMAKE}
Archiver: ${AR}
Ranlib: ${RANLIB}
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 Version: ${YAZPPVERSION}
YAZPP Include: ${YAZPPINC}
YAZPP La Lib: ${YAZPPLALIB}
@@
-128,3
+126,8
@@
echo \
Bugreport: ${PACKAGE_BUGREPORT}
------------------------------------------------------------------------"
Bugreport: ${PACKAGE_BUGREPORT}
------------------------------------------------------------------------"
+dnl Local Variables:
+dnl mode:shell-script
+dnl sh-indentation: 2
+dnl sh-basic-offset: 4
+dnl End: