Dan Weber wrote:
Its always safer to run 'autoreconf -f'. It will run the whole
chain of commands.
autoreconf -f -i does the trick. I've updated the patch for initial
libtool support as well.
------------------------------------------------------------------------
#! /bin/sh -e
## 05_glib.dpatch by <[EMAIL PROTECTED]>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
if [ $# -lt 1 ]; then
echo "`basename $0`: script expects -patch|-unpatch as argument"
>&2
exit 1
fi
[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
case "$1" in
-patch) patch -p1 ${patch_opts} < $0;;
-unpatch) patch -R -p1 ${patch_opts} < $0;;
*)
echo "`basename $0`: script expects -patch|-unpatch as
argument" >&2
exit 1;;
esac
exit 0
@DPATCH@
diff -urNad /usr/src/dbmail2/dbmail-2.0/acinclude.m4
dbmail-2.0/acinclude.m4
--- /usr/src/dbmail2/dbmail-2.0/acinclude.m4 2004-05-17
09:56:28.000000000 +0200
+++ dbmail-2.0/acinclude.m4 2004-05-17 10:00:55.000000000 +0200
@@ -403,4 +403,24 @@
unset ac_compile_warnings_opt
])
- +dnl DBMAIL_CHECK_GLIB
+dnl
+AC_DEFUN(DBMAIL_CHECK_GLIB, [dnl
+#Look for include files and libs needed to link
+#use the configuration utilities (pkg-config for this)
+AC_PATH_PROG(glibconfig,pkg-config)
+if test [ -z "$glibconfig" ]
+then
+ AC_MSG_ERROR([pkg-config executable not found. Make sure
pkg-config is in your path])
+else
+ AC_MSG_CHECKING([GLib headers])
+ ac_glib_cflags=`${glibconfig} --cflags glib-2.0`
+ CFLAGS="$CFLAGS $ac_glib_cflags"
+ AC_MSG_RESULT([$ac_glib_cflags])
+ AC_MSG_CHECKING([Glib libraries])
+ ac_glib_libs=`${glibconfig} --libs glib-2.0`
+ LDFLAGS="$LDFLAGS $ac_glib_libs"
+ AC_MSG_RESULT([$ac_glib_libs])
+fi
+])
+
diff -urNad /usr/src/dbmail2/dbmail-2.0/configure.in
dbmail-2.0/configure.in
--- /usr/src/dbmail2/dbmail-2.0/configure.in 2004-05-17
09:56:28.000000000 +0200
+++ dbmail-2.0/configure.in 2004-05-17 10:01:04.000000000 +0200
@@ -23,7 +23,7 @@
AM_INIT_AUTOMAKE(dbmail, 2.0)
AM_MAINTAINER_MODE
-AC_PROG_RANLIB
+AC_PROG_LIBTOOL
pgsqlheaderpaths="/usr/include/pgsql /usr/include
/usr/local/include/pgsql \
/usr/local/include /usr/freeware/include/pgsql \
@@ -33,7 +33,7 @@
ldapheaderpaths="/usr/include /usr/local/include"
sieveheaderpaths="/usr/include /usr/local/include"
-AC_DEFINE(_GNU_SOURCE)
+dnl AC_DEFINE(_GNU_SOURCE)
DBMAIL_BOTH_SQL_CHECK
DBMAIL_CHECK_SQL_LIBS
@@ -41,6 +41,7 @@
DBMAIL_CHECK_LDAP_LIBS
DBMAIL_SIEVE_CONF
DBMAIL_CHECK_SIEVE_LIBS
+DBMAIL_CHECK_GLIB
AC_PROG_CC
AC_COMPILE_WARNINGS
------------------------------------------------------------------------
_______________________________________________
Dbmail-dev mailing list
[email protected]
http://twister.fastxs.net/mailman/listinfo/dbmail-dev
