Kaydet (Commit) ae05c626 authored tarafından Michael Stahl's avatar Michael Stahl

solaris10u8: #i112480#: fix libxmlsec configure:

 xmlsec1-configure-libxml-libxslt.patch: do not prepend /bin to $PATH.
üst 8027e13d
......@@ -48,6 +48,7 @@ TARFILE_NAME=$(PRJNAME)-$(XMLSEC1VERSION)
TARFILE_MD5=1f24ab1d39f4a51faf22244c94a6203f
#xmlsec1-configure.patch: Set up the build. Straightforward configuration
#xmlsec1-configure-libxml-libxslt.patch: empty "$with_libxml" prepends /bin :-(
#xmlsec1-olderlibxml2.patch: Allow build against older libxml2, for macosx
#xmlsec1-nssdisablecallbacks.patch: Disable use of smime3 so don't need to package it
#xmlsec1-customkeymanage.patch: Could we do this alternatively outside xmlsec
......@@ -57,6 +58,7 @@ TARFILE_MD5=1f24ab1d39f4a51faf22244c94a6203f
#xmlsec1-mingw-customkeymanage-addmscrypto.patch builds the custom keymanager on mingw
PATCH_FILES=\
xmlsec1-configure.patch \
xmlsec1-configure-libxml-libxslt.patch \
xmlsec1-olderlibxml2.patch \
xmlsec1-nssdisablecallbacks.patch \
xmlsec1-customkeymanage.patch \
......
--- misc/xmlsec1-1.2.14/configure Wed Jun 30 11:55:36 2010
+++ misc/build/xmlsec1-1.2.14/configure Wed Jun 30 11:57:28 2010
@@ -12077,7 +12077,7 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="$with_libxml/bin:$PATH"
+as_dummy="$with_libxml${with_libxml:+/bin:}$PATH"
for as_dir in $as_dummy
do
IFS=$as_save_IFS
@@ -12258,7 +12258,7 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="$with_libxslt/bin:$PATH"
+as_dummy="$with_libxslt${with_libxslt:+/bin:}$PATH"
for as_dir in $as_dummy
do
IFS=$as_save_IFS
--- misc/xmlsec1-1.2.14/configure.in Wed Jun 30 11:55:37 2010
+++ misc/build/xmlsec1-1.2.14/configure.in Wed Jun 30 11:53:55 2010
@@ -231,7 +231,7 @@
if test "z$LIBXML_FOUND" = "zno" ; then
if test "z$with_libxml" != "zyes" ; then
AC_PATH_PROG([LIBXML_CONFIG], [$LIBXML_CONFIG], [],
- [$with_libxml/bin:$PATH])
+ [$with_libxml${with_libxml:+/bin:}$PATH])
fi
AC_MSG_CHECKING([libxml2 $LIBXML_CONFIG ])
if ! LIBXML_VERSION=`$LIBXML_CONFIG --version 2>/dev/null`; then
@@ -296,7 +296,7 @@
if test "z$LIBXSLT_FOUND" = "zno" ; then
if test "z$with_libxslt" != "zyes" ; then
AC_PATH_PROG([LIBXSLT_CONFIG], [$LIBXSLT_CONFIG], [],
- [$with_libxslt/bin:$PATH])
+ [$with_libxslt${with_libxslt:+/bin:}:$PATH])
fi
AC_MSG_CHECKING(for libxslt libraries >= $LIBXSLT_MIN_VERSION)
if ! LIBXSLT_VERSION=`$LIBXSLT_CONFIG --version 2>/dev/null`; then
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment