mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki 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:03 +00:00
parent bc577c7fad
commit 9c37aa291f
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
configure vendored
View File

@ -8003,9 +8003,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
@ -8023,11 +8023,11 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"
#endif #endif
char xsltLibxmlVersion (); char xsltCleanupGlobals ();
int int
main () main ()
{ {
return xsltLibxmlVersion (); return xsltCleanupGlobals ();
; ;
return 0; return 0;
} }
@ -8050,21 +8050,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
test ! -s conftest.err test ! -s conftest.err
} && test -s conftest$ac_exeext && } && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then $as_test_x conftest$ac_exeext; 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 core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
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.556 2008/04/21 00:26:44 tgl Exp $ dnl $PostgreSQL: pgsql/configure.in,v 1.557 2008/04/28 22:47:03 tgl Exp $
dnl dnl
dnl Developers, please strive to achieve this order: dnl Developers, please strive to achieve this order:
dnl dnl
@ -789,7 +789,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