add platform libraries to libcompat's LIBADD list

ok beck@
PavanTatikonda · Jul 12, 2014 · 6594478 · 6594478
1 parent 6017202
commit 6594478
Show file tree

Hide file tree

Showing 8 changed files with 66 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,6 +34,8 @@ Makefile.in
 *.lo
 *.la
 
+*.pc
+
 # tests
 test-driver
 *.log

diff --git a/Makefile.am b/Makefile.am
@@ -1,2 +1,5 @@
 SUBDIRS = crypto ssl include apps tests man
 ACLOCAL_AMFLAGS = -I m4
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libcrypto.pc libssl.pc openssl.pc
diff --git a/configure.ac.tpl b/configure.ac.tpl
@@ -97,5 +97,20 @@ AC_CHECK_HEADER(sys/sysctl.h, AC_DEFINE(HAVE_SYS_SYSCTL_H))
 
 LT_INIT
 
-AC_OUTPUT(Makefile include/Makefile include/openssl/Makefile ssl/Makefile
-          crypto/Makefile tests/Makefile apps/Makefile man/Makefile)
+AC_CONFIG_FILES([
+	Makefile
+	include/Makefile
+	include/openssl/Makefile
+	ssl/Makefile
+	crypto/Makefile
+	tests/Makefile
+	apps/Makefile
+	man/Makefile
+	libcrypto.pc
+	libssl.pc
+	openssl.pc
+])
+
+AC_OUTPUT
+
+DISTCLEANFILES += *.pc
diff --git a/crypto/Makefile.am.tpl b/crypto/Makefile.am.tpl
@@ -19,6 +19,7 @@ libcompatnoopt_la_SOURCES = compat/explicit_bzero.c
 # other compatibility functions
 libcompat_la_CFLAGS = $(CFLAGS) $(USER_CFLAGS)
 libcompat_la_SOURCES =
+libcompat_la_LIBADD = $(PLATFORM_LDADD)
 
 if NO_STRLCAT
 libcompat_la_SOURCES += compat/strlcat.c

diff --git a/libcrypto.pc.in b/libcrypto.pc.in
@@ -0,0 +1,15 @@
+#libcrypto pkg-config source file
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: LibreSSL-libssl
+Description: Secure Sockets Layer and cryptography libraries
+Version: @VERSION@
+Requires:
+Conflicts:
+Libs: -L${libdir} -lcrypto
+Libs.private: @LIBS@
+Cflags: -I${includedir}
diff --git a/libssl.pc.in b/libssl.pc.in
@@ -0,0 +1,16 @@
+#libssl pkg-config source file
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: LibreSSL-libssl
+Description: Secure Sockets Layer and cryptography libraries
+Version: @VERSION@
+Requires:
+Requires.private: libcrypto
+Conflicts:
+Libs: -L${libdir} -lssl
+Libs.private: @LIBS@ -lcrypto
+Cflags: -I${includedir}
diff --git a/openssl.pc.in b/openssl.pc.in
@@ -0,0 +1,11 @@
+#openssl pkg-config source file
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: LibreSSL
+Description: Secure Sockets Layer and cryptography libraries and tools
+Version: @VERSION@
+Requires: libssl libcrypto
diff --git a/update.sh b/update.sh
@@ -306,8 +306,7 @@ test_excludes=(biotest aeadtest evptest pq_test ssltest arc4randomforktest)
 		fi
 		echo "check_PROGRAMS += $TEST" >> Makefile.am
 		echo "${TEST}_SOURCES = $i" >> Makefile.am
-		echo "${TEST}_LDADD = \$(PLATFORM_LDADD)" >> Makefile.am
-		echo "${TEST}_LDADD += \$(top_builddir)/ssl/libssl.la" >> Makefile.am
+		echo "${TEST}_LDADD = \$(top_builddir)/ssl/libssl.la" >> Makefile.am
 		echo "${TEST}_LDADD += \$(top_builddir)/crypto/libcrypto.la" >> Makefile.am
 	done
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,6 +34,8 @@ Makefile.in @@
     *.lo
     *.la
+    *.pc
     # tests
     test-driver
     *.log
@@ Expand Down @@