summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvenaas <venaas>2009-03-11 14:33:44 +0000
committervenaas <venaas@e88ac4ed-0b26-0410-9574-a7f39faa03bf>2009-03-11 14:33:44 +0000
commit5fde1b4713ee45f54d3cfded28323174755c8069 (patch)
treee46e1e9651f4cabcf91902d8d84aa4ca639e260c
parentb6cf2205d5b103e27109d2d4a99c234049958b2f (diff)
improved the solaris depenendent stuff
git-svn-id: https://svn.testnett.uninett.no/radsecproxy/trunk@489 e88ac4ed-0b26-0410-9574-a7f39faa03bf
-rw-r--r--Makefile.am2
-rw-r--r--Makefile.am-solaris37
-rw-r--r--configure.ac6
3 files changed, 4 insertions, 41 deletions
diff --git a/Makefile.am b/Makefile.am
index 06d9c1f..1422223 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,7 +29,7 @@ radsecproxy_SOURCES = radsecproxy.c \
tls.h \
dtls.h
-radsecproxy_CFLAGS = -g -Wall -pedantic -pthread @SSL_CFLAGS@ @TARGET_CFLAGS@
+radsecproxy_CFLAGS = -g @SSL_CFLAGS@ @TARGET_CFLAGS@
radsecproxy_LDFLAGS = @SSL_LDFLAGS@ @TARGET_LDFLAGS@
radsecproxy_LDADD = @SSL_LIBS@
diff --git a/Makefile.am-solaris b/Makefile.am-solaris
deleted file mode 100644
index 20f67ae..0000000
--- a/Makefile.am-solaris
+++ /dev/null
@@ -1,37 +0,0 @@
-sbin_PROGRAMS = radsecproxy
-
-radsecproxy_SOURCES = radsecproxy.c \
- tlscommon.c \
- gconfig.c \
- util.c \
- debug.c \
- list.c \
- hash.c \
- tlv11.c \
- hostport.c \
- radmsg.c \
- udp.c \
- tcp.c \
- tls.c \
- dtls.c \
- radsecproxy.h \
- tlscommon.h \
- gconfig.h \
- debug.h \
- util.h \
- list.h \
- hash.h \
- tlv11.h \
- hostport.h \
- radmsg.h \
- udp.h \
- tcp.h \
- tls.h \
- dtls.h
-
-radsecproxy_CFLAGS = -g -mt @SSL_CFLAGS@ @TARGET_CFLAGS@
-radsecproxy_LDFLAGS = -lpthread -lsocket -lnsl @SSL_LDFLAGS@ @TARGET_LDFLAGS@
-radsecproxy_LDADD = @SSL_LIBS@
-
-dist_sysconf_DATA = $(srcdir)/radsecproxy.conf-example
-dist_man_MANS = radsecproxy.1 radsecproxy.conf.5
diff --git a/configure.ac b/configure.ac
index aafe22e..de8652e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,11 +50,11 @@ 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"
+ TARGET_CFLAGS="-mt -DSYS_SOLARIS9 -D_POSIX_PTHREAD_SEMANTICS"
+ TARGET_LDFLAGS="-lpthread -lsocket -lnsl"
;;
*)
- TARGET_CFLAGS=""
+ TARGET_CFLAGS="-Wall -pedantic -pthread"
TARGET_LDFLAGS=""
esac
dnl Adding enabled options