1*f3525e2fSDon Lewisdiff -ur misc/libxslt-1.1.34/configure misc/build/libxslt-1.1.34/configure 2*f3525e2fSDon Lewis--- misc/libxslt-1.1.34/configure 2017-11-02 13:34:22.000000000 -0700 3*f3525e2fSDon Lewis+++ misc/build/libxslt-1.1.34/configure 2018-08-22 23:00:50.689433000 -0700 4*f3525e2fSDon Lewis@@ -6701,7 +6701,7 @@ 54ca1d3aaStruckman 64ca1d3aaStruckman cygwin*) 74ca1d3aaStruckman # func_win32_libid is a shell function defined in ltmain.sh 84ca1d3aaStruckman- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 94ca1d3aaStruckman+ lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL' 104ca1d3aaStruckman lt_cv_file_magic_cmd='func_win32_libid' 11cdf0e10cSrcweir ;; 12cdf0e10cSrcweir 13*f3525e2fSDon Lewis--- misc/libxslt-1.1.34/xslt-config.in 2015-05-10 07:11:30.000000000 -0700 14*f3525e2fSDon Lewis+++ misc/build/libxslt-1.1.34/xslt-config.in 2019-11-07 22:55:48.005472511 -0800 154a0a8088Struckman@@ -1,10 +1,15 @@ 16cdf0e10cSrcweir #! /bin/sh 17cdf0e10cSrcweir 18cdf0e10cSrcweir-prefix=@prefix@ 19cdf0e10cSrcweir-exec_prefix=@exec_prefix@ 20cdf0e10cSrcweir+#prefix=@prefix@ 21cdf0e10cSrcweir+#exec_prefix=@exec_prefix@ 22cdf0e10cSrcweir+#exec_prefix_set=no 23cdf0e10cSrcweir+#includedir=@includedir@ 24cdf0e10cSrcweir+#libdir=@libdir@ 25cdf0e10cSrcweir+prefix=${SOLARVERSION}/${INPATH} 26cdf0e10cSrcweir+exec_prefix=${SOLARVERSION}/${INPATH} 27cdf0e10cSrcweir exec_prefix_set=no 28cdf0e10cSrcweir-includedir=@includedir@ 29cdf0e10cSrcweir-libdir=@libdir@ 30cdf0e10cSrcweir+includedir=${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external 31cdf0e10cSrcweir+libdir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT} 32cdf0e10cSrcweir 33cdf0e10cSrcweir usage() 34cdf0e10cSrcweir { 35*f3525e2fSDon Lewis@@ -81,18 +86,19 @@ 36*f3525e2fSDon Lewis ;; 37cdf0e10cSrcweir 38*f3525e2fSDon Lewis --libs) 39*f3525e2fSDon Lewis- if [ "$2" = "--dynamic" ]; then 40*f3525e2fSDon Lewis- shift 41*f3525e2fSDon Lewis- libs="@XSLT_LIBS@" 42*f3525e2fSDon Lewis- else 43*f3525e2fSDon Lewis- libs="@XSLT_LIBS@ @XSLT_PRIVATE_LIBS@" 44*f3525e2fSDon Lewis- fi 45*f3525e2fSDon Lewis- 46*f3525e2fSDon Lewis- if [ "@XSLT_LIBDIR@" != "-L/usr/lib" -a "@XSLT_LIBDIR@" != "-L/usr/lib64" ]; then 47*f3525e2fSDon Lewis- libs="@XSLT_LIBDIR@ $libs" 48*f3525e2fSDon Lewis- fi 49*f3525e2fSDon Lewis- 50*f3525e2fSDon Lewis- libs="$libs @EXTRA_LIBS@" 51*f3525e2fSDon Lewis+ libs="-L${libdir} ${XSLTLIB} -lm" 52*f3525e2fSDon Lewis+# if [ "$2" = "--dynamic" ]; then 53*f3525e2fSDon Lewis+# shift 54*f3525e2fSDon Lewis+# libs="@XSLT_LIBS@" 55*f3525e2fSDon Lewis+# else 56*f3525e2fSDon Lewis+# libs="@XSLT_LIBS@ @XSLT_PRIVATE_LIBS@" 57*f3525e2fSDon Lewis+# fi 58*f3525e2fSDon Lewis+# 59*f3525e2fSDon Lewis+# if [ "@XSLT_LIBDIR@" != "-L/usr/lib" -a "@XSLT_LIBDIR@" != "-L/usr/lib64" ]; then 60*f3525e2fSDon Lewis+# libs="@XSLT_LIBDIR@ $libs" 61*f3525e2fSDon Lewis+# fi 62*f3525e2fSDon Lewis+# 63*f3525e2fSDon Lewis+# libs="$libs @EXTRA_LIBS@" 64*f3525e2fSDon Lewis ;; 65*f3525e2fSDon Lewis 66*f3525e2fSDon Lewis *) 67