michael@237: Index: configure.in
michael@239: diff -Nau configure.in.orig configure.in
michael@237: --- configure.in.orig	2009-07-27 07:26:10 +0200
michael@237: +++ configure.in	2009-07-27 16:49:17 +0200
michael@239: @@ -1964,14 +1964,14 @@
michael@237:    AC_CHECK_PROG(PG_CONFIG, pg_config, YES, NO)
michael@237:    if test $PG_CONFIG = NO; then
michael@237:      # based on code from PHP
michael@237: -    for i in /usr /usr/local /usr/local/pgsql; do
michael@237: -      for j in include include/pgsql include/postgres include/postgresql ""; do
michael@237: +    for i in @l_prefix@; do
michael@237: +      for j in include/postgresql; do
michael@237:  	if test -r "$i/$j/libpq-fe.h"; then
michael@237:  	  PGSQL_INCLUDE=$i/$j
michael@237:  	fi
michael@237:        done
michael@237: -      for lib in lib lib64; do
michael@237: -	for j in $lib $lib/pgsql $lib/postgres $lib/postgresql ""; do
michael@237: +      for lib in lib; do
michael@237: +	for j in $lib; do
michael@237:  	  if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then
michael@237:  	    PGSQL_LIBDIR=$i/$j
michael@237:  	  fi
michael@204: Index: configure
michael@239: diff -Nau configure.orig configure
michael@237: --- configure.orig	2009-07-27 07:26:28 +0200
michael@237: +++ configure	2009-07-27 16:50:02 +0200
michael@239: @@ -29410,14 +29410,14 @@
michael@204:  
michael@237:    if test $PG_CONFIG = NO; then
michael@237:      # based on code from PHP
michael@237: -    for i in /usr /usr/local /usr/local/pgsql; do
michael@237: -      for j in include include/pgsql include/postgres include/postgresql ""; do
michael@237: +    for i in @l_prefix@; do
michael@237: +      for j in include/postgresql; do
michael@237:  	if test -r "$i/$j/libpq-fe.h"; then
michael@237:  	  PGSQL_INCLUDE=$i/$j
michael@237:  	fi
michael@237:        done
michael@237: -      for lib in lib lib64; do
michael@237: -	for j in $lib $lib/pgsql $lib/postgres $lib/postgresql ""; do
michael@237: +      for lib in lib; do
michael@237: +	for j in $lib; do
michael@237:  	  if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then
michael@237:  	    PGSQL_LIBDIR=$i/$j
michael@237:  	  fi
michael@148: Index: src/deliver/deliver.c
michael@239: diff -Nau src/deliver/deliver.c.orig src/deliver/deliver.c
michael@237: --- src/deliver/deliver.c.orig	2009-06-28 01:47:56 +0200
michael@237: +++ src/deliver/deliver.c	2009-07-27 16:47:39 +0200
michael@237: @@ -46,7 +46,7 @@
michael@148:  #include <syslog.h>
michael@148:  
michael@148:  #define DEFAULT_CONFIG_FILE SYSCONFDIR"/dovecot.conf"
michael@148: -#define DEFAULT_SENDMAIL_PATH "/usr/lib/sendmail"
michael@148: +#define DEFAULT_SENDMAIL_PATH "@l_prefix@/sbin/sendmail"
michael@148:  #define DEFAULT_ENVELOPE_SENDER "MAILER-DAEMON"
michael@148:  
michael@148:  /* After buffer grows larger than this, create a temporary file to /tmp
michael@239: Index: src/master/master-settings.c
michael@239: diff -Nau src/master/master-settings.c.orig src/master/master-settings.c
michael@239: --- src/master/master-settings.c.orig	2009-05-13 19:32:34.000000000 +0200
michael@239: +++ src/master/master-settings.c	2009-05-27 14:29:11.985776641 +0200
michael@239: @@ -179,8 +179,8 @@
michael@239:  
michael@239:  	/* general */
michael@239:  	MEMBER(protocols) "imap imaps",
michael@239: -	MEMBER(listen) "*",
michael@239: -	MEMBER(ssl_listen) "",
michael@239: +	MEMBER(listen) "127.0.0.1",
michael@239: +	MEMBER(ssl_listen) "127.0.0.1",
michael@239:  
michael@239:  	MEMBER(ssl) "yes",
michael@239:  	MEMBER(ssl_ca_file) "",
michael@239: @@ -200,7 +200,7 @@
michael@239:  	/* login */
michael@239:  	MEMBER(login_dir) "login",
michael@239:  	MEMBER(login_executable) NULL,
michael@239: -	MEMBER(login_user) "dovecot",
michael@239: +	MEMBER(login_user) "@l_musr@",
michael@239:  	MEMBER(login_greeting) PACKAGE_NAME" ready.",
michael@239:  	MEMBER(login_log_format_elements) "user=<%u> method=%m rip=%r lip=%l %c",
michael@239:  	MEMBER(login_log_format) "%$: %s",
michael@239: @@ -321,7 +321,7 @@
michael@239:  	MEMBER(anonymous_username) "anonymous",
michael@239:  	MEMBER(krb5_keytab) "",
michael@239:  	MEMBER(gssapi_hostname) "",
michael@239: -	MEMBER(winbind_helper_path) "/usr/bin/ntlm_auth",
michael@239: +	MEMBER(winbind_helper_path) "@l_prefix@/bin/ntlm_auth",
michael@239:  	MEMBER(failure_delay) 2,
michael@239:  
michael@239:  	MEMBER(verbose) FALSE,