View | Details | Raw Unified | Return to bug 23588 | Differences between
and this patch

Collapse All | Expand All

(-)configure (-65 / +18 lines)
Lines 33410-33423 Link Here
33410
  old_LIBS="$LIBS"
33410
  old_LIBS="$LIBS"
33411
  old_LDFLAGS="$LDFLAGS"
33411
  old_LDFLAGS="$LDFLAGS"
33412
  LDFLAGS="$LDFLAGS -L$PGSQL_LIBDIR"
33412
  LDFLAGS="$LDFLAGS -L$PGSQL_LIBDIR"
33413
  echo $ac_n "checking for PQcmdTuples in -lpq -lssl""... $ac_c" 1>&6
33413
  echo $ac_n "checking for PQcmdTuples in -lpq -lssl -lcrypto""... $ac_c" 1>&6
33414
echo "configure:33415: checking for PQcmdTuples in -lpq -lssl" >&5
33414
echo "configure:33415: checking for PQcmdTuples in -lpq -lssl -lcrypto" >&5
33415
ac_lib_var=`echo pq'_'PQcmdTuples | sed 'y%./+-%__p_%'`
33415
ac_lib_var=`echo pq'_'PQcmdTuples | sed 'y%./+-%__p_%'`
33416
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
33416
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
33417
  echo $ac_n "(cached) $ac_c" 1>&6
33417
  echo $ac_n "(cached) $ac_c" 1>&6
33418
else
33418
else
33419
  ac_save_LIBS="$LIBS"
33419
  ac_save_LIBS="$LIBS"
33420
LIBS="-lpq -lssl  $LIBS"
33420
LIBS="-lpq -lssl -lcrypto  $LIBS"
33421
cat > conftest.$ac_ext <<EOF
33421
cat > conftest.$ac_ext <<EOF
33422
#line 33423 "configure"
33422
#line 33423 "configure"
33423
#include "confdefs.h"
33423
#include "confdefs.h"
Lines 33453-33466 Link Here
33453
  echo "$ac_t""no" 1>&6
33453
  echo "$ac_t""no" 1>&6
33454
fi
33454
fi
33455
33455
33456
  echo $ac_n "checking for PQoidValue in -lpq -lssl""... $ac_c" 1>&6
33456
  echo $ac_n "checking for PQoidValue in -lpq -lssl -lcrypto""... $ac_c" 1>&6
33457
echo "configure:33458: checking for PQoidValue in -lpq -lssl" >&5
33457
echo "configure:33458: checking for PQoidValue in -lpq -lssl -lcrypto" >&5
33458
ac_lib_var=`echo pq'_'PQoidValue | sed 'y%./+-%__p_%'`
33458
ac_lib_var=`echo pq'_'PQoidValue | sed 'y%./+-%__p_%'`
33459
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
33459
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
33460
  echo $ac_n "(cached) $ac_c" 1>&6
33460
  echo $ac_n "(cached) $ac_c" 1>&6
33461
else
33461
else
33462
  ac_save_LIBS="$LIBS"
33462
  ac_save_LIBS="$LIBS"
33463
LIBS="-lpq -lssl  $LIBS"
33463
LIBS="-lpq -lssl -lcrypto  $LIBS"
33464
cat > conftest.$ac_ext <<EOF
33464
cat > conftest.$ac_ext <<EOF
33465
#line 33466 "configure"
33465
#line 33466 "configure"
33466
#include "confdefs.h"
33466
#include "confdefs.h"
Lines 33496-33509 Link Here
33496
  echo "$ac_t""no" 1>&6
33496
  echo "$ac_t""no" 1>&6
33497
fi
33497
fi
33498
33498
33499
  echo $ac_n "checking for PQclientEncoding in -lpq -lssl""... $ac_c" 1>&6
33499
  echo $ac_n "checking for PQclientEncoding in -lpq -lssl -lcrypto""... $ac_c" 1>&6
33500
echo "configure:33501: checking for PQclientEncoding in -lpq -lssl" >&5
33500
echo "configure:33501: checking for PQclientEncoding in -lpq -lssl -lcrypto" >&5
33501
ac_lib_var=`echo pq'_'PQclientEncoding | sed 'y%./+-%__p_%'`
33501
ac_lib_var=`echo pq'_'PQclientEncoding | sed 'y%./+-%__p_%'`
33502
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
33502
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
33503
  echo $ac_n "(cached) $ac_c" 1>&6
33503
  echo $ac_n "(cached) $ac_c" 1>&6
33504
else
33504
else
33505
  ac_save_LIBS="$LIBS"
33505
  ac_save_LIBS="$LIBS"
33506
LIBS="-lpq -lssl  $LIBS"
33506
LIBS="-lpq -lssl -lcrypto  $LIBS"
33507
cat > conftest.$ac_ext <<EOF
33507
cat > conftest.$ac_ext <<EOF
33508
#line 33509 "configure"
33508
#line 33509 "configure"
33509
#include "confdefs.h"
33509
#include "confdefs.h"
Lines 33539-33552 Link Here
33539
  echo "$ac_t""no" 1>&6
33539
  echo "$ac_t""no" 1>&6
33540
fi
33540
fi
33541
33541
33542
  echo $ac_n "checking for pg_encoding_to_char in -lpq -lssl""... $ac_c" 1>&6
33542
  echo $ac_n "checking for pg_encoding_to_char in -lpq -lssl -lcrypto""... $ac_c" 1>&6
33543
echo "configure:33544: checking for pg_encoding_to_char in -lpq -lssl" >&5
33543
echo "configure:33544: checking for pg_encoding_to_char in -lpq -lssl -lcrypto" >&5
33544
ac_lib_var=`echo pq'_'pg_encoding_to_char | sed 'y%./+-%__p_%'`
33544
ac_lib_var=`echo pq'_'pg_encoding_to_char | sed 'y%./+-%__p_%'`
33545
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
33545
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
33546
  echo $ac_n "(cached) $ac_c" 1>&6
33546
  echo $ac_n "(cached) $ac_c" 1>&6
33547
else
33547
else
33548
  ac_save_LIBS="$LIBS"
33548
  ac_save_LIBS="$LIBS"
33549
LIBS="-lpq -lssl  $LIBS"
33549
LIBS="-lpq -lssl -lcrypto  $LIBS"
33550
cat > conftest.$ac_ext <<EOF
33550
cat > conftest.$ac_ext <<EOF
33551
#line 33552 "configure"
33551
#line 33552 "configure"
33552
#include "confdefs.h"
33552
#include "confdefs.h"
Lines 33593-33599 Link Here
33593
  
33593
  
33594
33594
33595
  if test "$ext_shared" = "yes"; then
33595
  if test "$ext_shared" = "yes"; then
33596
    PGSQL_SHARED_LIBADD="-lpq -lssl $PGSQL_SHARED_LIBADD"
33596
    PGSQL_SHARED_LIBADD="-lpq -lssl -lcrypto $PGSQL_SHARED_LIBADD"
33597
    if test -n "$PGSQL_LIBDIR"; then
33597
    if test -n "$PGSQL_LIBDIR"; then
33598
      
33598
      
33599
  if test "$PGSQL_LIBDIR" != "/usr/lib"; then
33599
  if test "$PGSQL_LIBDIR" != "/usr/lib"; then
Lines 33673-33679 Link Here
33673
 *)
33673
 *)
33674
33674
33675
   
33675
   
33676
  LIBS="-lpq -lssl $LIBS"
33676
  LIBS="-lpq -lssl -lcrypto $LIBS"
33677
33677
33678
33678
33679
  ;;
33679
  ;;
Lines 39331-39348 Link Here
39331
  fi
39331
  fi
39332
39332
39333
	
39333
	
39334
 case "cs" in
39335
 c|c_r|pthread*) ;;
39336
 *)
39337
39338
   
39339
  LIBS="-lcs $LIBS"
39340
39341
39342
  ;;
39343
  esac
39344
39345
	
39346
 case "ct" in
39334
 case "ct" in
39347
 c|c_r|pthread*) ;;
39335
 c|c_r|pthread*) ;;
39348
 *)
39336
 *)
Lines 39355-39384 Link Here
39355
  esac
39343
  esac
39356
39344
39357
	
39345
	
39358
 case "comn" in
39346
	SYBASE_CT_LIBS="-lct"
39359
 c|c_r|pthread*) ;;
39360
 *)
39361
39362
   
39363
  LIBS="-lcomn $LIBS"
39364
39365
39366
  ;;
39367
  esac
39368
39369
	
39370
 case "intl" in
39371
 c|c_r|pthread*) ;;
39372
 *)
39373
39374
   
39375
  LIBS="-lintl $LIBS"
39376
39377
39378
  ;;
39379
  esac
39380
39381
	SYBASE_CT_LIBS="-lcs -lct -lcomn -lintl"
39382
    old_LDFLAGS=$LDFLAGS
39347
    old_LDFLAGS=$LDFLAGS
39383
    LDFLAGS="$LDFLAGS -L$SYBASE_CT_LIBDIR"
39348
    LDFLAGS="$LDFLAGS -L$SYBASE_CT_LIBDIR"
39384
    echo $ac_n "checking for netg_errstr in -ltcl""... $ac_c" 1>&6
39349
    echo $ac_n "checking for netg_errstr in -ltcl""... $ac_c" 1>&6
Lines 39430-39447 Link Here
39430
 
39395
 
39431
else
39396
else
39432
  echo "$ac_t""no" 1>&6
39397
  echo "$ac_t""no" 1>&6
39433
 
39434
 case "sybtcl" in
39435
 c|c_r|pthread*) ;;
39436
 *)
39437
39438
   
39439
  LIBS="-lsybtcl $LIBS"
39440
39441
39442
  ;;
39443
  esac
39444
 
39445
fi
39398
fi
39446
39399
39447
    echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6
39400
    echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6
Lines 44175-44182 Link Here
44175
LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
44128
LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
44176
LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
44129
LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
44177
DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
44130
DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
44178
${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
44131
${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
44179
$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
44132
$libtool_flags --no-verify --disable-ltlibs /usr/local/share/libtool/ltmain.sh $lt_target \
44180
|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
44133
|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
44181
44134
44182
# Reload cache, that may have been modified by ltconfig
44135
# Reload cache, that may have been modified by ltconfig
Lines 44190-44196 Link Here
44190
44143
44191
44144
44192
# This can be used to rebuild libtool when needed
44145
# This can be used to rebuild libtool when needed
44193
LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
44146
LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs /usr/local/share/libtool/ltmain.sh"
44194
44147
44195
# Always use our own libtool.
44148
# Always use our own libtool.
44196
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
44149
LIBTOOL='$(SHELL) $(top_builddir)/libtool'

Return to bug 23588