X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=7d444c538c1b4d91eed36b674008bd073bd073e2;hb=4b934762cf14b4f64b36c5ca0fd5e19bd24f0678;hp=65f386e4758082781182e4dad7df861080ec719e;hpb=230b3daa9734ba0c62f24e606137a3bdbc8ec340;p=radsecproxy.git

diff --git a/configure.ac b/configure.ac
index 65f386e..7d444c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,18 +1,90 @@
-AC_INIT(radsecproxy, 2.0-devel, venaas@uninett.no)
+AC_INIT(radsecproxy, 2.0-alpha, radsecproxy@uninett.no)
+AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
 AC_PROG_CC
 AM_PROG_CC_C_O
+udp=yes
+AC_ARG_ENABLE(udp,
+  [  --enable-udp whether to enable UDP transport: yes/no; default yes ],
+  [ if test "x$enableval" = "xyes" -o "x$enableval" = "xno" ; then
+      udp=$enableval
+    else
+      echo "--enable-udp argument must be yes or no"
+      exit -1
+    fi
+  ])
+ 
+tcp=yes
+AC_ARG_ENABLE(tcp,
+  [  --enable-tcp whether to enable TCP transport: yes/no; default yes ],
+  [ if test "x$enableval" = "xyes" -o "x$enableval" = "xno" ; then
+      tcp=$enableval
+    else
+      echo "--enable-tcp argument must be yes or no"
+      exit -1
+    fi
+  ])
+ 
+tls=yes
+AC_ARG_ENABLE(tls,
+  [  --enable-tls whether to enable TLS (RadSec) transport: yes/no; default yes ],
+  [ if test "x$enableval" = "xyes" -o "x$enableval" = "xno" ; then
+      tls=$enableval
+    else
+      echo "--enable-tls argument must be yes or no"
+      exit -1
+    fi
+  ])
+ 
+dtls=yes
+AC_ARG_ENABLE(dtls,
+  [  --enable-dtls whether to enable DTLS transport: yes/no; default yes ],
+  [ if test "x$enableval" = "xyes" -o "x$enableval" = "xno" ; then
+      dtls=$enableval
+    else
+      echo "--enable-dtls argument must be yes or no"
+      exit -1
+    fi
+  ])
+ 
 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
+if test "x$udp" = "xyes" ; then
+  echo "UDP transport enabled"
+  TARGET_CFLAGS="$TARGET_CFLAGS -DRADPROT_UDP"
+fi
+if test "x$tcp" = "xyes" ; then
+  echo "TCP transport enabled"
+  TARGET_CFLAGS="$TARGET_CFLAGS -DRADPROT_TCP"
+fi
+if test "x$tls" = "xyes" ; then
+  echo "TLS (RadSec) transport enabled"
+  TARGET_CFLAGS="$TARGET_CFLAGS -DRADPROT_TLS"
+fi
+if test "x$dtls" = "xyes" ; then
+  echo "DTLS transport enabled"
+  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