Changeset 1034

Timestamp:

03/06/06 17:52:00 (4 years ago)

Author:

jtv

Message:

Hopefully fixes MinGW link problems

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• NEWS (modified) (1 diff)
• README (modified) (2 diffs)
• configure.ac.in (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2006-02-07  Jeroen T. Vermeulen <jtv@xs4all.nl>
+ configure.ac.in:
+  - Replaced AC_TRY_LINK loop for socket library with AC_SEARCH_LIBS
+  - Should fix MinGW socket problems, thanks Bart "doesn't ring a bell" Samwel
 2006-02-06  Jeroen T. Vermeulen <jtv@xs4all.nl>
  include/pqxx/connection_base.hxx:

trunk/NEWS

@@ -1 +1 @@
 2.6.5
  - Visual C++ users: copy win32/common-sample to win32/common before editing it
+ - Should fix problems finding socket library on MinGW
  - Even more work on Visual C++ problems
  - Updated documentation for Visual C++ users

trunk/README

@@ -9 +9 @@
 
 Further information, as well as updates, a mailing list, and a bug reporting
-system can be found at:
-
+system can be found at any of these URLs (they should all bring you to the same
+site):
+
+        http://pqxx.org/
+        http://pqxx.tk/
         http://thaiopensource.org/development/libpqxx/
 
@@ -218 +221 @@
 with e.g. Visual C++ as your compiler.
 
-Before trying to compile with Visual C++, you'll at least need to edit the file
-win32/common to reflect the proper paths to your PostgreSQL headers and the
-libpq library.  See the win32 subdirectory for more documentation.
+Before trying to compile with Visual C++, you'll at least need to copy the file
+win32/common-sample to win32/common, and edit the latter to reflect the proper
+paths to your PostgreSQL headers and the libpq library.  See the win32
+subdirectory for more documentation.
 
 

trunk/configure.ac.in

@@ -504 +504 @@
 
 # After this check, we should be able to link socket-based programs.
-AC_MSG_CHECKING([for separate socket library])
-socklibopt=""
-socklibok="no"
-LDFLAGS_SAVE="$LDFLAGS"
-for linkopt in "" "-lws2_32" "-lwsock32" "-lws2_32 -lwsock32" "-lwinsock" "-lsocket" "-lsocket -lnsl" ; do
-        LDFLAGS="$LDFLAGS_SAVE $linkopt"
-        AC_LINK_IFELSE(
-        [#include <cstring>
-        #ifdef PQXX_HAVE_SYS_SELECT_H
-        #include <sys/select.h>
-        #else
-        #include <ctime>
-        #include <sys/types.h>
-        #endif
-        #ifdef HAVE_UNISTD_H
-        #include <unistd.h>
-        #endif
-        #ifdef _WIN32
-        #include <winsock2.h>
-        #endif
-        ${usestd}
-        int main(){return select(0,0,0,0,0);}],
-        [socklibopt="$linkopt"; socklibok="yes"; break])
-done
-if test "$socklibok" != "yes" ; then
-        AC_MSG_RESULT([failed])
+socklibok=no
+AC_SEARCH_LIBS(select, ws2_32 wsock32 winsock socket nsl, [socklibok=yes])
+
+if test "${socklibok}" != "yes" ; then
         AC_MSG_ERROR([
 Could not figure out how to link a simple sockets-based program.  Please read
-the config.log file for more clues as to why this failed.])
-fi
-if test -z "$socklibopt" ; then
-        AC_MSG_RESULT([none])
-else
-        AC_MSG_RESULT($socklibopt)
-fi
-
+the config.log file for more clues as to why this failed.
+])
+fi
 
 AC_MSG_CHECKING([if select() accepts NULL fdsets])