Re: SSL detection bug is back under debian...

Raphaël Enrici wrote:

> Dear Adam,
>
> Jean-Michel reported to me this morning that the SSL menu was empty
> under debian builds.
> I had a quick look to the build process and it seems that we still
> have "-I -DSSL" while in the make all-recursive.

The attached patch should solve this pesky SSL bug once and for all.
Let me know if you have any problems with it.

ahp
--- pgadmin3/acinclude.m4    2003-10-09 16:40:21.000000000 -0400
+++ pgadmin3.new/acinclude.m4    2003-10-16 08:23:32.000000000 -0400
@@ -93,8 +93,6 @@
     fi
 ])

-CPPFLAGS="$CPPFLAGS -DSSL"
-
 #
 # Check for libpq libraries and headers
 #
@@ -118,6 +116,7 @@
     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_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"
@@ -131,6 +130,11 @@
         CPPFLAGS="$PGSQL_OLD_CPPFLAGS"
         AC_MSG_ERROR([you must specify a valid pgsql installation with --with-pgsql=DIR])
     fi
+
+    if test "$pgsql_ssl_libpq" = "yes"
+    then
+        CPPFLAGS="$CPPFLAGS -DSSL"
+    fi
 fi
 ])