aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2008-04-28 22:47:11 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2008-04-28 22:47:11 +0000
commit8209e1a9871bd07d872c0c4b2519e355d04509a8 (patch)
tree9da5f114eb7fdcc497f1c265ee7135860a014ddd
parentf7288cde493adbe3341206a6b266c37f032ae2b6 (diff)
downloadpostgresql-8209e1a9871bd07d872c0c4b2519e355d04509a8.tar.gz
postgresql-8209e1a9871bd07d872c0c4b2519e355d04509a8.zip
Fix broken configure test for libxslt: it was probing for xsltLibxmlVersion,
which is a global variable not a function, and so the probe failed on machines where the linker makes a distinction (cf. Red Hat bug #444317). Probe for an actual function instead.
-rwxr-xr-xconfigure20
-rw-r--r--configure.in4
2 files changed, 12 insertions, 12 deletions
diff --git a/configure b/configure
index cf951ab1d97..02a3a500c0b 100755
--- a/configure
+++ b/configure
@@ -7923,9 +7923,9 @@ fi
if test "$with_libxslt" = yes ; then
-echo "$as_me:$LINENO: checking for xsltLibxmlVersion in -lxslt" >&5
-echo $ECHO_N "checking for xsltLibxmlVersion in -lxslt... $ECHO_C" >&6
-if test "${ac_cv_lib_xslt_xsltLibxmlVersion+set}" = set; then
+echo "$as_me:$LINENO: checking for xsltCleanupGlobals in -lxslt" >&5
+echo $ECHO_N "checking for xsltCleanupGlobals in -lxslt... $ECHO_C" >&6
+if test "${ac_cv_lib_xslt_xsltCleanupGlobals+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -7943,11 +7943,11 @@ extern "C"
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char xsltLibxmlVersion ();
+char xsltCleanupGlobals ();
int
main ()
{
-xsltLibxmlVersion ();
+xsltCleanupGlobals ();
;
return 0;
}
@@ -7974,20 +7974,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_lib_xslt_xsltLibxmlVersion=yes
+ ac_cv_lib_xslt_xsltCleanupGlobals=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_xslt_xsltLibxmlVersion=no
+ac_cv_lib_xslt_xsltCleanupGlobals=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_xslt_xsltLibxmlVersion" >&5
-echo "${ECHO_T}$ac_cv_lib_xslt_xsltLibxmlVersion" >&6
-if test $ac_cv_lib_xslt_xsltLibxmlVersion = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_xslt_xsltCleanupGlobals" >&5
+echo "${ECHO_T}$ac_cv_lib_xslt_xsltCleanupGlobals" >&6
+if test $ac_cv_lib_xslt_xsltCleanupGlobals = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBXSLT 1
_ACEOF
diff --git a/configure.in b/configure.in
index 3c97f5cd81b..f2d5b3ed078 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl $PostgreSQL: pgsql/configure.in,v 1.546.2.3 2008/03/14 03:23:22 scrappy Exp $
+dnl $PostgreSQL: pgsql/configure.in,v 1.546.2.4 2008/04/28 22:47:11 tgl Exp $
dnl
dnl Developers, please strive to achieve this order:
dnl
@@ -795,7 +795,7 @@ if test "$with_libxml" = yes ; then
fi
if test "$with_libxslt" = yes ; then
- AC_CHECK_LIB(xslt, xsltLibxmlVersion, [], [AC_MSG_ERROR([library 'xslt' is required for XSLT support])])
+ AC_CHECK_LIB(xslt, xsltCleanupGlobals, [], [AC_MSG_ERROR([library 'xslt' is required for XSLT support])])
fi
# for contrib/uuid-ossp