X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=643912bd8e227d4513e82c2238286980573b28b2;hb=40e8d53c3878a24f78b2a7d5b359b7bfbefb6f59;hp=25db07c343b6c28edd78456581d8b261e5923b07;hpb=bab2a00def115132cf3bb14d4e8826c5c2460b60;p=radsecproxy.git

diff --git a/configure.ac b/configure.ac
index 25db07c..643912b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,7 @@
-AC_INIT(radsecproxy, 1.5-dev, radsecproxy@uninett.no)
+AC_INIT(radsecproxy, 1.6, radsecproxy@uninett.no)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
 AC_PROG_CC
-AM_PROG_CC_C_O
 AC_PROG_RANLIB
 udp=yes
 AC_ARG_ENABLE(udp,
@@ -48,9 +47,25 @@ AC_ARG_ENABLE(dtls,
     fi
   ])
 
+AC_ARG_ENABLE(fticks,
+AC_HELP_STRING([--enable-fticks],[build with F-Ticks support [default=no]]),
+[case $enableval in
+yes|no) ;;
+*) AC_MSG_ERROR([bad value $enableval for --enable-fticks, need yes or no]) ;;
+esac],
+[enable_fticks=no])
+
+if test "$enable_fticks" = "yes"; then
 AC_CHECK_LIB([nettle], [nettle_sha256_init],,
-    AC_MSG_ERROR([required library nettle not found]))
- 
+    [AC_MSG_WARN([required library nettle not found, fticks support disabled])
+     enable_fticks=no])
+fi
+
+if test "$enable_fticks" = "yes"; then
+AC_DEFINE([WANT_FTICKS], [1])
+fi
+AM_CONDITIONAL(WANT_FTICKS, test "$enable_fticks" = "yes")
+
 dnl Check if we're on Solaris and set CFLAGS accordingly
 AC_CANONICAL_SYSTEM
 case "${target_os}" in
@@ -64,7 +79,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
@@ -85,6 +100,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")
@@ -92,4 +123,7 @@ AM_CONDITIONAL(HAVE_DOCBOOK2X_MAN, test "$DOCBOOK2X_MAN" = "yes")
 AC_SUBST(TARGET_CFLAGS)
 AC_SUBST(TARGET_LDFLAGS)
 AX_CHECK_SSL
-AC_OUTPUT(Makefile)
+AC_OUTPUT([
+	Makefile
+	tests/Makefile
+])