Attachment 12104 Details for Bug 23588 – file.diff

[patch] file.diff

file.diff (text/plain), 4.97 KB, created by parag on 2000-12-16 20:10:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: parag

Created: 2000-12-16 20:10:01 UTC

Size: 4.97 KB

patch

obsolete

>--- configure.orig	Sat Dec 16 11:50:24 2000
>+++ configure	Sat Dec 16 11:53:51 2000
>@@ -33410,14 +33410,14 @@
>   old_LIBS="$LIBS"
>   old_LDFLAGS="$LDFLAGS"
>   LDFLAGS="$LDFLAGS -L$PGSQL_LIBDIR"
>-  echo $ac_n "checking for PQcmdTuples in -lpq -lssl""... $ac_c" 1>&6
>-echo "configure:33415: checking for PQcmdTuples in -lpq -lssl" >&5
>+  echo $ac_n "checking for PQcmdTuples in -lpq -lssl -lcrypto""... $ac_c" 1>&6
>+echo "configure:33415: checking for PQcmdTuples in -lpq -lssl -lcrypto" >&5
> ac_lib_var=`echo pq'_'PQcmdTuples | sed 'y%./+-%__p_%'`
> if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>   ac_save_LIBS="$LIBS"
>-LIBS="-lpq -lssl  $LIBS"
>+LIBS="-lpq -lssl -lcrypto  $LIBS"
> cat > conftest.$ac_ext <<EOF
> #line 33423 "configure"
> #include "confdefs.h"
>@@ -33453,14 +33453,14 @@
>   echo "$ac_t""no" 1>&6
> fi
> 
>-  echo $ac_n "checking for PQoidValue in -lpq -lssl""... $ac_c" 1>&6
>-echo "configure:33458: checking for PQoidValue in -lpq -lssl" >&5
>+  echo $ac_n "checking for PQoidValue in -lpq -lssl -lcrypto""... $ac_c" 1>&6
>+echo "configure:33458: checking for PQoidValue in -lpq -lssl -lcrypto" >&5
> ac_lib_var=`echo pq'_'PQoidValue | sed 'y%./+-%__p_%'`
> if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>   ac_save_LIBS="$LIBS"
>-LIBS="-lpq -lssl  $LIBS"
>+LIBS="-lpq -lssl -lcrypto  $LIBS"
> cat > conftest.$ac_ext <<EOF
> #line 33466 "configure"
> #include "confdefs.h"
>@@ -33496,14 +33496,14 @@
>   echo "$ac_t""no" 1>&6
> fi
> 
>-  echo $ac_n "checking for PQclientEncoding in -lpq -lssl""... $ac_c" 1>&6
>-echo "configure:33501: checking for PQclientEncoding in -lpq -lssl" >&5
>+  echo $ac_n "checking for PQclientEncoding in -lpq -lssl -lcrypto""... $ac_c" 1>&6
>+echo "configure:33501: checking for PQclientEncoding in -lpq -lssl -lcrypto" >&5
> ac_lib_var=`echo pq'_'PQclientEncoding | sed 'y%./+-%__p_%'`
> if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>   ac_save_LIBS="$LIBS"
>-LIBS="-lpq -lssl  $LIBS"
>+LIBS="-lpq -lssl -lcrypto  $LIBS"
> cat > conftest.$ac_ext <<EOF
> #line 33509 "configure"
> #include "confdefs.h"
>@@ -33539,14 +33539,14 @@
>   echo "$ac_t""no" 1>&6
> fi
> 
>-  echo $ac_n "checking for pg_encoding_to_char in -lpq -lssl""... $ac_c" 1>&6
>-echo "configure:33544: checking for pg_encoding_to_char in -lpq -lssl" >&5
>+  echo $ac_n "checking for pg_encoding_to_char in -lpq -lssl -lcrypto""... $ac_c" 1>&6
>+echo "configure:33544: checking for pg_encoding_to_char in -lpq -lssl -lcrypto" >&5
> ac_lib_var=`echo pq'_'pg_encoding_to_char | sed 'y%./+-%__p_%'`
> if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>   ac_save_LIBS="$LIBS"
>-LIBS="-lpq -lssl  $LIBS"
>+LIBS="-lpq -lssl -lcrypto  $LIBS"
> cat > conftest.$ac_ext <<EOF
> #line 33552 "configure"
> #include "confdefs.h"
>@@ -33593,7 +33593,7 @@
>   
> 
>   if test "$ext_shared" = "yes"; then
>-    PGSQL_SHARED_LIBADD="-lpq -lssl $PGSQL_SHARED_LIBADD"
>+    PGSQL_SHARED_LIBADD="-lpq -lssl -lcrypto $PGSQL_SHARED_LIBADD"
>     if test -n "$PGSQL_LIBDIR"; then
>       
>   if test "$PGSQL_LIBDIR" != "/usr/lib"; then
>@@ -33673,7 +33673,7 @@
>  *)
> 
>    
>-  LIBS="-lpq -lssl $LIBS"
>+  LIBS="-lpq -lssl -lcrypto $LIBS"
> 
> 
>   ;;
>@@ -39331,18 +39331,6 @@
>   fi
> 
> 	
>- case "cs" in
>- c|c_r|pthread*) ;;
>- *)
>-
>-   
>-  LIBS="-lcs $LIBS"
>-
>-
>-  ;;
>-  esac
>-
>-	
>  case "ct" in
>  c|c_r|pthread*) ;;
>  *)
>@@ -39355,30 +39343,7 @@
>   esac
> 
> 	
>- case "comn" in
>- c|c_r|pthread*) ;;
>- *)
>-
>-   
>-  LIBS="-lcomn $LIBS"
>-
>-
>-  ;;
>-  esac
>-
>-	
>- case "intl" in
>- c|c_r|pthread*) ;;
>- *)
>-
>-   
>-  LIBS="-lintl $LIBS"
>-
>-
>-  ;;
>-  esac
>-
>-	SYBASE_CT_LIBS="-lcs -lct -lcomn -lintl"
>+	SYBASE_CT_LIBS="-lct"
>     old_LDFLAGS=$LDFLAGS
>     LDFLAGS="$LDFLAGS -L$SYBASE_CT_LIBDIR"
>     echo $ac_n "checking for netg_errstr in -ltcl""... $ac_c" 1>&6
>@@ -39430,18 +39395,6 @@
>  
> else
>   echo "$ac_t""no" 1>&6
>- 
>- case "sybtcl" in
>- c|c_r|pthread*) ;;
>- *)
>-
>-   
>-  LIBS="-lsybtcl $LIBS"
>-
>-
>-  ;;
>-  esac
>- 
> fi
> 
>     echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6
>@@ -44175,8 +44128,8 @@
> LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
> LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
> DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
>-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
>-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
>+${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
>+$libtool_flags --no-verify --disable-ltlibs /usr/local/share/libtool/ltmain.sh $lt_target \
> || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
> 
> # Reload cache, that may have been modified by ltconfig
>@@ -44190,7 +44143,7 @@
> 
> 
> # This can be used to rebuild libtool when needed
>-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
>+LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs /usr/local/share/libtool/ltmain.sh"
> 
> # Always use our own libtool.
> LIBTOOL='$(SHELL) $(top_builddir)/libtool'

Actions: View | Diff

Attachments on bug 23588: 12104 | 12105