X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=8e3e648538f3ed31b54d5f6865ec2d36565b5def;hb=d413b14b2c6c09f9dc351106bcb3c50975ace189;hp=570c5dd553f6e506b4dab59c91a9eb241ae25ba3;hpb=dfadeec9cd47ce9f71f4bba7bc80efda4f8fd94a;p=libradsec.git

diff --git a/configure.ac b/configure.ac
index 570c5dd..8e3e648 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,13 +1,10 @@
-<<<<<<< HEAD
-AC_INIT(radsecproxy, 1.5-dev, radsecproxy@uninett.no)
-=======
-AC_INIT(radsecproxy, 1.4.3, radsecproxy@uninett.no)
->>>>>>> master
+AC_INIT(radsecproxy, 1.6.4, radsecproxy@uninett.no)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
 AC_PROG_CC
-AM_PROG_CC_C_O
 AC_PROG_RANLIB
+AC_CHECK_FUNCS([mallopt])
+
 udp=yes
 AC_ARG_ENABLE(udp,
   [  --enable-udp whether to enable UDP transport: yes/no; default yes ],
@@ -84,7 +81,7 @@ case "${target_os}" in
     TARGET_LDFLAGS="-lpthread -lsocket -lnsl"
     ;;
   *)
-    TARGET_CFLAGS="-Wall -pedantic -pthread"
+    TARGET_CFLAGS="-Wall -pedantic -Wno-long-long -pthread"
     TARGET_LDFLAGS=""
   esac
 dnl Adding enabled options
@@ -105,6 +102,22 @@ if test "x$dtls" = "xyes" ; then
   TARGET_CFLAGS="$TARGET_CFLAGS -DRADPROT_DTLS"
 fi
  
+AC_ARG_ENABLE(
+  experimental_dyndisc,
+  AC_HELP_STRING([--enable-experimental-dyndisc],
+                 [enable experimental code for dynamic discovery [default=no]]),
+  [case $enableval in
+     yes|no) ;;
+     *) AC_MSG_ERROR([bad value $enableval for --enable-experimental-dyndisc, need yes or no]) ;;
+     esac],
+  [enable_experimental_dyndisc=no])
+if test "$enable_experimental_dyndisc" = "yes"; then
+  AC_DEFINE([ENABLE_EXPERIMENTAL_DYNDISC], [1])
+fi
+AM_CONDITIONAL(ENABLE_EXPERIMENTAL_DYNDISC,
+               test "$enable_experimental_dyndisc" = "yes")
+
+
 AC_ARG_VAR([DOCBOOK2X_MAN], [docbook2x-man])
 AC_CHECK_PROG([DOCBOOK2X_MAN], [docbook2x-man], [yes])
 AM_CONDITIONAL(HAVE_DOCBOOK2X_MAN, test "$DOCBOOK2X_MAN" = "yes")