Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit9c37aa2

Browse files
committed
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 machineswhere the linker makes a distinction (cf. Red Hat bug #444317). Probe foran actual function instead.
1 parentbc577c7 commit9c37aa2

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

‎configure

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8003,9 +8003,9 @@ fi
80038003

80048004
if test "$with_libxslt" = yes ; then
80058005

8006-
{ echo "$as_me:$LINENO: checking forxsltLibxmlVersion in -lxslt" >&5
8007-
echo $ECHO_N "checking forxsltLibxmlVersion in -lxslt... $ECHO_C" >&6; }
8008-
if test "${ac_cv_lib_xslt_xsltLibxmlVersion+set}" = set; then
8006+
{ echo "$as_me:$LINENO: checking forxsltCleanupGlobals in -lxslt" >&5
8007+
echo $ECHO_N "checking forxsltCleanupGlobals in -lxslt... $ECHO_C" >&6; }
8008+
if test "${ac_cv_lib_xslt_xsltCleanupGlobals+set}" = set; then
80098009
echo $ECHO_N "(cached) $ECHO_C" >&6
80108010
else
80118011
ac_check_lib_save_LIBS=$LIBS
@@ -8023,11 +8023,11 @@ cat >>conftest.$ac_ext <<_ACEOF
80238023
#ifdef __cplusplus
80248024
extern "C"
80258025
#endif
8026-
charxsltLibxmlVersion ();
8026+
charxsltCleanupGlobals ();
80278027
int
80288028
main ()
80298029
{
8030-
returnxsltLibxmlVersion ();
8030+
returnxsltCleanupGlobals ();
80318031
;
80328032
return 0;
80338033
}
@@ -8050,21 +8050,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
80508050
test ! -s conftest.err
80518051
} && test -s conftest$ac_exeext &&
80528052
$as_test_x conftest$ac_exeext; then
8053-
ac_cv_lib_xslt_xsltLibxmlVersion=yes
8053+
ac_cv_lib_xslt_xsltCleanupGlobals=yes
80548054
else
80558055
echo "$as_me: failed program was:" >&5
80568056
sed 's/^/| /' conftest.$ac_ext >&5
80578057

8058-
ac_cv_lib_xslt_xsltLibxmlVersion=no
8058+
ac_cv_lib_xslt_xsltCleanupGlobals=no
80598059
fi
80608060

80618061
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
80628062
conftest$ac_exeext conftest.$ac_ext
80638063
LIBS=$ac_check_lib_save_LIBS
80648064
fi
8065-
{ echo "$as_me:$LINENO: result: $ac_cv_lib_xslt_xsltLibxmlVersion" >&5
8066-
echo "${ECHO_T}$ac_cv_lib_xslt_xsltLibxmlVersion" >&6; }
8067-
if test $ac_cv_lib_xslt_xsltLibxmlVersion = yes; then
8065+
{ echo "$as_me:$LINENO: result: $ac_cv_lib_xslt_xsltCleanupGlobals" >&5
8066+
echo "${ECHO_T}$ac_cv_lib_xslt_xsltCleanupGlobals" >&6; }
8067+
if test $ac_cv_lib_xslt_xsltCleanupGlobals = yes; then
80688068
cat >>confdefs.h <<_ACEOF
80698069
#define HAVE_LIBXSLT 1
80708070
_ACEOF

‎configure.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl Process this file with autoconf to produce a configure script.
2-
dnl $PostgreSQL: pgsql/configure.in,v 1.556 2008/04/21 00:26:44 tgl Exp $
2+
dnl $PostgreSQL: pgsql/configure.in,v 1.557 2008/04/28 22:47:03 tgl Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -789,7 +789,7 @@ if test "$with_libxml" = yes ; then
789789
fi
790790

791791
if test "$with_libxslt" = yes ; then
792-
AC_CHECK_LIB(xslt,xsltLibxmlVersion, [], [AC_MSG_ERROR([library 'xslt' is required for XSLT support])])
792+
AC_CHECK_LIB(xslt,xsltCleanupGlobals, [], [AC_MSG_ERROR([library 'xslt' is required for XSLT support])])
793793
fi
794794

795795
# for contrib/uuid-ossp

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp