[Forensics-changes] [SCM] debian-forensics/sleuthkit branch, debian, updated. debian/3.0.1-5-12-g7fcbe48

[Cristian Greco]

The following commit has been merged in the debian branch:
commit 0743457cf8d6113898ecbc3d84b1898aa91b82ef
Author: Cristian Greco <cristian at regolo.cc>
Date:   Sat Feb 13 03:15:29 2010 +0100

    debian/patches/90_fix_ldflags.patch: refreshed.

diff --git a/debian/patches/90_fix_ldflags.patch b/debian/patches/90_fix_ldflags.patch
index bd46a7a..25982fb 100644
--- a/debian/patches/90_fix_ldflags.patch
+++ b/debian/patches/90_fix_ldflags.patch
@@ -3,41 +3,18 @@ Description: Avoid linking against unused libraries (this holds both for
 library and tools) by enabling extra LDFLAGS at build time.
 --- a/configure.ac
 +++ b/configure.ac
-@@ -109,7 +109,10 @@
-         [  --disable-ewf  Do not use libewf even if it is installed],
-         # Action if they gave this argument
-         [ if test "x$enableval" = "xyes" ; then
--            AC_CHECK_LIB([ewf], [libewf_open])
-+            AC_CHECK_LIB([ewf], [libewf_open],[
-+              AC_SUBST([LIBEWF_LIBS],["-lewf"])
-+              AC_DEFINE([HAVE_LIBEWF],[1],[Define to have libewf header included.])
-+            ])
-           elif test "x$enableval" = "xno" ; then
-             echo "Ignoring LibEWF."
-           else
-@@ -118,8 +121,10 @@
-           fi
-         ],
-         # if they did not specify ewf, look for it
--        [AC_CHECK_LIB([ewf], [libewf_open])]
--        )
-+        [AC_CHECK_LIB([ewf], [libewf_open],[
-+          AC_SUBST([LIBEWF_LIBS],["-lewf"])
-+          AC_DEFINE([HAVE_LIBEWF],[1],[Define to have libewf header included.])]
-+        )])
-     # if libewf.h was not found, then do nothing
-     ], 
+@@ -120,7 +120,10 @@
+     )]
+     # Check for the header file first to make sure they have the dev install
+     [AC_CHECK_HEADERS([libewf.h], 
+-      [AC_CHECK_LIB([ewf], [libewf_open])]
++      [AC_CHECK_LIB([ewf], [libewf_open],[
++        AC_SUBST([LIBEWF_LIBS],["-lewf"])
++        AC_DEFINE([HAVE_LIBEWF],[1],[Define to have libewf header included.])
++      ])]
+     )]
  )
---- a/tools/disktools/Makefile.am
-+++ b/tools/disktools/Makefile.am
-@@ -1,6 +1,6 @@
- AM_CPPFLAGS = -I../.. -Wall
- LDADD = ../../tsk3/libtsk3.la
--LDFLAGS = -static
-+LDFLAGS += -static
- EXTRA_DIST = .indent.pro
  
- bin_PROGRAMS = disk_stat disk_sreset
 --- a/tools/fstools/Makefile.am
 +++ b/tools/fstools/Makefile.am
 @@ -1,6 +1,6 @@
@@ -89,5 +66,5 @@ library and tools) by enabling extra LDFLAGS at build time.
 +    @LIBEWF_LIBS@
 +
  # current:revision:age
- libtsk3_la_LDFLAGS = -version-info 4:3:1
+ libtsk3_la_LDFLAGS = -version-info 5:0:2
  

-- 
debian-forensics/sleuthkit