From: Rick Bird <nveid@bender.theari.com>
Date: Tue, 26 Apr 2011 23:18:49 +0000 (-0400)
Subject: Added OPENSSL_x variables to Makefile.in
X-Git-Url: https://git.theari.com/?a=commitdiff_plain;h=9bb7247cef8b94756271da1fc00e7d031d885744;p=cobramush.git

Added OPENSSL_x variables to Makefile.in
IssueID #240
---

diff --git a/Makefile.in b/Makefile.in
index 987d5e8..955cc2f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -20,9 +20,9 @@ CC=@CC@
 SQL_CFLAGS=@MYSQL_CFLAGS@ @POSTGRESQL_CFLAGS@ @SQLITE3_CFLAGS@
 SQL_LDFLAGS=@MYSQL_LDFLAGS@ @POSTGRESQL_LDFLAGS@ @SQLITE3_LDFLAGS@
 
-CCFLAGS=@CFLAGS@ -I.. -I../hdrs -I/usr/include/lua5.1 @CPPFLAGS@ @PCRE_CFLAGS@ -Werror
-LDFLAGS=@LDFLAGS@ 
-CLIBS=@LIBS@ @PCRE_LIBS@ @LIBLTDL@ @LIBLUA@
+CCFLAGS=@CFLAGS@ -I.. -I../hdrs -I/usr/include/lua5.1 @OPENSSL_INCLUDES@ @CPPFLAGS@ @PCRE_CFLAGS@ -Werror
+LDFLAGS=@LDFLAGS@  @OPENSSL_INCLUDES@
+CLIBS=@LIBS@ @PCRE_LIBS@ @LIBLTDL@ @LIBLUA@ @OPENSSL_LIBS@
 INSTALL=@INSTALL@
 INSTALLDIR=$installdir
 CP=@CP@
diff --git a/configure.ac b/configure.ac
index a872b0c..2bc16bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -219,7 +219,10 @@ if test "$enable_zlib" = "yes"; then
 fi
 
 
-AX_CHECK_OPENSSL([AC_DEFINE(HAVE_SSL, , [Check for OpenSSL Library]) HAVE_SSL="yes"])
+AX_CHECK_OPENSSL([
+		  AC_DEFINE(HAVE_SSL, , [Check for OpenSSL Library]) H
+		  AVE_SSL="yes"
+		  ])
 
 AC_ARG_ENABLE(zlib, AS_HELP_STRING([--disable-zlib], [Don't use zlib for database compression.]), enable_zlib=$enableval, enable_zlib=yes)