X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=defc8891df29c0f2891069c295003159044679d5;hb=refs%2Fheads%2Fmaint-1.6;hp=c8dd005954378eaa6b239af6828fe184747b6494;hpb=5221725d44838ea7b14e2760d7e06924f7afa123;p=radsecproxy.git

diff --git a/configure.ac b/configure.ac
index c8dd005..defc889 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,10 @@
-AC_INIT(radsecproxy, 1.4-devel, radsecproxy@uninett.no)
+AC_INIT(radsecproxy, 1.6.5, 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 ],
@@ -46,7 +48,26 @@ AC_ARG_ENABLE(dtls,
       exit -1
     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_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
@@ -54,11 +75,13 @@ case "${target_os}" in
     TARGET_CFLAGS="-DSYS_SOLARIS9 -D_POSIX_PTHREAD_SEMANTICS"
     if test "$GCC" != yes ; then
       TARGET_CFLAGS="$TARGET_CFLAGS -mt"
+    else
+      TARGET_CFLAGS="$TARGET_CFLAGS -pthreads"
     fi
     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
@@ -79,7 +102,30 @@ 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")
+
 AC_SUBST(TARGET_CFLAGS)
 AC_SUBST(TARGET_LDFLAGS)
 AX_CHECK_SSL
-AC_OUTPUT(Makefile)
+AC_OUTPUT([
+	Makefile
+	tests/Makefile
+])