From e113cb7e8ab3e6f06b014efcbfd39ca076dbece0 Mon Sep 17 00:00:00 2001 From: Damien Stuart Date: Thu, 25 Dec 2008 01:26:23 +0000 Subject: [PATCH] Updates to allow for building libfko as a shared lib. (make use of libtool). git-svn-id: file:///home/mbr/svn/fwknop/trunk@17 510a4753-2344-4c79-9c09-4d669213fbeb --- autogen.sh | 2 +- configure.ac | 5 ++++- fko/Makefile.am | 5 +++-- src/Makefile.am | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/autogen.sh b/autogen.sh index 1326e1ed..d15b65ef 100755 --- a/autogen.sh +++ b/autogen.sh @@ -5,7 +5,7 @@ # Run this script to generate all the initial makefiles, etc. # aclocal -I config -libtoolize --automake +libtoolize --automake --copy --force autoheader automake --add-missing --copy --foreign autoconf diff --git a/configure.ac b/configure.ac index 83791fe9..f0dcc128 100644 --- a/configure.ac +++ b/configure.ac @@ -19,12 +19,15 @@ AC_GNU_SOURCE AC_PROG_CC AM_PROG_CC_C_O AC_PROG_CXX -AC_PROG_RANLIB AC_PROG_CPP AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_MAKE_SET +#--DSS +#AC_PROG_RANLIB +AC_PROG_LIBTOOL + # Checks for header files. # AC_HEADER_STDC diff --git a/fko/Makefile.am b/fko/Makefile.am index 30a5b5da..13ac3aa2 100644 --- a/fko/Makefile.am +++ b/fko/Makefile.am @@ -1,4 +1,4 @@ -lib_LIBRARIES = libfko.a +lib_LTLIBRARIES = libfko.la libfko_source_files = \ base64.c base64.h cipher_funcs.c cipher_funcs.h digest.c digest.h \ @@ -9,4 +9,5 @@ libfko_source_files = \ md5.c md5.h rijndael.c rijndael.h sha1.c sha256.c sha.h strlcat.c \ strlcpy.c -libfko_a_SOURCES = $(libfko_source_files) +libfko_la_SOURCES = $(libfko_source_files) +libfko_la_LDFLAGS = -version-info 0:1:0 diff --git a/src/Makefile.am b/src/Makefile.am index e22da169..7a45185b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,5 +2,5 @@ bin_PROGRAMS = fwknop fwknop_SOURCES = fwknop.c -fwknop_LDADD = $(top_builddir)/fko/libfko.a +fwknop_LDADD = $(top_builddir)/fko/libfko.la fwknop_CPPFLAGS = -I $(top_srcdir)/fko