[Forensics-changes] [SCM] debian-forensics/aimage branch, debian, updated. debian/3.2.4-1-17-gf8e7856

[Julien Valroff]

The following commit has been merged in the debian branch:
commit 696a65b32af5cc06a2732eca109b8bd711913089
Author: Julien Valroff <julien at kirya.net>
Date:   Mon Oct 10 20:07:03 2011 +0200

    Restore original upstream files

diff --git a/Makefile.am b/Makefile.am
index 99552b6..b52c829 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,7 @@
 SUBDIRS = src
 
+ACLOCAL_AMFLAGS = -I m4
+
 RELEASE_USER = simsong@
 RELEASE_HOST = www.afflib.org
 RELEASE_DIR  = afflib.org/
diff --git a/configure.ac b/configure.ac
index 30d4081..4191e7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,6 +13,8 @@ AC_PROG_CXX
 AC_PROG_CC
 AC_PROG_INSTALL
 
+AC_CONFIG_MACRO_DIR([m4])
+
 AC_CONFIG_FILES([Makefile src/Makefile])
 AC_CONFIG_FILES([aimage.spec])
 AM_CONFIG_HEADER([config.h])
@@ -54,7 +56,7 @@ AC_ARG_ENABLE(noopt, AC_HELP_STRING([--enable-noopt], [Drop -O C flags]))
 AC_CHECK_HEADERS([openssl/md5.h openssl/sha.h openssl/aes.h openssl/rsa.h openssl/rand.h]) 
 AC_CHECK_LIB([crypto],[MD5_Update],,AC_MSG_ERROR([OpenSSL required for AFFLIB]))
 # Optional libraries
-AC_CHECK_LIB([ssl],[OpenSSL_add_all_digests],,AC_MSG_ERROR([OpenSSL library 'libssl-dev' not installed; cannot continue.]))
+AC_CHECK_LIB([ssl],[ssl3_new],,AC_MSG_ERROR([OpenSSL library 'libssl-dev' not installed; cannot continue.]))
 AC_CHECK_LIB([ncurses],[initscr],, AC_MSG_RESULT([ncurses not installed]))
 AC_CHECK_LIB([readline],[readline],, AC_MSG_RESULT([readline not installed]))
 AC_CHECK_HEADERS([readline/readline.h]) 

-- 
debian-forensics/aimage