Install dev headers only if --with-dev-headers= option is set

diff --git a/Makefile.am b/Makefile.am
index b236f7667ca21d1925a604d19192094b5408c308..908afca44250db2b86044f7fae5cebceb1766117 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,8 +11,10 @@ CLEANFILES = Doxyfile
 BUILT_SOURCES = Android.mk
 MAINTAINERCLEANFILES = Android.mk
 
+if USE_DEV_HEADERS
 config_includedir = $(ipseclibdir)/include
 nodist_config_include_HEADERS = config.h
+endif
 
 Android.mk :   Android.mk.in configure.in
                sed \

diff --git a/configure.in b/configure.in
index fc96929f50a78877d7f5189503a7d88da261c50d..79ede656d479be95f1b3c8aa4f8e856ef35e0140 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -46,6 +46,7 @@ ARG_WITH_SUBST([ipsec-script],       [ipsec], [change the name of the ipsec scri
 
 ARG_WITH_SET([capabilities],         [no], [set capability dropping library. Currently supported values are "libcap" and "native"])
 ARG_WITH_SET([mpz_powm_sec],         [yes], [use the more side-channel resistant mpz_powm_sec in libgmp, if available])
+ARG_WITH_SET([dev-headers],          [no], [install strongSwan development headers to directory.])
 
 if test -n "$PKG_CONFIG"; then
        systemdsystemunitdir_default=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)
@@ -784,6 +785,9 @@ if test x$integrity_test = xtrue; then
        )
 fi
 
+AM_CONDITIONAL(USE_DEV_HEADERS, [test "x$dev_headers" != xno])
+AC_SUBST(dev_headers)
+
 CFLAGS="$CFLAGS -include `pwd`/config.h"
 
 dnl ==============================================

diff --git a/src/libfast/Makefile.am b/src/libfast/Makefile.am
index 54f449167b0ead475ec08924a7dcfb25469e7775..df5b650cef4847360ec018729b5673b2ee9437bb 100644 (file)
--- a/src/libfast/Makefile.am
+++ b/src/libfast/Makefile.am
@@ -3,9 +3,11 @@ ipseclib_LTLIBRARIES = libfast.la
 libfast_la_SOURCES = \
        dispatcher.c request.c session.c smtp.c
 
-fast_includedir = $(includedir)/strongswan/fast
+if USE_DEV_HEADERS
+fast_includedir = ${dev_headers}/fast
 nobase_fast_include_HEADERS = \
        context.h controller.h dispatcher.h filter.h request.h session.h smtp.h
+endif
 
 libfast_la_LIBADD = $(top_builddir)/src/libstrongswan/libstrongswan.la \
   -lfcgi $(clearsilver_LIBS) $(PTHREADLIB)

diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am
index 1b7e93aa572822af8934f9e88d25314dbd0a5541..b319d0204b01f733335d17bd01ba6b173b8320cd 100644 (file)
--- a/src/libstrongswan/Makefile.am
+++ b/src/libstrongswan/Makefile.am
@@ -26,7 +26,8 @@ utils.c utils/host.c utils/identification.c utils/lexparser.c \
 utils/linked_list.c utils/hashtable.c utils/enumerator.c utils/optionsfrom.c \
 utils/capabilities.c utils/backtrace.c
 
-strongswan_includedir = $(includedir)/strongswan
+if USE_DEV_HEADERS
+strongswan_includedir = ${dev_headers}
 nobase_strongswan_include_HEADERS = \
 library.h chunk.h debug.h enum.h settings.h printf_hook.h \
 asn1/asn1.h asn1/asn1_parser.h asn1/oid.h bio/bio_reader.h bio/bio_writer.h \
@@ -58,6 +59,7 @@ threading/spinlock.h threading/semaphore.h threading/rwlock.h \
 threading/lock_profiler.h utils.h utils/host.h utils/identification.h \
 utils/lexparser.h utils/linked_list.h utils/hashtable.h utils/enumerator.h \
 utils/optionsfrom.h utils/capabilities.h utils/backtrace.h
+endif
 
 library.lo :   $(top_builddir)/config.status
 

diff --git a/src/libtls/Makefile.am b/src/libtls/Makefile.am
index ee28d88919799bd911d10b7ec6648d0f31d17807..772950606ba8ab690e5301d23baca179ee6eb501 100644 (file)
--- a/src/libtls/Makefile.am
+++ b/src/libtls/Makefile.am
@@ -7,8 +7,10 @@ libtls_la_SOURCES = \
        tls_crypto.c tls_prf.c tls_socket.c tls_eap.c tls_cache.c tls_peer.c \
        tls_server.c tls.c
 
-tls_includedir = $(includedir)/strongswan/tls
+if USE_DEV_HEADERS
+tls_includedir = ${dev_headers}/tls
 nobase_tls_include_HEADERS = \
        tls_protection.h tls_compression.h tls_fragmentation.h tls_alert.h \
        tls_crypto.h tls_prf.h tls_socket.h tls_eap.h tls_cache.h tls_peer.h \
        tls_server.h tls_handshake.h tls_application.h tls.h
+endif