fixing compilation when using the Vstr string library
authorTobias Brunner <tobias@strongswan.org>
Fri, 24 Apr 2009 03:30:50 +0000 (05:30 +0200)
committerTobias Brunner <tobias@strongswan.org>
Fri, 24 Apr 2009 03:30:50 +0000 (05:30 +0200)
src/Makefile.am
src/_copyright/Makefile.am
src/starter/Makefile.am

index 913099c..1e6d050 100644 (file)
@@ -1,13 +1,13 @@
 SUBDIRS = . include
 
-if USE_FILE_CONFIG
-  SUBDIRS += libfreeswan starter ipsec _copyright
-endif
-
 if USE_LIBSTRONGSWAN
   SUBDIRS += libstrongswan
 endif
 
+if USE_FILE_CONFIG
+  SUBDIRS += libfreeswan starter ipsec _copyright
+endif
+
 if USE_PLUTO
   SUBDIRS += libcrypto pluto whack
 endif
index 8b46f11..33c4ffc 100644 (file)
@@ -6,4 +6,4 @@ INCLUDES = \
 -I$(top_srcdir)/src/libfreeswan \
 -I$(top_srcdir)/src/libstrongswan
 
-_copyright_LDADD = $(top_builddir)/src/libfreeswan/libfreeswan.a
+_copyright_LDADD = $(top_builddir)/src/libfreeswan/libfreeswan.a $(top_builddir)/src/libstrongswan/libstrongswan.la
index 5720566..7c84a25 100644 (file)
@@ -14,7 +14,7 @@ INCLUDES = \
 -I$(top_srcdir)/src/stroke
 
 AM_CFLAGS = -DIPSEC_DIR=\"${ipsecdir}\" -DIPSEC_CONFDIR=\"${confdir}\" -DIPSEC_PIDDIR=\"${piddir}\" -DIPSEC_EAPDIR=\"${eapdir}\" -DDEBUG
-starter_LDADD = defs.o $(top_builddir)/src/libfreeswan/libfreeswan.a
+starter_LDADD = defs.o $(top_builddir)/src/libfreeswan/libfreeswan.a $(top_builddir)/src/libstrongswan/libstrongswan.la
 EXTRA_DIST = parser.l parser.y keywords.txt ipsec.conf
 dist_man_MANS = ipsec.conf.5 starter.8
 MAINTAINERCLEANFILES = lex.yy.c y.tab.c y.tab.h keywords.c