Index: configure
diff -Nau configure.orig configure
--- configure.orig	2005-03-19 14:31:37.000000000 +0100
+++ configure	2005-03-22 14:17:46.925800594 +0100
@@ -21272,67 +21272,6 @@
    { (exit 1); exit 1; }; }
 fi
 
-
-
-# TODO: Adapt automatically somehow...
-echo "$as_me:$LINENO: checking that type of libpq's Oid is as expected" >&5
-echo $ECHO_N "checking that type of libpq's Oid is as expected... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include<${with_postgres_include}/libpq-fe.h>
-	#include<pqxx/libpq-forward.hxx>
-int
-main ()
-{
-typedef pqxx::oid Oid
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  { { echo "$as_me:$LINENO: error:
-The Oid typedef in libpq has changed.  Please notify the libpqxx authors of the
-change!
-" >&5
-echo "$as_me: error:
-The Oid typedef in libpq has changed.  Please notify the libpqxx authors of the
-change!
-" >&2;}
-   { (exit 1); exit 1; }; }
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-
 # Check presence and version of strerror_r()
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -21337,6 +21337,7 @@
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_compile_hardcore='$CXX -pedantic-errors -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
@@ -21415,18 +21416,16 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <string.h>
-	extern int strerror_r(int errnum, char *buf, size_t n);
 int
 main ()
 {
-
-  ;
+  int dico = strerror_r((int)0, (char *)0, (size_t)0);
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile_hardcore\"") >&5
+  (eval $ac_compile_hardcore) 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -21465,18 +21464,16 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <string.h>
-	extern char *strerror_r(int errnum, char *buf, size_t n);
 int
 main ()
 {
-
-  ;
+  char *dico = strerror_r((int)0, (char *)0, (size_t)0);
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile_hardcore\"") >&5
+  (eval $ac_compile_hardcore) 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -21516,18 +21513,16 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <string.h>
-	extern int strerror_r(int errnum, char *buf, int n);
 int
 main ()
 {
-
-  ;
+  int strerror_r((int)0, (char *)0, (int)0);
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile_hardcore\"") >&5
+  (eval $ac_compile_hardcore) 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1