blob: b7dd878c9db168603efed377c62a872a2fd2e8a7 [file] [log] [blame]
diff -ur misc/libxslt-1.1.34/configure misc/build/libxslt-1.1.34/configure
--- misc/libxslt-1.1.34/configure 2017-11-02 13:34:22.000000000 -0700
+++ misc/build/libxslt-1.1.34/configure 2018-08-22 23:00:50.689433000 -0700
@@ -6701,7 +6701,7 @@
cygwin*)
# func_win32_libid is a shell function defined in ltmain.sh
- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+ lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
lt_cv_file_magic_cmd='func_win32_libid'
;;
--- misc/libxslt-1.1.34/xslt-config.in 2015-05-10 07:11:30.000000000 -0700
+++ misc/build/libxslt-1.1.34/xslt-config.in 2019-11-07 22:55:48.005472511 -0800
@@ -1,10 +1,15 @@
#! /bin/sh
-prefix=@prefix@
-exec_prefix=@exec_prefix@
+#prefix=@prefix@
+#exec_prefix=@exec_prefix@
+#exec_prefix_set=no
+#includedir=@includedir@
+#libdir=@libdir@
+prefix=${SOLARVERSION}/${INPATH}
+exec_prefix=${SOLARVERSION}/${INPATH}
exec_prefix_set=no
-includedir=@includedir@
-libdir=@libdir@
+includedir=${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external
+libdir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT}
usage()
{
@@ -81,18 +86,19 @@
;;
--libs)
- if [ "$2" = "--dynamic" ]; then
- shift
- libs="@XSLT_LIBS@"
- else
- libs="@XSLT_LIBS@ @XSLT_PRIVATE_LIBS@"
- fi
-
- if [ "@XSLT_LIBDIR@" != "-L/usr/lib" -a "@XSLT_LIBDIR@" != "-L/usr/lib64" ]; then
- libs="@XSLT_LIBDIR@ $libs"
- fi
-
- libs="$libs @EXTRA_LIBS@"
+ libs="-L${libdir} ${XSLTLIB} -lm"
+# if [ "$2" = "--dynamic" ]; then
+# shift
+# libs="@XSLT_LIBS@"
+# else
+# libs="@XSLT_LIBS@ @XSLT_PRIVATE_LIBS@"
+# fi
+#
+# if [ "@XSLT_LIBDIR@" != "-L/usr/lib" -a "@XSLT_LIBDIR@" != "-L/usr/lib64" ]; then
+# libs="@XSLT_LIBDIR@ $libs"
+# fi
+#
+# libs="$libs @EXTRA_LIBS@"
;;
*)