try again again

Author: phadej

postgresql-libpq-configure/configure

@@ -1520,53 +1520,6 @@ printf "%s\n" "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
-
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 test -x conftest$ac_exeext
-       }
-then :
-  ac_retval=0
-else $as_nop
-  printf "%s\n" "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_link
 ac_configure_args_raw=
 for ac_arg
 do
@@ -3911,14 +3864,10 @@ if test ${ac_cv_POSTGRESQL_LIBS+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_POSTGRESQL_LIBS="`"$PG_CONFIG" --libs`" || _AX_LIB_POSTGRESQL_OLD_fail=yes
+  ac_cv_POSTGRESQL_LIBS="-lpq"
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_POSTGRESQL_LIBS" >&5
 printf "%s\n" "$ac_cv_POSTGRESQL_LIBS" >&6; }
-	  if test "X$_AX_LIB_POSTGRESQL_OLD_fail" = "Xyes"
-then :
-  break
-fi
 	  POSTGRESQL_LIBS="$ac_cv_POSTGRESQL_LIBS"
 
 	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the PostgreSQL version" >&5
@@ -4021,46 +3970,7 @@ fi
 then :
   break
 fi
-	    	    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the PostgreSQL library linking is working" >&5
-printf %s "checking for the PostgreSQL library linking is working... " >&6; }
-if test ${ac_cv_postgresql_found+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-
-	      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-
-		   #include <libpq-fe.h>
-
-int
-main (void)
-{
-
-		    char conninfo[]="dbname = postgres";
-		    PGconn     *conn;
-		    conn = PQconnectdb(conninfo);
-
-
-  ;
-  return 0;
-}
-
-_ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-  ac_cv_postgresql_found=yes
-else $as_nop
-  ac_cv_postgresql_found=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
-
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_postgresql_found" >&5
-printf "%s\n" "$ac_cv_postgresql_found" >&6; }
-	    found_postgresql="$ac_cv_postgresql_found"
+	    	    found_postgresql="$ac_cv_postgresql_found"
 	    if test "X$found_postgresql" = "Xno"
 then :
   break

postgresql-libpq-configure/m4/ax_lib_postgresql.m4

@@ -75,8 +75,7 @@ AC_DEFUN([_AX_LIB_POSTGRESQL_OLD],[
 	  POSTGRESQL_LDFLAGS="$ac_cv_POSTGRESQL_LDFLAGS"
 
 	  AC_CACHE_CHECK([for the PostgreSQL libraries LIBS],[ac_cv_POSTGRESQL_LIBS],
-		       [ac_cv_POSTGRESQL_LIBS="`"$PG_CONFIG" --libs`" || _AX_LIB_POSTGRESQL_OLD_fail=yes])
-	  AS_IF([test "X$_AX_LIB_POSTGRESQL_OLD_fail" = "Xyes"],[break])
+		       [ac_cv_POSTGRESQL_LIBS="-lpq"])
 	  POSTGRESQL_LIBS="$ac_cv_POSTGRESQL_LIBS"
 
 	  AC_CACHE_CHECK([for the PostgreSQL version],[ac_cv_POSTGRESQL_VERSION],
@@ -207,22 +206,22 @@ AC_DEFUN([AX_LIB_POSTGRESQL],
 	    AC_CHECK_HEADER([libpq-fe.h],[],[found_postgresql=no])
 	    AS_IF([test "X$found_postgresql" = "Xno"],[break])
 	    dnl try now to link
-	    AC_CACHE_CHECK([for the PostgreSQL library linking is working],[ac_cv_postgresql_found],
-	    [
-	      AC_LINK_IFELSE([
-		AC_LANG_PROGRAM(
-		  [
-		   #include <libpq-fe.h>
-		  ],
-		  [[
-		    char conninfo[]="dbname = postgres";
-		    PGconn     *conn;
-		    conn = PQconnectdb(conninfo);
-		  ]]
-		 )
-		],[ac_cv_postgresql_found=yes],
-		  [ac_cv_postgresql_found=no])
-	     ])
+dnl	    AC_CACHE_CHECK([for the PostgreSQL library linking is working],[ac_cv_postgresql_found],
+dnl	    [
+dnl	      AC_LINK_IFELSE([
+dnl		AC_LANG_PROGRAM(
+dnl		  [
+dnl		   #include <libpq-fe.h>
+dnl		  ],
+dnl		  [[
+dnl		    char conninfo[]="dbname = postgres";
+dnl		    PGconn     *conn;
+dnl		    conn = PQconnectdb(conninfo);
+dnl		  ]]
+dnl		 )
+dnl		],[ac_cv_postgresql_found=yes],
+dnl		  [ac_cv_postgresql_found=no])
+dnl	     ])
 	    found_postgresql="$ac_cv_postgresql_found"
 	    AS_IF([test "X$found_postgresql" = "Xno"],[break])
 	    break