--- dvutil-1.0.5.orig/Makefile.am	2008-11-19 17:56:27.000000000 +0100
+++ dvutil-1.0.5/Makefile.am	2010-02-06 11:43:32.762215099 +0100
@@ -1,6 +1,6 @@
 # $Header: /home/dvermeir/cvsroot/dvutil/Makefile.am,v 1.9 2008/11/19 16:56:27 dvermeir Exp $
-ACLOCAL_AMFLAGS=-I m4 -I /usr/local/share/aclocal
-SUBDIRS =  dvutil doc m4
+ACLOCAL_AMFLAGS=-I m4
+SUBDIRS =  dvutil m4
 
 maintainer-check: distcheck
 	@:
--- dvutil-1.0.5.orig/configure.ac	2008-11-20 12:10:42.000000000 +0100
+++ dvutil-1.0.5/configure.ac	2010-02-06 11:57:42.420215729 +0100
@@ -69,33 +69,11 @@
 dnl DV_REQUIRE_CFUNC(getspnam)
 DV_REQUIRE_CFUNC(crypt,crypt)
 
-# AC_ARG_ENABLE(ssl,
-#               AC_HELP_STRING(
-#                              [--disable-ssl],
-#                              [do not provide Dv::Util::File::md5, Dv::Util::File::sha1]),
-#               , enable_ssl="yes")
-# 
-# AC_MSG_CHECKING([whether we want to compile functions relying on openssl])
-# AC_MSG_RESULT(${enable_ssl})
-# if test "${enable_ssl}" = "yes" ; then
-#   AC_DEFINE(WITH_OPENSSL, 1, [openssl wanted and available])
-#   DV_REQUIRE_CFUNC(MD5,ssl)
-#   DV_REQUIRE_CFUNC(SHA1,ssl)
-# fi
-
-DV_CHECK_CFUNC(SHA1,ssl)
-DV_CHECK_CFUNC(MD5,ssl)
-if test "${dv_ac_func_MD5}" = "yes"; then
-  if test "${dv_ac_func_SHA1}" = "yes"; then
-    have_openssl="yes"
-  else
-    have_openssl="no"
-  fi
-else
-  have_openssl="no"
+AC_ARG_WITH([ssl], AS_HELP_STRING([--with-ssl], [Build with ssl library (default: disabled)]))
+if test "x$with_ssl" == "xyes"; then
+  PKG_CHECK_MODULES([SSL], [libssl])
+  AC_DEFINE([HAVE_OPENSSL], [1], [openssl available])
 fi
-AC_DEFINE([HAVE_OPENSSL],[HAVE_MD5 && HAVE_SHA1],[openssl available])
-AC_SUBST(have_openssl)
 
 DV_REQUIRE_CFUNC(getgrnam)
 DV_REQUIRE_CFUNC(chown)
--- dvutil-1.0.5.orig/m4/dvfuncs.m4	2010-02-06 12:11:18.608216171 +0100
+++ dvutil-1.0.5/m4/dvfuncs.m4	2010-02-06 12:12:08.014218792 +0100
@@ -0,0 +1,60 @@
+dnl =====================================================================
+dnl DV_REQUIRE_CFUNC(   function [$1],          crypt
+dnl                     libraries [$2])         [ crypt crypto ]
+dnl =====================================================================
+dnl This macro verifies that the C function $1 is available, if necesssary
+dnl after linking with one of the libraries in $2 (without lib prefix). 
+dnl The library for which linking succeeds is added to $LIBS.
+dnl =====================================================================
+AC_DEFUN([DV_REQUIRE_CFUNC],
+[
+AC_LANG_PUSH(C)
+AC_CHECK_FUNC($1,, [ AC_SEARCH_LIBS($1,"$2",,AC_MSG_ERROR([need $1 function])) ])
+AC_LANG_POP(C)
+])
+
+dnl =====================================================================
+dnl DV_CHECK_CFUNC(     function [$1],          crypt
+dnl                     libraries [$2])         [ crypt crypto ]
+dnl =====================================================================
+dnl This macro checks whether the C function $1 is available, if necesssary
+dnl after linking with one of the libraries in $2 (without lib prefix). 
+dnl The library for which linking succeeds is added to $LIBS.
+dnl =====================================================================
+AC_DEFUN([DV_CHECK_CFUNC],
+[
+AC_LANG_PUSH(C)
+AC_CHECK_FUNC($1,[ AC_DEFINE(HAVE_$1, [1], [C function $1]) ],
+  [ AC_SEARCH_LIBS($1,"$2", AC_DEFINE(HAVE_$1, [1], [C function $1 in $2])) ])
+AC_LANG_POP(C)
+])
+dnl =====================================================================
+dnl DV_REQUIRE_PROG(
+dnl         pathvar[$1],      [ GZIP ]
+dnl            program-name[$2], [ gzip ]
+dnl            bin-dirs[$3],     [ [/usr/bin /usr/local/bin] ]
+dnl =====================================================================
+dnl Find out where program-name is, checking directories in bin-dirs.
+dnl Set pathvar if found and abort if not found
+dnl =====================================================================
+AC_DEFUN([DV_REQUIRE_PROG],
+[
+$1=""
+AM_PATH_PROG_WITH_TEST($1,$2,true, ,[$3])
+if test -z "$$1"; then
+  AC_MSG_ERROR([program $2 not found])
+fi
+])
+
+AC_DEFUN([DV_APPEND_UNIQ],
+[
+{ echo "${$2}" | grep -- "$1 " >/dev/null || $2="${$2} $1"; }dnl
+])
+
+AC_DEFUN([DV_SET_LIBTOOL],
+[
+AC_ARG_WITH(libtool,
+  [  --with-libtool=path     path of libtool program], 
+dv_lt=$withval,dv_lt="libtool")
+])
+
--- dvutil-1.0.5.orig/dvutil/Makefile.am	2008-08-28 15:57:02.000000000 +0200
+++ dvutil-1.0.5/dvutil/Makefile.am	2010-02-06 12:24:47.187966690 +0100
@@ -9,8 +9,8 @@
 lib_LTLIBRARIES = libdvutil.la
 
 libdvutil_la_LDFLAGS = -release @VERSION@ 
-libdvutil_la_LIBADD = @LIBS@ 
-libdvutil_la_CXXFLAGS = -Wno-deprecated -g -Wall -O3
+libdvutil_la_LIBADD = @LIBS@ @SSL_LIBS@
+libdvutil_la_CXXFLAGS = -Wno-deprecated -g -Wall @SSL_CFLAGS@
 libdvutil_la_SOURCES = debug_dump.C strings.C strings.h props.h props.C \
   date.h date.C period.h period.C getdate.c getdate.h \
   file.C file.h user.C user.h fdstreambuf.h fdstreambuf.C makedaemon.h makedaemon.C \