database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-10 09:21:54 +03:00
Code Activity

Fix broken configure test for libxslt: it was probing for xsltLibxmlVersion,

Browse Source 
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.
This commit is contained in:
Tom Lane
2008-04-28 22:47:11 +00:00
parent f7288cde49
commit 8209e1a987
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
configure vendored
View File

@ -7923,9 +7923,9 @@ fi
if test "$with_libxslt" = yes ; then if test "$with_libxslt" = yes ; then
echo "$as_me:$LINENO: checking for xsltLibxmlVersion in -lxslt" >&5 echo "$as_me:$LINENO: checking for xsltCleanupGlobals in -lxslt" >&5
echo $ECHO_N "checking for xsltLibxmlVersion in -lxslt... $ECHO_C" >&6 echo $ECHO_N "checking for xsltCleanupGlobals in -lxslt... $ECHO_C" >&6
if test "${ac_cv_lib_xslt_xsltLibxmlVersion+set}" = set; then if test "${ac_cv_lib_xslt_xsltCleanupGlobals+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
ac_check_lib_save_LIBS=$LIBS ac_check_lib_save_LIBS=$LIBS
@ -7943,11 +7943,11 @@ extern "C"
#endif #endif
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */ builtin and then its argument prototype would still apply. */
char xsltLibxmlVersion (); char xsltCleanupGlobals ();
int int
main () main ()
{ {
xsltLibxmlVersion (); xsltCleanupGlobals ();
; ;
return 0; return 0;
} }
@ -7974,20 +7974,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
ac_status=$? ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then (exit $ac_status); }; }; then
ac_cv_lib_xslt_xsltLibxmlVersion=yes ac_cv_lib_xslt_xsltCleanupGlobals=yes
else else
echo "$as_me: failed program was:" >&5 echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5 sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_xslt_xsltLibxmlVersion=no ac_cv_lib_xslt_xsltCleanupGlobals=no
fi fi
rm -f conftest.err conftest.$ac_objext \ rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS LIBS=$ac_check_lib_save_LIBS
fi fi
echo "$as_me:$LINENO: result: $ac_cv_lib_xslt_xsltLibxmlVersion" >&5 echo "$as_me:$LINENO: result: $ac_cv_lib_xslt_xsltCleanupGlobals" >&5
echo "${ECHO_T}$ac_cv_lib_xslt_xsltLibxmlVersion" >&6 echo "${ECHO_T}$ac_cv_lib_xslt_xsltCleanupGlobals" >&6
if test $ac_cv_lib_xslt_xsltLibxmlVersion = yes; then if test $ac_cv_lib_xslt_xsltCleanupGlobals = yes; then
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define HAVE_LIBXSLT 1 #define HAVE_LIBXSLT 1
_ACEOF _ACEOF

4
configure.in
View File

@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script. 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
dnl Developers, please strive to achieve this order: dnl Developers, please strive to achieve this order:
dnl dnl
@ -795,7 +795,7 @@ if test "$with_libxml" = yes ; then
fi fi
if test "$with_libxslt" = yes ; then 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 fi
# for contrib/uuid-ossp # for contrib/uuid-ossp