[pgadmin-hackers] CVS Commit by dpage: Rollback Adam's last patch.

[cvs]

Log Message:
-----------
Rollback Adam's last patch.

Modified Files:
--------------
    pgadmin3:
        acinclude.m4 (r1.32 -> r1.33)


Index: acinclude.m4
===================================================================
RCS file: /projects/pgadmin3/acinclude.m4,v
retrieving revision 1.32
retrieving revision 1.33
diff -Lacinclude.m4 -Lacinclude.m4 -u -w -r1.32 -r1.33
--- acinclude.m4
+++ acinclude.m4
@@ -117,50 +117,34 @@
     else
         CPPFLAGS="$CPPFLAGS -I${LIBPQ_HOME}/include"
     fi
-
-    AC_CHECK_LIB(pq, PQexec, [pgsql_cv_libpq=yes], [pgsql_cv_libpq=no])
-    if test "$pgsql_cv_libpq" = "no"
-    then
-        LIBS="$LIBS -lssl"
-#        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])
-        if test "$pgsql_ssl_libpq" = "yes"
-        then
-            pgsql_cv_libpq=yes
             if test "$pg_static_build" = "yes"
             then
                 LIBS="${LIBPQ_HOME}/lib/libpq.a -lcrypt $LIBS -lssl -lcrypto"
             else
                 LIBS="$LIBS -lssl -lcrypto -lpq"
             fi
-
-            CPPFLAGS="$CPPFLAGS -DSSL"
-        fi
-    else
-        if test "$pg_static_build" = "yes"
-        then
-            LIBS="${LIBPQ_HOME}/lib/libpq.a -lcrypt $LIBS -lcrypto"
-        else
-            LIBS="$LIBS -lcrypto -lpq"
-        fi
-    
-    fi
-    AC_CHECK_HEADER(libpq-fe.h, [pgsql_cv_libpqfe_h=yes], [pgsql_cv_libpqfe_h=no])
-
     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
-    AC_MSG_CHECKING(pgsql in ${LIBPQ_HOME})
     if test "$pgsql_cv_libpq" = "yes" -a "$pgsql_cv_libpqfe_h" = "yes"
     then
+        AC_MSG_CHECKING(pgsql in ${LIBPQ_HOME})
         AC_MSG_RESULT(ok)
     else
+        AC_MSG_CHECKING(pgsql in ${LIBPQ_HOME})
         AC_MSG_RESULT(failed)
         LDFLAGS="$PGSQL_OLD_LDFLAGS"
         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
 ])
 
---------------------------(end of broadcast)---------------------------
TIP 6: Have you searched our list archives?

               http://archives.postgresql.org