--- gvpe/configure.ac	2007/11/10 05:14:21	1.46
+++ gvpe/configure.ac	2008/08/10 10:35:26	1.50
@@ -4,7 +4,7 @@
 AC_INIT
 AC_CONFIG_SRCDIR([src/gvpe.C])
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(gvpe, 2.01)
+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 \
@@ -229,7 +229,7 @@
 ])
 
 dnl libev support
-m4_include([libev/ev.m4])
+m4_include([libev/libev.m4])
 
 AC_LANG_POP
 
@@ -252,20 +252,20 @@
 )
 AC_SUBST(LDFLAGS_DAEMON)
 
-AC_ARG_ENABLE(rohc,
-  [AS_HELP_STRING(--enable-rohc,enable robust header compression (rfc3095).)],
-  [
-  echo
-  echo "**********************************************************************"
-  echo "**********************************************************************"
-  echo "**** --enable-rohc is highly experimental, do not use ****************"
-  echo "**********************************************************************"
-  echo "**********************************************************************"
-  echo
-  rohc=true
-  AC_DEFINE_UNQUOTED(ENABLE_ROHC, 1, [ROHC support])
-  ]
-)
+dnl AC_ARG_ENABLE(rohc,
+dnl   [AS_HELP_STRING(--enable-rohc,enable robust header compression (rfc3095).)],
+dnl   [
+dnl   echo
+dnl   echo "**********************************************************************"
+dnl   echo "**********************************************************************"
+dnl   echo "**** --enable-rohc is highly experimental, do not use ****************"
+dnl   echo "**********************************************************************"
+dnl   echo "**********************************************************************"
+dnl   echo
+dnl   rohc=true
+dnl   AC_DEFINE_UNQUOTED(ENABLE_ROHC, 1, [ROHC support])
+dnl   ]
+dnl )
 
 AM_CONDITIONAL(ROHC, test x$rohc = xtrue)
 
@@ -361,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"