From fbde1552870226687ed1e0d6b9b584c987bc0173 Mon Sep 17 00:00:00 2001 From: Arnaud Cornet Date: Sun, 18 Nov 2018 15:37:46 -0500 Subject: [PATCH] Add missing OpenSSL CFLAGS/LDFLAGs to build. Those were removed by mistake in the previous autotool refactor. --- configure.ac | 6 +++++- src/Makefile.am | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 9df85bb..27fe857 100644 --- a/configure.ac +++ b/configure.ac @@ -15,7 +15,11 @@ AC_PROG_YACC m4_ifndef([PKG_PROG_PKG_CONFIG], [m4_fatal([Please install pkg-config.])]) PKG_PROG_PKG_CONFIG -PKG_CHECK_MODULES(OPENSSL, [libssl >= 0.9.8 libcrypto >= 0.9.8], [with_openssl=yes], [with_openssl=no]) +PKG_CHECK_MODULES(OPENSSL, [libssl >= 0.9.8 libcrypto >= 0.9.8], [ + with_openssl=yes + AC_DEFINE([HAVE_LIBSSL], [1], + [Build SSL support]) + ], [ with_openssl=no ]) AC_CACHE_CHECK([whether $CC accepts PIE flags], [ap_cv_cc_pie], [ save_CFLAGS=$CFLAGS diff --git a/src/Makefile.am b/src/Makefile.am index 04b6ee7..573b228 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,10 +12,13 @@ libbip_a_SOURCES = conf.y lex.l \ tuple.h \ util.c util.h +libbip_a_CFLAGS = ${OPENSSL_CFLAGS} + bin_PROGRAMS = bip bipmkpw bip_SOURCES = bip_main.c -bip_LDADD = libbip.a +bip_LDADD = libbip.a ${OPENSSL_LIBS} + bipmkpw_SOURCES = bipmkpw.c md5.c util.c AM_YFLAGS= -d