X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=3ff1cc3ab40bb76634f4243fd413feb5cddcb55c;hb=a9da84af5738e8eb5b8751cb4d6c00d1beb2810d;hp=aafe22e390f75dab258a89b13457d2d2913f3897;hpb=9406a04b87510af8c9add733c1035f97c0c22074;p=libradsec.git

diff --git a/configure.ac b/configure.ac
index aafe22e..3ff1cc3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,9 @@
-AC_INIT(radsecproxy, 2.0-devel, venaas@uninett.no)
+AC_INIT(radsecproxy, 1.5-dev, 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,
   [  --enable-udp whether to enable UDP transport: yes/no; default yes ],
@@ -45,16 +47,40 @@ 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
   solaris*)
     TARGET_CFLAGS="-DSYS_SOLARIS9 -D_POSIX_PTHREAD_SEMANTICS"
-    TARGET_LDFLAGS="-lsocket"
+    if test "$GCC" != yes ; then
+      TARGET_CFLAGS="$TARGET_CFLAGS -mt"
+    else
+      TARGET_CFLAGS="$TARGET_CFLAGS -pthreads"
+    fi
+    TARGET_LDFLAGS="-lpthread -lsocket -lnsl"
     ;;
   *)
-    TARGET_CFLAGS=""
+    TARGET_CFLAGS="-Wall -pedantic -pthread"
     TARGET_LDFLAGS=""
   esac
 dnl Adding enabled options
@@ -75,7 +101,14 @@ if test "x$dtls" = "xyes" ; then
   TARGET_CFLAGS="$TARGET_CFLAGS -DRADPROT_DTLS"
 fi
  
+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
+])