Attachment #218651 for bug #298152

Lines 1-6 Link Here

(-)dvutil-1.0.5.orig/Makefile.am (-2 / +2 lines)
1	# $Header: /home/dvermeir/cvsroot/dvutil/Makefile.am,v 1.9 2008/11/19 16:56:27 dvermeir Exp $	1	# $Header: /home/dvermeir/cvsroot/dvutil/Makefile.am,v 1.9 2008/11/19 16:56:27 dvermeir Exp $
2	ACLOCAL_AMFLAGS=-I m4 -I /usr/local/share/aclocal	2	ACLOCAL_AMFLAGS=-I m4
3	SUBDIRS = dvutil doc m4	3	SUBDIRS = dvutil m4
4		4
5	maintainer-check: distcheck	5	maintainer-check: distcheck
6	@:	6	@:




dnl DV_REQUIRE_CFUNC(getspnam)
DV_REQUIRE_CFUNC(crypt,crypt)

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])
#               , 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"
fi
AC_DEFINE([HAVE_OPENSSL],[HAVE_MD5 && HAVE_SHA1],[openssl available])
AC_SUBST(have_openssl)

DV_REQUIRE_CFUNC(getgrnam)
DV_REQUIRE_CFUNC(chown)




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")
])


Lines 9-16 Link Here

(-)dvutil-1.0.5.orig/dvutil/Makefile.am (-2 / +2 lines)
9	lib_LTLIBRARIES = libdvutil.la	9	lib_LTLIBRARIES = libdvutil.la
10		10
11	libdvutil_la_LDFLAGS = -release @VERSION@	11	libdvutil_la_LDFLAGS = -release @VERSION@
12	libdvutil_la_LIBADD = @LIBS@	12	libdvutil_la_LIBADD = @LIBS@ @SSL_LIBS@
13	libdvutil_la_CXXFLAGS = -Wno-deprecated -g -Wall -O3	13	libdvutil_la_CXXFLAGS = -Wno-deprecated -g -Wall @SSL_CFLAGS@
14	libdvutil_la_SOURCES = debug_dump.C strings.C strings.h props.h props.C \	14	libdvutil_la_SOURCES = debug_dump.C strings.C strings.h props.h props.C \
15	date.h date.C period.h period.C getdate.c getdate.h \	15	date.h date.C period.h period.C getdate.c getdate.h \
16	file.C file.h user.C user.h fdstreambuf.h fdstreambuf.C makedaemon.h makedaemon.C \	16	file.C file.h user.C user.h fdstreambuf.h fdstreambuf.C makedaemon.h makedaemon.C \

Return to bug 298152

Lines 69-101 Link Here

(-)dvutil-1.0.5.orig/configure.ac (-26 / +4 lines)
69	dnl DV_REQUIRE_CFUNC(getspnam)	69	dnl DV_REQUIRE_CFUNC(getspnam)
70	DV_REQUIRE_CFUNC(crypt,crypt)	70	DV_REQUIRE_CFUNC(crypt,crypt)
71		71
72	# AC_ARG_ENABLE(ssl,	72	AC_ARG_WITH([ssl], AS_HELP_STRING([--with-ssl], [Build with ssl library (default: disabled)]))
73	# AC_HELP_STRING(	73	if test "x$with_ssl" == "xyes"; then
74	# [--disable-ssl],	74	PKG_CHECK_MODULES([SSL], [libssl])
75	# [do not provide Dv::Util::File::md5, Dv::Util::File::sha1]),	75	AC_DEFINE([HAVE_OPENSSL], [1], [openssl available])
76	# , enable_ssl="yes")
77	#
78	# AC_MSG_CHECKING([whether we want to compile functions relying on openssl])
79	# AC_MSG_RESULT(${enable_ssl})
80	# if test "${enable_ssl}" = "yes" ; then
81	# AC_DEFINE(WITH_OPENSSL, 1, [openssl wanted and available])
82	# DV_REQUIRE_CFUNC(MD5,ssl)
83	# DV_REQUIRE_CFUNC(SHA1,ssl)
84	# fi
85
86	DV_CHECK_CFUNC(SHA1,ssl)
87	DV_CHECK_CFUNC(MD5,ssl)
88	if test "${dv_ac_func_MD5}" = "yes"; then
89	if test "${dv_ac_func_SHA1}" = "yes"; then
90	have_openssl="yes"
91	else
92	have_openssl="no"
93	fi
94	else
95	have_openssl="no"
96	fi	76	fi
97	AC_DEFINE([HAVE_OPENSSL],[HAVE_MD5 && HAVE_SHA1],[openssl available])
98	AC_SUBST(have_openssl)
99		77
100	DV_REQUIRE_CFUNC(getgrnam)	78	DV_REQUIRE_CFUNC(getgrnam)
101	DV_REQUIRE_CFUNC(chown)	79	DV_REQUIRE_CFUNC(chown)

Line 0 Link Here

(-)dvutil-1.0.5.orig/m4/dvfuncs.m4 (+60 lines)
	1	dnl =====================================================================
	2	dnl DV_REQUIRE_CFUNC( function [$1], crypt
	3	dnl libraries [$2]) [ crypt crypto ]
	4	dnl =====================================================================
	5	dnl This macro verifies that the C function $1 is available, if necesssary
	6	dnl after linking with one of the libraries in $2 (without lib prefix).
	7	dnl The library for which linking succeeds is added to $LIBS.
	8	dnl =====================================================================
	9	AC_DEFUN([DV_REQUIRE_CFUNC],
	10	[
	11	AC_LANG_PUSH(C)
	12	AC_CHECK_FUNC($1,, [ AC_SEARCH_LIBS($1,"$2",,AC_MSG_ERROR([need $1 function])) ])
	13	AC_LANG_POP(C)
	14	])
	15
	16	dnl =====================================================================
	17	dnl DV_CHECK_CFUNC( function [$1], crypt
	18	dnl libraries [$2]) [ crypt crypto ]
	19	dnl =====================================================================
	20	dnl This macro checks whether the C function $1 is available, if necesssary
	21	dnl after linking with one of the libraries in $2 (without lib prefix).
	22	dnl The library for which linking succeeds is added to $LIBS.
	23	dnl =====================================================================
	24	AC_DEFUN([DV_CHECK_CFUNC],
	25	[
	26	AC_LANG_PUSH(C)
	27	AC_CHECK_FUNC($1,[ AC_DEFINE(HAVE_$1, [1], [C function $1]) ],
	28	[ AC_SEARCH_LIBS($1,"$2", AC_DEFINE(HAVE_$1, [1], [C function $1 in $2])) ])
	29	AC_LANG_POP(C)
	30	])
	31	dnl =====================================================================
	32	dnl DV_REQUIRE_PROG(
	33	dnl pathvar[$1], [ GZIP ]
	34	dnl program-name[$2], [ gzip ]
	35	dnl bin-dirs[$3], [ [/usr/bin /usr/local/bin] ]
	36	dnl =====================================================================
	37	dnl Find out where program-name is, checking directories in bin-dirs.
	38	dnl Set pathvar if found and abort if not found
	39	dnl =====================================================================
	40	AC_DEFUN([DV_REQUIRE_PROG],
	41	[
	42	$1=""
	43	AM_PATH_PROG_WITH_TEST($1,$2,true, ,[$3])
	44	if test -z "$$1"; then
	45	AC_MSG_ERROR([program $2 not found])
	46	fi
	47	])
	48
	49	AC_DEFUN([DV_APPEND_UNIQ],
	50	[
	51	{ echo "${$2}" \| grep -- "$1 " >/dev/null \|\| $2="${$2} $1"; }dnl
	52	])
	53
	54	AC_DEFUN([DV_SET_LIBTOOL],
	55	[
	56	AC_ARG_WITH(libtool,
	57	[ --with-libtool=path path of libtool program],
	58	dv_lt=$withval,dv_lt="libtool")
	59	])
	60