Skip site navigation (1) Skip section navigation (2)

SSL Build problem

From: "Dave Page" <dpage(at)vale-housing(dot)co(dot)uk>
To: <pgadmin-hackers(at)postgresql(dot)org>
Cc: "Adam H(dot)Pendleton" <fmonkey(at)fmonkey(dot)net>
Subject: SSL Build problem
Date: 2005-02-23 14:58:07
Message-ID: E7F85A1B5FF8D44C8A1AF6885BC9A0E472B6BE@ratbert.vale-housing.co.uk (view raw or flat)
Thread:
Lists: pgadmin-hackers
Hi Adam,

I applied the patch below to fix the SSL build problem introduced by
your last patch. Afaict it all works fine now, however I am not entirely
happy playing with autoconf, so I'd appreciate if you could just confirm
that I haven't done anything stupid.

Cheers, Dave.


Index: acinclude.m4
===================================================================
RCS file: /projects/pgadmin3/acinclude.m4,v
retrieving revision 1.40
diff -c -r1.40 acinclude.m4
*** acinclude.m4        7 Feb 2005 12:13:46 -0000       1.40
--- acinclude.m4        23 Feb 2005 14:54:59 -0000
***************
*** 111,122 ****
--- 111,130 ----
      PGSQL_OLD_LDFLAGS="$LDFLAGS"
      PGSQL_OLD_CPPFLAGS="$CPPFLAGS"
      LDFLAGS="$LDFLAGS -L${LIBPQ_HOME}/lib"
+
+     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=no])
+     AC_LANG_RESTORE
+
      if test "$pgsql_include" != ""
      then
          CPPFLAGS="$CPPFLAGS -I${pgsql_include}"
      else
          CPPFLAGS="$CPPFLAGS -I${LIBPQ_HOME}/include"
      fi
+
      if test "$pg_static_build" = "yes"
      then
          if test "$pgsql_ssl_libpq" = "yes"
***************
*** 133,144 ****
              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=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"
      then
          AC_MSG_CHECKING(pgsql in ${LIBPQ_HOME})
--- 141,152 ----
              LIBS="$LIBS -lcrypto -lpq"
          fi
      fi
+
      AC_LANG_SAVE
      AC_LANG_C
      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"
      then
          AC_MSG_CHECKING(pgsql in ${LIBPQ_HOME})

pgadmin-hackers by date

Next:From: cvsDate: 2005-02-23 15:32:53
Subject: CVS Commit by dpage: Add $(top_srcdir) and $(srcdir) to makefiles,
Previous:From: cvsDate: 2005-02-23 14:55:44
Subject: CVS Commit by dpage: Properly detect SSL

Privacy Policy | About PostgreSQL
Copyright © 1996-2014 The PostgreSQL Global Development Group