--- gvpe/configure.ac 2005/03/25 16:05:22 1.41 +++ gvpe/configure.ac 2011/02/15 13:31:22 1.57 @@ -4,7 +4,7 @@ AC_INIT AC_CONFIG_SRCDIR([src/gvpe.C]) AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE(gvpe, 1.9) +AM_INIT_AUTOMAKE(gvpe, 2.24) AC_CONFIG_HEADERS([config.h]) AM_MAINTAINER_MODE @@ -57,7 +57,7 @@ # Enable GNU extensions. # Define this here, not in acconfig's @TOP@ section, since definitions # in the latter don't make it into the configure-time tests. -AC_DEFINE([_GNU_SOURCE], 1, [Enable GNU extenstions]) +AC_DEFINE([_GNU_SOURCE], 1, [Enable GNU extensions]) # do NOT define POSIX_SOURCE, sicne this clashes with many BSDs dnl AC_DEFINE([_POSIX_SOURCE], 1, [Enable POSIX 1003.1 extensions]) @@ -66,7 +66,6 @@ ALL_LINGUAS="" dnl Checks for programs. -AC_PROG_CC AC_PROG_CPP AC_PROG_CXX AC_PROG_GCC_TRADITIONAL @@ -160,7 +159,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 +227,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]) @@ -249,35 +251,63 @@ ) 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) +dnl AC_ARG_ENABLE(bridging, +dnl [AS_HELP_STRING(--enable-bridging,enable bridging support (default disabled).)], +dnl AC_DEFINE_UNQUOTED(ENABLE_BRIDGING, 1, [bridging support.]) +dnl ) + +ICMP=1 AC_ARG_ENABLE(icmp, - [AS_HELP_STRING(--enable-icmp,enable icmp protocol support (default disabled).)], - AC_DEFINE_UNQUOTED(ENABLE_ICMP, 1, [ICMP protocol support.]) + [AS_HELP_STRING(--disable-icmp,enable icmp protocol support (default enabled).)], + if test "x$enableval" = xno; then + ICMP=0 + fi ) +if test "x$ICMP" = x1; then + AC_DEFINE_UNQUOTED(ENABLE_ICMP, 1, [ICMP protocol support.]) +fi +TCP=1 AC_ARG_ENABLE(tcp, - [AS_HELP_STRING(--enable-tcp,enable tcp protocol support (default disabled).)], + [AS_HELP_STRING(--disable-tcp,enable tcp protocol support (default enabled).)], + if test "x$enableval" = xno; then + TCP=0 + fi +) +if test "x$TCP" = x1; then AC_DEFINE_UNQUOTED(ENABLE_TCP, 1, [TCP protocol support.]) +fi + +HTTP=1 +AC_ARG_ENABLE(http-proxy, + [AS_HELP_STRING(--disable-http-proxy,enable http proxy connect support (default enabled).)], + if test "x$enableval" = xno; then + HTTP=0 + fi ) +if test "x$HTTP" = x1; then + AC_DEFINE_UNQUOTED(ENABLE_HTTP_PROXY, 1, [http proxy connect support.]) +fi AC_ARG_ENABLE(dns, - [AS_HELP_STRING(--enable-dns,enable dns tunnel protocol support (DOES NOT WORK).)], + [AS_HELP_STRING(--enable-dns,enable dns tunnel protocol support (default disabled).)], [ AC_CHECK_HEADER(gmp.h,,[AC_MSG_ERROR([gmp.h not found, required for --enable-dns])]) AC_CHECK_LIB(gmp,main,,[AC_MSG_ERROR([libgmp not found, required for --enable-dns])]) @@ -286,11 +316,6 @@ ] ) -AC_ARG_ENABLE(http-proxy, - [AS_HELP_STRING(--enable-http-proxy,enable http proxy connect support (default disabled).)], - AC_DEFINE_UNQUOTED(ENABLE_HTTP_PROXY, 1, [http proxy connect support.]) -) - HMAC=12 AC_ARG_ENABLE(hmac-length, [AS_HELP_STRING(--enable-hmac-length=BYTES,[ @@ -308,7 +333,7 @@ AC_DEFINE_UNQUOTED(RAND_SIZE, $RAND, [Add this many bytes of randomness to each packet.]) MTU=1500 -AC_ARG_ENABLE(mtu, +AC_ARG_ENABLE(max-mtu, [AS_HELP_STRING(--enable-max-mtu=BYTES,enable mtu sizes upto BYTES bytes (default 1500). Use 9100 for jumbogram support.)], MTU=$enableval ) @@ -323,10 +348,10 @@ ) AC_DEFINE_UNQUOTED(ENABLE_COMPRESSION, $COMPRESS, [Enable compression support.]) -CIPHER=bf_cbc +CIPHER=aes_128_cbc AC_ARG_ENABLE(cipher, - [AS_HELP_STRING(--enable-cipher,[ - Select the symmetric cipher (default "bf"). + [AS_HELP_STRING(--enable-cipher=CIPHER,[ + Select the symmetric cipher (default "aes-128"). Must be one of "bf" (blowfish), "aes-128" (rijndael), "aes-192" or "aes-256".])], if test "x$enableval" = xbf ; then CIPHER=bf_cbc ; fi if test "x$enableval" = xaes-128; then CIPHER=aes_128_cbc; fi @@ -335,11 +360,13 @@ ) AC_DEFINE_UNQUOTED(ENABLE_CIPHER, EVP_${CIPHER}, [Select the symmetric cipher to use.]) -DIGEST=sha1 +DIGEST=ripemd160 AC_ARG_ENABLE(digest, - [AS_HELP_STRING(--enable-digest,[ - Select the digets algorithm to use (default "sha1"). Must be one of - "sha1", "ripemd160", "md5" or "md4" (insecure).])], + [AS_HELP_STRING(--enable-digest=CIPHER,[ + Select the digest algorithm to use (default "ripemd160"). Must be one of + "sha512", "sha256", "sha1" (somewhat insecure), "ripemd160", "md5" (insecure) 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 @@ -351,9 +378,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" @@ -363,7 +392,15 @@ dnl LDFLAGS="$LDFLAGS -Wl,--gc-sections" dnl fi -AC_CONFIG_COMMANDS_POST([ +AC_SUBST(INCLUDES) + +AC_CONFIG_FILES([Makefile po/Makefile.in +src/Makefile +doc/Makefile +lib/Makefile +m4/Makefile +]) +AC_OUTPUT echo echo "***" @@ -375,7 +412,10 @@ echo "*** HMAC length: $HMAC" echo "*** RAND used: $RAND" echo "*** Max. MTU: $MTU" -echo "*** Compression: $COMPRESS" + +echo "***" +echo "*** Enable options:" +grep ENABLE_ config.h | sed -e 's/^/*** /' if test "x$DIGEST" = xmd4; then echo "***" @@ -393,17 +433,6 @@ fi echo "***" - echo -]) - -AC_SUBST(INCLUDES) -AC_CONFIG_FILES([Makefile po/Makefile.in -src/Makefile -doc/Makefile -lib/Makefile -m4/Makefile -]) -AC_OUTPUT