--- gvpe/configure.ac 2007/01/31 14:02:33 1.44 +++ gvpe/configure.ac 2008/01/28 12:00:14 1.49 @@ -4,7 +4,7 @@ AC_INIT AC_CONFIG_SRCDIR([src/gvpe.C]) AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE(gvpe, 2.0) +AM_INIT_AUTOMAKE(gvpe, 2.2) AC_CONFIG_HEADERS([config.h]) AM_MAINTAINER_MODE @@ -160,7 +160,7 @@ dnl Checks for libraries. AC_LANG(C++) -AC_CHECK_HEADERS(ext/hash_map clocale) +AC_CHECK_HEADERS(tr1/unordered_map ext/hash_map clocale) dnl Checks for header files. AC_CHECK_HEADERS([fcntl.h inttypes.h limits.h malloc.h stdint.h strings.h syslog.h unistd.h \ @@ -228,6 +228,9 @@ AC_CHECK_LIB(nsl, gethostbyname) ]) +dnl libev support +m4_include([libev/libev.m4]) + AC_LANG_POP dnl AC_CHECK_FUNCS([freeaddrinfo gai_strerror getaddrinfo getnameinfo]) @@ -344,7 +347,9 @@ AC_ARG_ENABLE(digest, [AS_HELP_STRING(--enable-digest,[ Select the digest algorithm to use (default "ripemd160"). Must be one of - "sha1", "ripemd160", "md5" or "md4" (insecure).])], + "sha512", "sha256", "sha1", "ripemd160", "md5" or "md4" (insecure).])], + if test "x$enableval" = xsha512 ; then DIGEST=sha512 ; fi + if test "x$enableval" = xsha256 ; then DIGEST=sha256 ; fi if test "x$enableval" = xsha1 ; then DIGEST=sha1 ; fi if test "x$enableval" = xripemd160; then DIGEST=ripemd160; fi if test "x$enableval" = xmd5 ; then DIGEST=md5 ; fi @@ -356,9 +361,11 @@ CXXFLAGS="$CXXFLAGS -fno-rtti" fi -if $CXX -v --help 2>&1 | grep -q fexceptions; then - CXXFLAGS="$CXXFLAGS -fno-exceptions" -fi +#if $CXX -v --help 2>&1 | grep -q fexceptions; then +# CXXFLAGS="$CXXFLAGS -fno-exceptions" +#fi + +LIBS="$EXTRA_LIBS $LIBS" dnl if $CXX -v --help 2>&1 | grep -q ffunction-sections; then dnl CXXFLAGS="$CXXFLAGS -ffunction-sections"