denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OpenSolaris needs libsocket and libnsl for socket().

Browse Source
This commit is contained in:
Tobias Brunner
2009-08-14 14:50:53 +02:00
parent 932fdc38de
commit 26965b4ef3
5 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.in
+8 -1
View File
@@ -850,7 +850,7 @@ dnl libraries needed on some platforms but not on others
dnl ==================================================== dnl ====================================================
saved_LIBS=$LIBS saved_LIBS=$LIBS
dnl FreeBSD has dlopen integrated in libc, Linux needs libdl dnl FreeBSD and Mac OS X have dlopen integrated in libc, Linux needs libdl
LIBS="" LIBS=""
AC_SEARCH_LIBS(dlopen, dl, [DLLIB=$LIBS]) AC_SEARCH_LIBS(dlopen, dl, [DLLIB=$LIBS])
AC_SUBST(DLLIB) AC_SUBST(DLLIB)
@@ -861,6 +861,13 @@ AC_SEARCH_LIBS(backtrace, execinfo, [BTLIB=$LIBS])
AC_CHECK_FUNCS(backtrace) AC_CHECK_FUNCS(backtrace)
AC_SUBST(BTLIB) AC_SUBST(BTLIB)
dnl OpenSolaris needs libsocket and libnsl for socket()
LIBS=""
AC_SEARCH_LIBS(socket, socket, [SOCKLIB=$LIBS],
[AC_CHECK_LIB(nsl, socket, [SOCKLIB="-lsocket -lnsl"], [], [-lsocket])]
)
AC_SUBST(SOCKLIB)
LIBS=$saved_LIBS LIBS=$saved_LIBS
dnl ====================== dnl ======================
src/charon/Makefile.am
+1 -1
View File
@@ -108,7 +108,7 @@ AM_CFLAGS = -rdynamic \
-DIPSEC_PIDDIR=\"${piddir}\" \ -DIPSEC_PIDDIR=\"${piddir}\" \
-DIPSEC_PLUGINDIR=\"${plugindir}\" \ -DIPSEC_PLUGINDIR=\"${plugindir}\" \
-DSTRONGSWAN_CONF=\"${strongswan_conf}\" -DSTRONGSWAN_CONF=\"${strongswan_conf}\"
charon_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -lpthread -lm $(DLLIB) charon_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -lpthread -lm $(DLLIB) $(SOCKLIB)
# compile options # compile options
################# #################
src/libstrongswan/Makefile.am
+1 -1
View File
@@ -50,7 +50,7 @@ utils/mutex.c utils/mutex.h \
utils/backtrace.c utils/backtrace.h \ utils/backtrace.c utils/backtrace.h \
plugins/plugin_loader.c plugins/plugin_loader.h plugins/plugin.h plugins/plugin_loader.c plugins/plugin_loader.h plugins/plugin.h
libstrongswan_la_LIBADD = -lpthread $(DLLIB) $(BTLIB) libstrongswan_la_LIBADD = -lpthread $(DLLIB) $(BTLIB) $(SOCKLIB)
INCLUDES = -I$(top_srcdir)/src/libstrongswan INCLUDES = -I$(top_srcdir)/src/libstrongswan
AM_CFLAGS = \ AM_CFLAGS = \
src/starter/Makefile.am
+1 -1
View File
@@ -20,7 +20,7 @@ AM_CFLAGS = \
-DIPSEC_EAPDIR=\"${eapdir}\" \ -DIPSEC_EAPDIR=\"${eapdir}\" \
-DDEBUG -DDEBUG
starter_LDADD = defs.o $(top_builddir)/src/libfreeswan/libfreeswan.a $(top_builddir)/src/libstrongswan/libstrongswan.la starter_LDADD = defs.o $(top_builddir)/src/libfreeswan/libfreeswan.a $(top_builddir)/src/libstrongswan/libstrongswan.la $(SOCKLIB)
EXTRA_DIST = parser.l parser.y keywords.txt ipsec.conf EXTRA_DIST = parser.l parser.y keywords.txt ipsec.conf
dist_man_MANS = ipsec.conf.5 starter.8 dist_man_MANS = ipsec.conf.5 starter.8
MAINTAINERCLEANFILES = lex.yy.c y.tab.c y.tab.h keywords.c MAINTAINERCLEANFILES = lex.yy.c y.tab.c y.tab.h keywords.c
src/stroke/Makefile.am
+1
View File
@@ -1,6 +1,7 @@
ipsec_PROGRAMS = stroke ipsec_PROGRAMS = stroke
stroke_SOURCES = stroke.c stroke_msg.h stroke_keywords.c stroke_keywords.h stroke_SOURCES = stroke.c stroke_msg.h stroke_keywords.c stroke_keywords.h
stroke_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la $(SOCKLIB)
INCLUDES = -I$(top_srcdir)/src/libstrongswan INCLUDES = -I$(top_srcdir)/src/libstrongswan
EXTRA_DIST = stroke_keywords.txt EXTRA_DIST = stroke_keywords.txt
BUILT_SOURCES = stroke_keywords.c BUILT_SOURCES = stroke_keywords.c