Log Message:
-----------
fix libpq/ssl library detection [Adam H Pendleton]
Tags:
----
REL-1_2_0_PATCHES
Modified Files:
--------------
pgadmin3:
acinclude.m4 (r1.37.2.2 -> r1.37.2.3)
CHANGELOG.txt (r1.171.2.2 -> r1.171.2.3)
Index: CHANGELOG.txt
===================================================================
RCS file: /projects/pgadmin3/CHANGELOG.txt,v
retrieving revision 1.171.2.2
retrieving revision 1.171.2.3
diff -LCHANGELOG.txt -LCHANGELOG.txt -u -w -r1.171.2.2 -r1.171.2.3
--- CHANGELOG.txt
+++ CHANGELOG.txt
@@ -17,6 +17,7 @@
</ul>
<br>
<ul>
+ <li>2005-02-07 AHP 1.2.1 fix libpq/ssl library detection
<li>2005-01-13 DP 1.2.1 fix EXPLICIT CAST sql generation (r: Merlin
Moncure)
<li>2004-12-06 AP 1.2.1 Fix tablespace reference in namespace
<li>2004-11-19 AP 1.2.0 catch possible false error msg
Index: acinclude.m4
===================================================================
RCS file: /projects/pgadmin3/acinclude.m4,v
retrieving revision 1.37.2.2
retrieving revision 1.37.2.3
diff -Lacinclude.m4 -Lacinclude.m4 -u -w -r1.37.2.2 -r1.37.2.3
--- acinclude.m4
+++ acinclude.m4
@@ -119,14 +119,24 @@
fi
if test "$pg_static_build" = "yes"
then
+ if test "$pgsql_ssl_libpq" = "yes"
+ then
LIBS="${LIBPQ_HOME}/lib/libpq.a -lcrypt $LIBS -lssl -lcrypto"
else
+ LIBS="${LIBPQ_HOME}/lib/libpq.a -lcrypt $LIBS -lcrypto"
+ fi
+ else
+ if test "$pgsql_ssl_libpq" = "yes"
+ then
LIBS="$LIBS -lssl -lcrypto -lpq"
+ else
+ LIBS="$LIBS -lcrypto -lpq"
+ fi
fi
AC_LANG_SAVE
AC_LANG_C
AC_CHECK_LIB(pq, PQexec, [pgsql_cv_libpq=yes], [pgsql_cv_libpq=no])
- AC_CHECK_LIB(pq, SSL_connect, [pgsql_ssl_libpq=yes], [pgsql_ssl_libpq=np])
+ AC_CHECK_LIB(pq, SSL_connect, [pgsql_ssl_libpq=yes], [pgsql_ssl_libpq=no])
AC_CHECK_HEADER(libpq-fe.h, [pgsql_cv_libpqfe_h=yes],
[pgsql_cv_libpqfe_h=no])
AC_LANG_RESTORE
if test "$pgsql_cv_libpq" = "yes" -a "$pgsql_cv_libpqfe_h" = "yes"
---------------------------(end of broadcast)---------------------------
TIP 9: the planner will ignore your desire to choose an index scan if your
joining column's datatypes do not match
