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