dovecot/dovecot.patch

Fri, 07 Sep 2012 19:08:07 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Fri, 07 Sep 2012 19:08:07 +0200
changeset 667
9dacbd1d1aa2
parent 608
09548e292fb1
permissions
-rw-r--r--

Correct build configuration in Solaris subdir, correct english grammar,
remove irrelevant strip notice, introduce custom CFLAG logic, facilitate
use of Solaris Studio compiler with needed build configuration
adjustments, conditionally build 64 bit position independent code,
and accommodate tun(7) in newer Solaris releases by renaming driver
and module from conflicting 'tun' to 'vtun'. These changes include
some nonstandard 'I give up' logic causing out of tree builds by
manipulating the PATH, for example.

     1 Index: configure.in
     2 --- configure.in.orig	2012-04-23 14:35:10.000000000 +0200
     3 +++ configure.in	2012-04-29 19:55:10.000000000 +0200
     4 @@ -2122,14 +2122,14 @@
     5    AC_CHECK_PROG(PG_CONFIG, pg_config, pg_config, NO)
     6    if test $PG_CONFIG = NO; then
     7      # based on code from PHP
     8 -    for i in /usr /usr/local /usr/local/pgsql; do
     9 -      for j in include include/pgsql include/postgres include/postgresql ""; do
    10 +    for i in @l_prefix@; do
    11 +      for j in include/postgresql; do
    12  	if test -r "$i/$j/libpq-fe.h"; then
    13  	  PGSQL_INCLUDE=$i/$j
    14  	fi
    15        done
    16 -      for lib in lib lib64; do
    17 -	for j in $lib $lib/pgsql $lib/postgres $lib/postgresql ""; do
    18 +      for lib in lib; do
    19 +	for j in $lib; do
    20  	  if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then
    21  	    PGSQL_LIBDIR=$i/$j
    22  	  fi
    23 Index: configure
    24 --- configure.orig	2012-04-23 14:35:52.000000000 +0200
    25 +++ configure	2012-04-29 19:55:11.000000000 +0200
    26 @@ -22919,14 +22919,14 @@
    28    if test $PG_CONFIG = NO; then
    29      # based on code from PHP
    30 -    for i in /usr /usr/local /usr/local/pgsql; do
    31 -      for j in include include/pgsql include/postgres include/postgresql ""; do
    32 +    for i in @l_prefix@; do
    33 +      for j in include/postgresql; do
    34  	if test -r "$i/$j/libpq-fe.h"; then
    35  	  PGSQL_INCLUDE=$i/$j
    36  	fi
    37        done
    38 -      for lib in lib lib64; do
    39 -	for j in $lib $lib/pgsql $lib/postgres $lib/postgresql ""; do
    40 +      for lib in lib; do
    41 +	for j in $lib; do
    42  	  if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then
    43  	    PGSQL_LIBDIR=$i/$j
    44  	  fi

mercurial