1*cdf0e10cSrcweir--- misc/xmlsec1-1.2.14/Makefile.in 2009-06-25 22:53:34.000000000 +0200 2*cdf0e10cSrcweir+++ misc/build/xmlsec1-1.2.14/Makefile.in 2009-10-01 10:32:48.708515261 +0200 3*cdf0e10cSrcweir@@ -341,8 +341,9 @@ 4*cdf0e10cSrcweir top_srcdir = @top_srcdir@ 5*cdf0e10cSrcweir NULL = 6*cdf0e10cSrcweir SAFE_VERSION = @XMLSEC_VERSION_SAFE@ 7*cdf0e10cSrcweir-SUBDIRS = include src apps man docs 8*cdf0e10cSrcweir-TEST_APP = apps/xmlsec1$(EXEEXT) 9*cdf0e10cSrcweir+#Do not build xmlsec1 app. It is not needed. Also the libtool includes 10*cdf0e10cSrcweir+#a -L/path_to_lib_dir which may contain an incompatible lixbml2. 11*cdf0e10cSrcweir+SUBDIRS = include src man docs 12*cdf0e10cSrcweir DEFAULT_CRYPTO = @XMLSEC_CRYPTO@ 13*cdf0e10cSrcweir bin_SCRIPTS = xmlsec1-config 14*cdf0e10cSrcweir pkgconfig_DATA = xmlsec1.pc @XMLSEC_CRYPTO_PC_FILES_LIST@ 15*cdf0e10cSrcweir--- misc/xmlsec1-1.2.14/configure 2009-06-25 22:53:35.000000000 +0200 16*cdf0e10cSrcweir+++ misc/build/xmlsec1-1.2.14/configure 2009-10-01 10:28:50.980389049 +0200 17*cdf0e10cSrcweir@@ -1,12 +1,14 @@ 18*cdf0e10cSrcweir #! /bin/sh 19*cdf0e10cSrcweir # Guess values for system-dependent variables and create Makefiles. 20*cdf0e10cSrcweir-# Generated by GNU Autoconf 2.64 for xmlsec1 1.2.14. 21*cdf0e10cSrcweir+# Generated by GNU Autoconf 2.65 for xmlsec1 1.2.14. 22*cdf0e10cSrcweir # 23*cdf0e10cSrcweir # Report bugs to <http://www.aleksey.com/xmlsec>. 24*cdf0e10cSrcweir # 25*cdf0e10cSrcweir+# 26*cdf0e10cSrcweir # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 27*cdf0e10cSrcweir-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software 28*cdf0e10cSrcweir-# Foundation, Inc. 29*cdf0e10cSrcweir+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, 30*cdf0e10cSrcweir+# Inc. 31*cdf0e10cSrcweir+# 32*cdf0e10cSrcweir # 33*cdf0e10cSrcweir # This configure script is free software; the Free Software Foundation 34*cdf0e10cSrcweir # gives unlimited permission to copy, distribute and modify it. 35*cdf0e10cSrcweir@@ -676,7 +678,8 @@ 36*cdf0e10cSrcweir 37*cdf0e10cSrcweir 38*cdf0e10cSrcweir 39*cdf0e10cSrcweir-exec 7<&0 </dev/null 6>&1 40*cdf0e10cSrcweir+test -n "$DJDIR" || exec 7<&0 </dev/null 41*cdf0e10cSrcweir+exec 6>&1 42*cdf0e10cSrcweir 43*cdf0e10cSrcweir # Name of the host. 44*cdf0e10cSrcweir # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, 45*cdf0e10cSrcweir@@ -1749,7 +1752,7 @@ 46*cdf0e10cSrcweir LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a 47*cdf0e10cSrcweir nonstandard directory <lib dir> 48*cdf0e10cSrcweir LIBS libraries to pass to the linker, e.g. -l<library> 49*cdf0e10cSrcweir- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if 50*cdf0e10cSrcweir+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if 51*cdf0e10cSrcweir you have headers in a nonstandard directory <include dir> 52*cdf0e10cSrcweir CPP C preprocessor 53*cdf0e10cSrcweir PKG_CONFIG path to pkg-config utility 54*cdf0e10cSrcweir@@ -1837,7 +1840,7 @@ 55*cdf0e10cSrcweir if $ac_init_version; then 56*cdf0e10cSrcweir cat <<\_ACEOF 57*cdf0e10cSrcweir xmlsec1 configure 1.2.14 58*cdf0e10cSrcweir-generated by GNU Autoconf 2.64 59*cdf0e10cSrcweir+generated by GNU Autoconf 2.65 60*cdf0e10cSrcweir 61*cdf0e10cSrcweir Copyright (C) 2009 Free Software Foundation, Inc. 62*cdf0e10cSrcweir This configure script is free software; the Free Software Foundation 63*cdf0e10cSrcweir@@ -1884,7 +1887,7 @@ 64*cdf0e10cSrcweir ac_retval=1 65*cdf0e10cSrcweir fi 66*cdf0e10cSrcweir eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 67*cdf0e10cSrcweir- return $ac_retval 68*cdf0e10cSrcweir+ as_fn_set_status $ac_retval 69*cdf0e10cSrcweir 70*cdf0e10cSrcweir } # ac_fn_c_try_compile 71*cdf0e10cSrcweir 72*cdf0e10cSrcweir@@ -1921,7 +1924,7 @@ 73*cdf0e10cSrcweir ac_retval=1 74*cdf0e10cSrcweir fi 75*cdf0e10cSrcweir eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 76*cdf0e10cSrcweir- return $ac_retval 77*cdf0e10cSrcweir+ as_fn_set_status $ac_retval 78*cdf0e10cSrcweir 79*cdf0e10cSrcweir } # ac_fn_c_try_cpp 80*cdf0e10cSrcweir 81*cdf0e10cSrcweir@@ -1963,7 +1966,7 @@ 82*cdf0e10cSrcweir fi 83*cdf0e10cSrcweir rm -rf conftest.dSYM conftest_ipa8_conftest.oo 84*cdf0e10cSrcweir eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 85*cdf0e10cSrcweir- return $ac_retval 86*cdf0e10cSrcweir+ as_fn_set_status $ac_retval 87*cdf0e10cSrcweir 88*cdf0e10cSrcweir } # ac_fn_c_try_run 89*cdf0e10cSrcweir 90*cdf0e10cSrcweir@@ -2009,7 +2012,7 @@ 91*cdf0e10cSrcweir # left behind by Apple's compiler. We do this before executing the actions. 92*cdf0e10cSrcweir rm -rf conftest.dSYM conftest_ipa8_conftest.oo 93*cdf0e10cSrcweir eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 94*cdf0e10cSrcweir- return $ac_retval 95*cdf0e10cSrcweir+ as_fn_set_status $ac_retval 96*cdf0e10cSrcweir 97*cdf0e10cSrcweir } # ac_fn_c_try_link 98*cdf0e10cSrcweir 99*cdf0e10cSrcweir@@ -2378,7 +2381,7 @@ 100*cdf0e10cSrcweir 101*cdf0e10cSrcweir fi 102*cdf0e10cSrcweir eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 103*cdf0e10cSrcweir- return $ac_retval 104*cdf0e10cSrcweir+ as_fn_set_status $ac_retval 105*cdf0e10cSrcweir 106*cdf0e10cSrcweir } # ac_fn_c_compute_int 107*cdf0e10cSrcweir cat >config.log <<_ACEOF 108*cdf0e10cSrcweir@@ -2386,7 +2389,7 @@ 109*cdf0e10cSrcweir running configure, to aid debugging if configure makes a mistake. 110*cdf0e10cSrcweir 111*cdf0e10cSrcweir It was created by xmlsec1 $as_me 1.2.14, which was 112*cdf0e10cSrcweir-generated by GNU Autoconf 2.64. Invocation command line was 113*cdf0e10cSrcweir+generated by GNU Autoconf 2.65. Invocation command line was 114*cdf0e10cSrcweir 115*cdf0e10cSrcweir $ $0 $@ 116*cdf0e10cSrcweir 117*cdf0e10cSrcweir@@ -2639,7 +2642,7 @@ 118*cdf0e10cSrcweir for ac_site_file in "$ac_site_file1" "$ac_site_file2" 119*cdf0e10cSrcweir do 120*cdf0e10cSrcweir test "x$ac_site_file" = xNONE && continue 121*cdf0e10cSrcweir- if test -r "$ac_site_file"; then 122*cdf0e10cSrcweir+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then 123*cdf0e10cSrcweir { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 124*cdf0e10cSrcweir $as_echo "$as_me: loading site script $ac_site_file" >&6;} 125*cdf0e10cSrcweir sed 's/^/| /' "$ac_site_file" >&5 126*cdf0e10cSrcweir@@ -2648,9 +2651,9 @@ 127*cdf0e10cSrcweir done 128*cdf0e10cSrcweir 129*cdf0e10cSrcweir if test -r "$cache_file"; then 130*cdf0e10cSrcweir- # Some versions of bash will fail to source /dev/null (special 131*cdf0e10cSrcweir- # files actually), so we avoid doing that. 132*cdf0e10cSrcweir- if test -f "$cache_file"; then 133*cdf0e10cSrcweir+ # Some versions of bash will fail to source /dev/null (special files 134*cdf0e10cSrcweir+ # actually), so we avoid doing that. DJGPP emulates it as a regular file. 135*cdf0e10cSrcweir+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then 136*cdf0e10cSrcweir { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 137*cdf0e10cSrcweir $as_echo "$as_me: loading cache $cache_file" >&6;} 138*cdf0e10cSrcweir case $cache_file in 139*cdf0e10cSrcweir@@ -3160,6 +3163,7 @@ 140*cdf0e10cSrcweir 141*cdf0e10cSrcweir fi 142*cdf0e10cSrcweir 143*cdf0e10cSrcweir+ test -d ./--version && rmdir ./--version 144*cdf0e10cSrcweir if test "${ac_cv_path_mkdir+set}" = set; then 145*cdf0e10cSrcweir MKDIR_P="$ac_cv_path_mkdir -p" 146*cdf0e10cSrcweir else 147*cdf0e10cSrcweir@@ -3167,7 +3171,6 @@ 148*cdf0e10cSrcweir # value for MKDIR_P within a source directory, because that will 149*cdf0e10cSrcweir # break other packages using the cache if that directory is 150*cdf0e10cSrcweir # removed, or if the value is a relative name. 151*cdf0e10cSrcweir- test -d ./--version && rmdir ./--version 152*cdf0e10cSrcweir MKDIR_P="$ac_install_sh -d" 153*cdf0e10cSrcweir fi 154*cdf0e10cSrcweir fi 155*cdf0e10cSrcweir@@ -3753,32 +3756,30 @@ 156*cdf0e10cSrcweir ... rest of stderr output deleted ... 157*cdf0e10cSrcweir 10q' conftest.err >conftest.er1 158*cdf0e10cSrcweir cat conftest.er1 >&5 159*cdf0e10cSrcweir- rm -f conftest.er1 conftest.err 160*cdf0e10cSrcweir fi 161*cdf0e10cSrcweir+ rm -f conftest.er1 conftest.err 162*cdf0e10cSrcweir $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 163*cdf0e10cSrcweir test $ac_status = 0; } 164*cdf0e10cSrcweir done 165*cdf0e10cSrcweir 166*cdf0e10cSrcweir cat confdefs.h - <<_ACEOF >conftest.$ac_ext 167*cdf0e10cSrcweir /* end confdefs.h. */ 168*cdf0e10cSrcweir-#include <stdio.h> 169*cdf0e10cSrcweir+ 170*cdf0e10cSrcweir int 171*cdf0e10cSrcweir main () 172*cdf0e10cSrcweir { 173*cdf0e10cSrcweir-FILE *f = fopen ("conftest.out", "w"); 174*cdf0e10cSrcweir- return ferror (f) || fclose (f) != 0; 175*cdf0e10cSrcweir 176*cdf0e10cSrcweir ; 177*cdf0e10cSrcweir return 0; 178*cdf0e10cSrcweir } 179*cdf0e10cSrcweir _ACEOF 180*cdf0e10cSrcweir ac_clean_files_save=$ac_clean_files 181*cdf0e10cSrcweir-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out" 182*cdf0e10cSrcweir+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" 183*cdf0e10cSrcweir # Try to create an executable without -o first, disregard a.out. 184*cdf0e10cSrcweir # It will help us diagnose broken compilers, and finding out an intuition 185*cdf0e10cSrcweir # of exeext. 186*cdf0e10cSrcweir-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 187*cdf0e10cSrcweir-$as_echo_n "checking for C compiler default output file name... " >&6; } 188*cdf0e10cSrcweir+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 189*cdf0e10cSrcweir+$as_echo_n "checking whether the C compiler works... " >&6; } 190*cdf0e10cSrcweir ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` 191*cdf0e10cSrcweir 192*cdf0e10cSrcweir # The possible output files: 193*cdf0e10cSrcweir@@ -3840,10 +3841,10 @@ 194*cdf0e10cSrcweir else 195*cdf0e10cSrcweir ac_file='' 196*cdf0e10cSrcweir fi 197*cdf0e10cSrcweir-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 198*cdf0e10cSrcweir-$as_echo "$ac_file" >&6; } 199*cdf0e10cSrcweir if test -z "$ac_file"; then : 200*cdf0e10cSrcweir- $as_echo "$as_me: failed program was:" >&5 201*cdf0e10cSrcweir+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 202*cdf0e10cSrcweir+$as_echo "no" >&6; } 203*cdf0e10cSrcweir+$as_echo "$as_me: failed program was:" >&5 204*cdf0e10cSrcweir sed 's/^/| /' conftest.$ac_ext >&5 205*cdf0e10cSrcweir 206*cdf0e10cSrcweir { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 207*cdf0e10cSrcweir@@ -3851,51 +3852,18 @@ 208*cdf0e10cSrcweir { as_fn_set_status 77 209*cdf0e10cSrcweir as_fn_error "C compiler cannot create executables 210*cdf0e10cSrcweir See \`config.log' for more details." "$LINENO" 5; }; } 211*cdf0e10cSrcweir+else 212*cdf0e10cSrcweir+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 213*cdf0e10cSrcweir+$as_echo "yes" >&6; } 214*cdf0e10cSrcweir fi 215*cdf0e10cSrcweir+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 216*cdf0e10cSrcweir+$as_echo_n "checking for C compiler default output file name... " >&6; } 217*cdf0e10cSrcweir+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 218*cdf0e10cSrcweir+$as_echo "$ac_file" >&6; } 219*cdf0e10cSrcweir ac_exeext=$ac_cv_exeext 220*cdf0e10cSrcweir 221*cdf0e10cSrcweir-# Check that the compiler produces executables we can run. If not, either 222*cdf0e10cSrcweir-# the compiler is broken, or we cross compile. 223*cdf0e10cSrcweir-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 224*cdf0e10cSrcweir-$as_echo_n "checking whether the C compiler works... " >&6; } 225*cdf0e10cSrcweir-# If not cross compiling, check that we can run a simple program. 226*cdf0e10cSrcweir-if test "$cross_compiling" != yes; then 227*cdf0e10cSrcweir- if { ac_try='./$ac_file' 228*cdf0e10cSrcweir- { { case "(($ac_try" in 229*cdf0e10cSrcweir- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 230*cdf0e10cSrcweir- *) ac_try_echo=$ac_try;; 231*cdf0e10cSrcweir-esac 232*cdf0e10cSrcweir-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" 233*cdf0e10cSrcweir-$as_echo "$ac_try_echo"; } >&5 234*cdf0e10cSrcweir- (eval "$ac_try") 2>&5 235*cdf0e10cSrcweir- ac_status=$? 236*cdf0e10cSrcweir- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 237*cdf0e10cSrcweir- test $ac_status = 0; }; }; then 238*cdf0e10cSrcweir- cross_compiling=no 239*cdf0e10cSrcweir- else 240*cdf0e10cSrcweir- if test "$cross_compiling" = maybe; then 241*cdf0e10cSrcweir- cross_compiling=yes 242*cdf0e10cSrcweir- else 243*cdf0e10cSrcweir- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 244*cdf0e10cSrcweir-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 245*cdf0e10cSrcweir-as_fn_error "cannot run C compiled programs. 246*cdf0e10cSrcweir-If you meant to cross compile, use \`--host'. 247*cdf0e10cSrcweir-See \`config.log' for more details." "$LINENO" 5; } 248*cdf0e10cSrcweir- fi 249*cdf0e10cSrcweir- fi 250*cdf0e10cSrcweir-fi 251*cdf0e10cSrcweir-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 252*cdf0e10cSrcweir-$as_echo "yes" >&6; } 253*cdf0e10cSrcweir- 254*cdf0e10cSrcweir-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out 255*cdf0e10cSrcweir+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out 256*cdf0e10cSrcweir ac_clean_files=$ac_clean_files_save 257*cdf0e10cSrcweir-# Check that the compiler produces executables we can run. If not, either 258*cdf0e10cSrcweir-# the compiler is broken, or we cross compile. 259*cdf0e10cSrcweir-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 260*cdf0e10cSrcweir-$as_echo_n "checking whether we are cross compiling... " >&6; } 261*cdf0e10cSrcweir-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 262*cdf0e10cSrcweir-$as_echo "$cross_compiling" >&6; } 263*cdf0e10cSrcweir- 264*cdf0e10cSrcweir { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 265*cdf0e10cSrcweir $as_echo_n "checking for suffix of executables... " >&6; } 266*cdf0e10cSrcweir if { { ac_try="$ac_link" 267*cdf0e10cSrcweir@@ -3928,13 +3896,72 @@ 268*cdf0e10cSrcweir as_fn_error "cannot compute suffix of executables: cannot compile and link 269*cdf0e10cSrcweir See \`config.log' for more details." "$LINENO" 5; } 270*cdf0e10cSrcweir fi 271*cdf0e10cSrcweir-rm -f conftest$ac_cv_exeext 272*cdf0e10cSrcweir+rm -f conftest conftest$ac_cv_exeext 273*cdf0e10cSrcweir { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 274*cdf0e10cSrcweir $as_echo "$ac_cv_exeext" >&6; } 275*cdf0e10cSrcweir 276*cdf0e10cSrcweir rm -f conftest.$ac_ext 277*cdf0e10cSrcweir EXEEXT=$ac_cv_exeext 278*cdf0e10cSrcweir ac_exeext=$EXEEXT 279*cdf0e10cSrcweir+cat confdefs.h - <<_ACEOF >conftest.$ac_ext 280*cdf0e10cSrcweir+/* end confdefs.h. */ 281*cdf0e10cSrcweir+#include <stdio.h> 282*cdf0e10cSrcweir+int 283*cdf0e10cSrcweir+main () 284*cdf0e10cSrcweir+{ 285*cdf0e10cSrcweir+FILE *f = fopen ("conftest.out", "w"); 286*cdf0e10cSrcweir+ return ferror (f) || fclose (f) != 0; 287*cdf0e10cSrcweir+ 288*cdf0e10cSrcweir+ ; 289*cdf0e10cSrcweir+ return 0; 290*cdf0e10cSrcweir+} 291*cdf0e10cSrcweir+_ACEOF 292*cdf0e10cSrcweir+ac_clean_files="$ac_clean_files conftest.out" 293*cdf0e10cSrcweir+# Check that the compiler produces executables we can run. If not, either 294*cdf0e10cSrcweir+# the compiler is broken, or we cross compile. 295*cdf0e10cSrcweir+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 296*cdf0e10cSrcweir+$as_echo_n "checking whether we are cross compiling... " >&6; } 297*cdf0e10cSrcweir+if test "$cross_compiling" != yes; then 298*cdf0e10cSrcweir+ { { ac_try="$ac_link" 299*cdf0e10cSrcweir+case "(($ac_try" in 300*cdf0e10cSrcweir+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 301*cdf0e10cSrcweir+ *) ac_try_echo=$ac_try;; 302*cdf0e10cSrcweir+esac 303*cdf0e10cSrcweir+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" 304*cdf0e10cSrcweir+$as_echo "$ac_try_echo"; } >&5 305*cdf0e10cSrcweir+ (eval "$ac_link") 2>&5 306*cdf0e10cSrcweir+ ac_status=$? 307*cdf0e10cSrcweir+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 308*cdf0e10cSrcweir+ test $ac_status = 0; } 309*cdf0e10cSrcweir+ if { ac_try='./conftest$ac_cv_exeext' 310*cdf0e10cSrcweir+ { { case "(($ac_try" in 311*cdf0e10cSrcweir+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 312*cdf0e10cSrcweir+ *) ac_try_echo=$ac_try;; 313*cdf0e10cSrcweir+esac 314*cdf0e10cSrcweir+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" 315*cdf0e10cSrcweir+$as_echo "$ac_try_echo"; } >&5 316*cdf0e10cSrcweir+ (eval "$ac_try") 2>&5 317*cdf0e10cSrcweir+ ac_status=$? 318*cdf0e10cSrcweir+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 319*cdf0e10cSrcweir+ test $ac_status = 0; }; }; then 320*cdf0e10cSrcweir+ cross_compiling=no 321*cdf0e10cSrcweir+ else 322*cdf0e10cSrcweir+ if test "$cross_compiling" = maybe; then 323*cdf0e10cSrcweir+ cross_compiling=yes 324*cdf0e10cSrcweir+ else 325*cdf0e10cSrcweir+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 326*cdf0e10cSrcweir+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 327*cdf0e10cSrcweir+as_fn_error "cannot run C compiled programs. 328*cdf0e10cSrcweir+If you meant to cross compile, use \`--host'. 329*cdf0e10cSrcweir+See \`config.log' for more details." "$LINENO" 5; } 330*cdf0e10cSrcweir+ fi 331*cdf0e10cSrcweir+ fi 332*cdf0e10cSrcweir+fi 333*cdf0e10cSrcweir+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 334*cdf0e10cSrcweir+$as_echo "$cross_compiling" >&6; } 335*cdf0e10cSrcweir+ 336*cdf0e10cSrcweir+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out 337*cdf0e10cSrcweir+ac_clean_files=$ac_clean_files_save 338*cdf0e10cSrcweir { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 339*cdf0e10cSrcweir $as_echo_n "checking for suffix of object files... " >&6; } 340*cdf0e10cSrcweir if test "${ac_cv_objext+set}" = set; then : 341*cdf0e10cSrcweir@@ -5249,13 +5276,13 @@ 342*cdf0e10cSrcweir else 343*cdf0e10cSrcweir lt_cv_nm_interface="BSD nm" 344*cdf0e10cSrcweir echo "int some_variable = 0;" > conftest.$ac_ext 345*cdf0e10cSrcweir- (eval echo "\"\$as_me:5252: $ac_compile\"" >&5) 346*cdf0e10cSrcweir+ (eval echo "\"\$as_me:5279: $ac_compile\"" >&5) 347*cdf0e10cSrcweir (eval "$ac_compile" 2>conftest.err) 348*cdf0e10cSrcweir cat conftest.err >&5 349*cdf0e10cSrcweir- (eval echo "\"\$as_me:5255: $NM \\\"conftest.$ac_objext\\\"\"" >&5) 350*cdf0e10cSrcweir+ (eval echo "\"\$as_me:5282: $NM \\\"conftest.$ac_objext\\\"\"" >&5) 351*cdf0e10cSrcweir (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) 352*cdf0e10cSrcweir cat conftest.err >&5 353*cdf0e10cSrcweir- (eval echo "\"\$as_me:5258: output\"" >&5) 354*cdf0e10cSrcweir+ (eval echo "\"\$as_me:5285: output\"" >&5) 355*cdf0e10cSrcweir cat conftest.out >&5 356*cdf0e10cSrcweir if $GREP 'External.*some_variable' conftest.out > /dev/null; then 357*cdf0e10cSrcweir lt_cv_nm_interface="MS dumpbin" 358*cdf0e10cSrcweir@@ -6460,7 +6487,7 @@ 359*cdf0e10cSrcweir ;; 360*cdf0e10cSrcweir *-*-irix6*) 361*cdf0e10cSrcweir # Find out which ABI we are using. 362*cdf0e10cSrcweir- echo '#line 6463 "configure"' > conftest.$ac_ext 363*cdf0e10cSrcweir+ echo '#line 6490 "configure"' > conftest.$ac_ext 364*cdf0e10cSrcweir if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 365*cdf0e10cSrcweir (eval $ac_compile) 2>&5 366*cdf0e10cSrcweir ac_status=$? 367*cdf0e10cSrcweir@@ -7736,11 +7763,11 @@ 368*cdf0e10cSrcweir -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 369*cdf0e10cSrcweir -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 370*cdf0e10cSrcweir -e 's:$: $lt_compiler_flag:'` 371*cdf0e10cSrcweir- (eval echo "\"\$as_me:7739: $lt_compile\"" >&5) 372*cdf0e10cSrcweir+ (eval echo "\"\$as_me:7766: $lt_compile\"" >&5) 373*cdf0e10cSrcweir (eval "$lt_compile" 2>conftest.err) 374*cdf0e10cSrcweir ac_status=$? 375*cdf0e10cSrcweir cat conftest.err >&5 376*cdf0e10cSrcweir- echo "$as_me:7743: \$? = $ac_status" >&5 377*cdf0e10cSrcweir+ echo "$as_me:7770: \$? = $ac_status" >&5 378*cdf0e10cSrcweir if (exit $ac_status) && test -s "$ac_outfile"; then 379*cdf0e10cSrcweir # The compiler can only warn and ignore the option if not recognized 380*cdf0e10cSrcweir # So say no if there are warnings other than the usual output. 381*cdf0e10cSrcweir@@ -8075,11 +8102,11 @@ 382*cdf0e10cSrcweir -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 383*cdf0e10cSrcweir -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 384*cdf0e10cSrcweir -e 's:$: $lt_compiler_flag:'` 385*cdf0e10cSrcweir- (eval echo "\"\$as_me:8078: $lt_compile\"" >&5) 386*cdf0e10cSrcweir+ (eval echo "\"\$as_me:8105: $lt_compile\"" >&5) 387*cdf0e10cSrcweir (eval "$lt_compile" 2>conftest.err) 388*cdf0e10cSrcweir ac_status=$? 389*cdf0e10cSrcweir cat conftest.err >&5 390*cdf0e10cSrcweir- echo "$as_me:8082: \$? = $ac_status" >&5 391*cdf0e10cSrcweir+ echo "$as_me:8109: \$? = $ac_status" >&5 392*cdf0e10cSrcweir if (exit $ac_status) && test -s "$ac_outfile"; then 393*cdf0e10cSrcweir # The compiler can only warn and ignore the option if not recognized 394*cdf0e10cSrcweir # So say no if there are warnings other than the usual output. 395*cdf0e10cSrcweir@@ -8180,11 +8207,11 @@ 396*cdf0e10cSrcweir -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 397*cdf0e10cSrcweir -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 398*cdf0e10cSrcweir -e 's:$: $lt_compiler_flag:'` 399*cdf0e10cSrcweir- (eval echo "\"\$as_me:8183: $lt_compile\"" >&5) 400*cdf0e10cSrcweir+ (eval echo "\"\$as_me:8210: $lt_compile\"" >&5) 401*cdf0e10cSrcweir (eval "$lt_compile" 2>out/conftest.err) 402*cdf0e10cSrcweir ac_status=$? 403*cdf0e10cSrcweir cat out/conftest.err >&5 404*cdf0e10cSrcweir- echo "$as_me:8187: \$? = $ac_status" >&5 405*cdf0e10cSrcweir+ echo "$as_me:8214: \$? = $ac_status" >&5 406*cdf0e10cSrcweir if (exit $ac_status) && test -s out/conftest2.$ac_objext 407*cdf0e10cSrcweir then 408*cdf0e10cSrcweir # The compiler can only warn and ignore the option if not recognized 409*cdf0e10cSrcweir@@ -8235,11 +8262,11 @@ 410*cdf0e10cSrcweir -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 411*cdf0e10cSrcweir -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 412*cdf0e10cSrcweir -e 's:$: $lt_compiler_flag:'` 413*cdf0e10cSrcweir- (eval echo "\"\$as_me:8238: $lt_compile\"" >&5) 414*cdf0e10cSrcweir+ (eval echo "\"\$as_me:8265: $lt_compile\"" >&5) 415*cdf0e10cSrcweir (eval "$lt_compile" 2>out/conftest.err) 416*cdf0e10cSrcweir ac_status=$? 417*cdf0e10cSrcweir cat out/conftest.err >&5 418*cdf0e10cSrcweir- echo "$as_me:8242: \$? = $ac_status" >&5 419*cdf0e10cSrcweir+ echo "$as_me:8269: \$? = $ac_status" >&5 420*cdf0e10cSrcweir if (exit $ac_status) && test -s out/conftest2.$ac_objext 421*cdf0e10cSrcweir then 422*cdf0e10cSrcweir # The compiler can only warn and ignore the option if not recognized 423*cdf0e10cSrcweir@@ -10618,7 +10645,7 @@ 424*cdf0e10cSrcweir lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 425*cdf0e10cSrcweir lt_status=$lt_dlunknown 426*cdf0e10cSrcweir cat > conftest.$ac_ext <<_LT_EOF 427*cdf0e10cSrcweir-#line 10621 "configure" 428*cdf0e10cSrcweir+#line 10648 "configure" 429*cdf0e10cSrcweir #include "confdefs.h" 430*cdf0e10cSrcweir 431*cdf0e10cSrcweir #if HAVE_DLFCN_H 432*cdf0e10cSrcweir@@ -10714,7 +10741,7 @@ 433*cdf0e10cSrcweir lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 434*cdf0e10cSrcweir lt_status=$lt_dlunknown 435*cdf0e10cSrcweir cat > conftest.$ac_ext <<_LT_EOF 436*cdf0e10cSrcweir-#line 10717 "configure" 437*cdf0e10cSrcweir+#line 10744 "configure" 438*cdf0e10cSrcweir #include "confdefs.h" 439*cdf0e10cSrcweir 440*cdf0e10cSrcweir #if HAVE_DLFCN_H 441*cdf0e10cSrcweir@@ -11804,8 +11831,12 @@ 442*cdf0e10cSrcweir fi 443*cdf0e10cSrcweir fi 444*cdf0e10cSrcweir 445*cdf0e10cSrcweir-LIBXML_MIN_VERSION="2.7.4" 446*cdf0e10cSrcweir LIBXML_CONFIG="xml2-config" 447*cdf0e10cSrcweir+if test -f "$SOLARVERSION/$INPATH/bin$UPDMINOREXT/xml2-config" ; then 448*cdf0e10cSrcweir+ LIBXML_CONFIG="$SOLARVERSION/$INPATH/bin$UPDMINOREXT/xml2-config" 449*cdf0e10cSrcweir+else 450*cdf0e10cSrcweir+ LIBXML_CONFIG="xml2-config" 451*cdf0e10cSrcweir+fi 452*cdf0e10cSrcweir LIBXML_CFLAGS="" 453*cdf0e10cSrcweir LIBXML_LIBS="" 454*cdf0e10cSrcweir LIBXML_FOUND="no" 455*cdf0e10cSrcweir@@ -12757,12 +12788,26 @@ 456*cdf0e10cSrcweir 457*cdf0e10cSrcweir XMLSEC_NO_NSS="1" 458*cdf0e10cSrcweir MOZILLA_MIN_VERSION="1.4" 459*cdf0e10cSrcweir+if test "z$MOZ_FLAVOUR" = "zfirefox" ; then 460*cdf0e10cSrcweir+ MOZILLA_MIN_VERSION="1.0" 461*cdf0e10cSrcweir+fi 462*cdf0e10cSrcweir NSS_MIN_VERSION="3.2" 463*cdf0e10cSrcweir NSPR_MIN_VERSION="4.0" 464*cdf0e10cSrcweir NSS_CFLAGS="" 465*cdf0e10cSrcweir NSS_LIBS="" 466*cdf0e10cSrcweir-NSS_LIBS_LIST="-lnss3 -lsmime3" 467*cdf0e10cSrcweir-NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4" 468*cdf0e10cSrcweir+ 469*cdf0e10cSrcweir+case $host_os in 470*cdf0e10cSrcweir+cygwin* | mingw* | pw32*) 471*cdf0e10cSrcweir+ NSS_LIBS_LIST="-lnss3 -lsmime3" 472*cdf0e10cSrcweir+ NSPR_LIBS_LIST="-lnspr4" 473*cdf0e10cSrcweir+ ;; 474*cdf0e10cSrcweir+ 475*cdf0e10cSrcweir+*) 476*cdf0e10cSrcweir+ NSS_LIBS_LIST="-lnss3 -lsoftokn3 -lsmime3" 477*cdf0e10cSrcweir+ NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4" 478*cdf0e10cSrcweir+ ;; 479*cdf0e10cSrcweir+esac 480*cdf0e10cSrcweir+ 481*cdf0e10cSrcweir NSS_CRYPTO_LIB="$XMLSEC_PACKAGE-nss" 482*cdf0e10cSrcweir NSS_FOUND="no" 483*cdf0e10cSrcweir NSPR_PACKAGE=mozilla-nspr 484*cdf0e10cSrcweir@@ -12811,6 +12856,79 @@ 485*cdf0e10cSrcweir pkg_cv_NSS_CFLAGS="$NSS_CFLAGS" 486*cdf0e10cSrcweir else 487*cdf0e10cSrcweir if test -n "$PKG_CONFIG" && \ 488*cdf0e10cSrcweir+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$MOZ_FLAVOUR-nspr >= \$MOZILLA_MIN_VERSION \$MOZ_FLAVOUR >= \$MOZILLA_MIN_VERSION\""; } >&5 489*cdf0e10cSrcweir+ ($PKG_CONFIG --exists --print-errors "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION") 2>&5 490*cdf0e10cSrcweir+ ac_status=$? 491*cdf0e10cSrcweir+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 492*cdf0e10cSrcweir+ test $ac_status = 0; }; then 493*cdf0e10cSrcweir+ pkg_cv_NSS_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION" 2>/dev/null` 494*cdf0e10cSrcweir+else 495*cdf0e10cSrcweir+ pkg_failed=yes 496*cdf0e10cSrcweir+fi 497*cdf0e10cSrcweir+ fi 498*cdf0e10cSrcweir+else 499*cdf0e10cSrcweir+ pkg_failed=untried 500*cdf0e10cSrcweir+fi 501*cdf0e10cSrcweir+if test -n "$PKG_CONFIG"; then 502*cdf0e10cSrcweir+ if test -n "$NSS_LIBS"; then 503*cdf0e10cSrcweir+ pkg_cv_NSS_LIBS="$NSS_LIBS" 504*cdf0e10cSrcweir+ else 505*cdf0e10cSrcweir+ if test -n "$PKG_CONFIG" && \ 506*cdf0e10cSrcweir+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$MOZ_FLAVOUR-nspr >= \$MOZILLA_MIN_VERSION \$MOZ_FLAVOUR >= \$MOZILLA_MIN_VERSION\""; } >&5 507*cdf0e10cSrcweir+ ($PKG_CONFIG --exists --print-errors "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION") 2>&5 508*cdf0e10cSrcweir+ ac_status=$? 509*cdf0e10cSrcweir+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 510*cdf0e10cSrcweir+ test $ac_status = 0; }; then 511*cdf0e10cSrcweir+ pkg_cv_NSS_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION" 2>/dev/null` 512*cdf0e10cSrcweir+else 513*cdf0e10cSrcweir+ pkg_failed=yes 514*cdf0e10cSrcweir+fi 515*cdf0e10cSrcweir+ fi 516*cdf0e10cSrcweir+else 517*cdf0e10cSrcweir+ pkg_failed=untried 518*cdf0e10cSrcweir+fi 519*cdf0e10cSrcweir+ 520*cdf0e10cSrcweir+ 521*cdf0e10cSrcweir+ 522*cdf0e10cSrcweir+if test $pkg_failed = yes; then 523*cdf0e10cSrcweir+ 524*cdf0e10cSrcweir+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 525*cdf0e10cSrcweir+ _pkg_short_errors_supported=yes 526*cdf0e10cSrcweir+else 527*cdf0e10cSrcweir+ _pkg_short_errors_supported=no 528*cdf0e10cSrcweir+fi 529*cdf0e10cSrcweir+ if test $_pkg_short_errors_supported = yes; then 530*cdf0e10cSrcweir+ NSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION"` 531*cdf0e10cSrcweir+ else 532*cdf0e10cSrcweir+ NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION"` 533*cdf0e10cSrcweir+ fi 534*cdf0e10cSrcweir+ # Put the nasty error message in config.log where it belongs 535*cdf0e10cSrcweir+ echo "$NSS_PKG_ERRORS" >&5 536*cdf0e10cSrcweir+ 537*cdf0e10cSrcweir+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 538*cdf0e10cSrcweir+$as_echo "no" >&6; } 539*cdf0e10cSrcweir+ NSS_FOUND=no 540*cdf0e10cSrcweir+elif test $pkg_failed = untried; then 541*cdf0e10cSrcweir+ NSS_FOUND=no 542*cdf0e10cSrcweir+else 543*cdf0e10cSrcweir+ NSS_CFLAGS=$pkg_cv_NSS_CFLAGS 544*cdf0e10cSrcweir+ NSS_LIBS=$pkg_cv_NSS_LIBS 545*cdf0e10cSrcweir+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 546*cdf0e10cSrcweir+$as_echo "yes" >&6; } 547*cdf0e10cSrcweir+ NSS_FOUND=yes NSPR_PACKAGE=$MOZ_FLAVOUR-nspr NSS_PACKAGE=$MOZ_FLAVOUR-nss 548*cdf0e10cSrcweir+fi 549*cdf0e10cSrcweir+ fi 550*cdf0e10cSrcweir+ if test "z$NSS_FOUND" = "zno" ; then 551*cdf0e10cSrcweir+ 552*cdf0e10cSrcweir+pkg_failed=no 553*cdf0e10cSrcweir+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSS" >&5 554*cdf0e10cSrcweir+$as_echo_n "checking for NSS... " >&6; } 555*cdf0e10cSrcweir+ 556*cdf0e10cSrcweir+if test -n "$PKG_CONFIG"; then 557*cdf0e10cSrcweir+ if test -n "$NSS_CFLAGS"; then 558*cdf0e10cSrcweir+ pkg_cv_NSS_CFLAGS="$NSS_CFLAGS" 559*cdf0e10cSrcweir+ else 560*cdf0e10cSrcweir+ if test -n "$PKG_CONFIG" && \ 561*cdf0e10cSrcweir { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mozilla-nspr >= \$MOZILLA_MIN_VERSION mozilla-nss >= \$MOZILLA_MIN_VERSION\""; } >&5 562*cdf0e10cSrcweir ($PKG_CONFIG --exists --print-errors "mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION") 2>&5 563*cdf0e10cSrcweir ac_status=$? 564*cdf0e10cSrcweir@@ -13030,8 +13148,8 @@ 565*cdf0e10cSrcweir ac_mozilla_name=mozilla-$MOZILLA_MIN_VERSION 566*cdf0e10cSrcweir fi 567*cdf0e10cSrcweir 568*cdf0e10cSrcweir- ac_nss_lib_dir="/usr/lib /usr/lib64 /usr/local/lib /usr/lib/$ac_mozilla_name /usr/local/lib/$ac_mozilla_name" 569*cdf0e10cSrcweir- ac_nss_inc_dir="/usr/include /usr/include/mozilla /usr/local/include /usr/local/include/mozilla /usr/include/$ac_mozilla_name /usr/local/include/$ac_mozilla_name" 570*cdf0e10cSrcweir+ ac_nss_lib_dir="${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT}" 571*cdf0e10cSrcweir+ ac_nss_inc_dir="${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/mozilla" 572*cdf0e10cSrcweir 573*cdf0e10cSrcweir { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nspr libraries >= $NSPR_MIN_VERSION" >&5 574*cdf0e10cSrcweir $as_echo_n "checking for nspr libraries >= $NSPR_MIN_VERSION... " >&6; } 575*cdf0e10cSrcweir@@ -13066,7 +13184,7 @@ 576*cdf0e10cSrcweir done 577*cdf0e10cSrcweir 578*cdf0e10cSrcweir for dir in $ac_nss_lib_dir ; do 579*cdf0e10cSrcweir- if test -f $dir/libnspr4$shrext ; then 580*cdf0e10cSrcweir+ if test -f $dir/libnspr4.so -o -f $dir/libnspr4.dylib ; then 581*cdf0e10cSrcweir if test "z$dir" = "z/usr/lib" ; then 582*cdf0e10cSrcweir NSPR_LIBS="$NSPR_LIBS_LIST" 583*cdf0e10cSrcweir else 584*cdf0e10cSrcweir@@ -13148,7 +13266,7 @@ 585*cdf0e10cSrcweir done 586*cdf0e10cSrcweir 587*cdf0e10cSrcweir for dir in $ac_nss_lib_dir ; do 588*cdf0e10cSrcweir- if test -f $dir/libnss3$shrext ; then 589*cdf0e10cSrcweir+ if test -f $dir/libnss3.so -o -f $dir/libnss3.dylib ; then 590*cdf0e10cSrcweir if test "z$dir" = "z/usr/lib" ; then 591*cdf0e10cSrcweir NSS_LIBS="$NSS_LIBS_LIST" 592*cdf0e10cSrcweir else 593*cdf0e10cSrcweir@@ -13166,7 +13284,7 @@ 594*cdf0e10cSrcweir 595*cdf0e10cSrcweir if test "z$NSS_INCLUDES_FOUND" = "zyes" -a "z$NSS_LIBS_FOUND" = "zyes" ; then 596*cdf0e10cSrcweir OLD_CPPFLAGS=$CPPFLAGS 597*cdf0e10cSrcweir- CPPFLAGS="$NSS_CFLAGS" 598*cdf0e10cSrcweir+ CPPFLAGS="$NSS_CFLAGS $NSPR_CFLAGS" 599*cdf0e10cSrcweir cat confdefs.h - <<_ACEOF >conftest.$ac_ext 600*cdf0e10cSrcweir /* end confdefs.h. */ 601*cdf0e10cSrcweir 602*cdf0e10cSrcweir@@ -15036,7 +15154,7 @@ 603*cdf0e10cSrcweir # values after options handling. 604*cdf0e10cSrcweir ac_log=" 605*cdf0e10cSrcweir This file was extended by xmlsec1 $as_me 1.2.14, which was 606*cdf0e10cSrcweir-generated by GNU Autoconf 2.64. Invocation command line was 607*cdf0e10cSrcweir+generated by GNU Autoconf 2.65. Invocation command line was 608*cdf0e10cSrcweir 609*cdf0e10cSrcweir CONFIG_FILES = $CONFIG_FILES 610*cdf0e10cSrcweir CONFIG_HEADERS = $CONFIG_HEADERS 611*cdf0e10cSrcweir@@ -15076,6 +15194,7 @@ 612*cdf0e10cSrcweir 613*cdf0e10cSrcweir -h, --help print this help, then exit 614*cdf0e10cSrcweir -V, --version print version number and configuration settings, then exit 615*cdf0e10cSrcweir+ --config print configuration, then exit 616*cdf0e10cSrcweir -q, --quiet, --silent 617*cdf0e10cSrcweir do not print progress messages 618*cdf0e10cSrcweir -d, --debug don't remove temporary files 619*cdf0e10cSrcweir@@ -15098,10 +15217,11 @@ 620*cdf0e10cSrcweir 621*cdf0e10cSrcweir _ACEOF 622*cdf0e10cSrcweir cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 623*cdf0e10cSrcweir+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 624*cdf0e10cSrcweir ac_cs_version="\\ 625*cdf0e10cSrcweir xmlsec1 config.status 1.2.14 626*cdf0e10cSrcweir-configured by $0, generated by GNU Autoconf 2.64, 627*cdf0e10cSrcweir- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" 628*cdf0e10cSrcweir+configured by $0, generated by GNU Autoconf 2.65, 629*cdf0e10cSrcweir+ with options \\"\$ac_cs_config\\" 630*cdf0e10cSrcweir 631*cdf0e10cSrcweir Copyright (C) 2009 Free Software Foundation, Inc. 632*cdf0e10cSrcweir This config.status script is free software; the Free Software Foundation 633*cdf0e10cSrcweir@@ -15139,6 +15259,8 @@ 634*cdf0e10cSrcweir ac_cs_recheck=: ;; 635*cdf0e10cSrcweir --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) 636*cdf0e10cSrcweir $as_echo "$ac_cs_version"; exit ;; 637*cdf0e10cSrcweir+ --config | --confi | --conf | --con | --co | --c ) 638*cdf0e10cSrcweir+ $as_echo "$ac_cs_config"; exit ;; 639*cdf0e10cSrcweir --debug | --debu | --deb | --de | --d | -d ) 640*cdf0e10cSrcweir debug=: ;; 641*cdf0e10cSrcweir --file | --fil | --fi | --f ) 642*cdf0e10cSrcweir@@ -15606,7 +15728,7 @@ 643*cdf0e10cSrcweir t delim 644*cdf0e10cSrcweir :nl 645*cdf0e10cSrcweir h 646*cdf0e10cSrcweir-s/\(.\{148\}\).*/\1/ 647*cdf0e10cSrcweir+s/\(.\{148\}\)..*/\1/ 648*cdf0e10cSrcweir t more1 649*cdf0e10cSrcweir s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ 650*cdf0e10cSrcweir p 651*cdf0e10cSrcweir@@ -15620,7 +15742,7 @@ 652*cdf0e10cSrcweir t nl 653*cdf0e10cSrcweir :delim 654*cdf0e10cSrcweir h 655*cdf0e10cSrcweir-s/\(.\{148\}\).*/\1/ 656*cdf0e10cSrcweir+s/\(.\{148\}\)..*/\1/ 657*cdf0e10cSrcweir t more2 658*cdf0e10cSrcweir s/["\\]/\\&/g; s/^/"/; s/$/"/ 659*cdf0e10cSrcweir p 660*cdf0e10cSrcweir--- misc/xmlsec1-1.2.14/configure.in 2009-06-25 22:53:18.000000000 +0200 661*cdf0e10cSrcweir+++ misc/build/xmlsec1-1.2.14/configure.in 2009-10-01 10:28:50.990755126 +0200 662*cdf0e10cSrcweir@@ -190,8 +190,12 @@ 663*cdf0e10cSrcweir dnl ========================================================================== 664*cdf0e10cSrcweir dnl find libxml 665*cdf0e10cSrcweir dnl ========================================================================== 666*cdf0e10cSrcweir-LIBXML_MIN_VERSION="2.7.4" 667*cdf0e10cSrcweir LIBXML_CONFIG="xml2-config" 668*cdf0e10cSrcweir+if test -f "$SOLARVERSION/$INPATH/bin$UPDMINOREXT/xml2-config" ; then 669*cdf0e10cSrcweir+ LIBXML_CONFIG="$SOLARVERSION/$INPATH/bin$UPDMINOREXT/xml2-config" 670*cdf0e10cSrcweir+else 671*cdf0e10cSrcweir+ LIBXML_CONFIG="xml2-config" 672*cdf0e10cSrcweir+fi 673*cdf0e10cSrcweir LIBXML_CFLAGS="" 674*cdf0e10cSrcweir LIBXML_LIBS="" 675*cdf0e10cSrcweir LIBXML_FOUND="no" 676*cdf0e10cSrcweir@@ -555,12 +559,26 @@ 677*cdf0e10cSrcweir 678*cdf0e10cSrcweir XMLSEC_NO_NSS="1" 679*cdf0e10cSrcweir MOZILLA_MIN_VERSION="1.4" 680*cdf0e10cSrcweir+if test "z$MOZ_FLAVOUR" = "zfirefox" ; then 681*cdf0e10cSrcweir+ MOZILLA_MIN_VERSION="1.0" 682*cdf0e10cSrcweir+fi 683*cdf0e10cSrcweir NSS_MIN_VERSION="3.2" 684*cdf0e10cSrcweir NSPR_MIN_VERSION="4.0" 685*cdf0e10cSrcweir NSS_CFLAGS="" 686*cdf0e10cSrcweir NSS_LIBS="" 687*cdf0e10cSrcweir-NSS_LIBS_LIST="-lnss3 -lsmime3" 688*cdf0e10cSrcweir-NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4" 689*cdf0e10cSrcweir+ 690*cdf0e10cSrcweir+case $host_os in 691*cdf0e10cSrcweir+cygwin* | mingw* | pw32*) 692*cdf0e10cSrcweir+ NSS_LIBS_LIST="-lnss3 -lsmime3" 693*cdf0e10cSrcweir+ NSPR_LIBS_LIST="-lnspr4" 694*cdf0e10cSrcweir+ ;; 695*cdf0e10cSrcweir+ 696*cdf0e10cSrcweir+*) 697*cdf0e10cSrcweir+ NSS_LIBS_LIST="-lnss3 -lsoftokn3 -lsmime3" 698*cdf0e10cSrcweir+ NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4" 699*cdf0e10cSrcweir+ ;; 700*cdf0e10cSrcweir+esac 701*cdf0e10cSrcweir+ 702*cdf0e10cSrcweir NSS_CRYPTO_LIB="$XMLSEC_PACKAGE-nss" 703*cdf0e10cSrcweir NSS_FOUND="no" 704*cdf0e10cSrcweir NSPR_PACKAGE=mozilla-nspr 705*cdf0e10cSrcweir@@ -586,6 +604,11 @@ 706*cdf0e10cSrcweir dnl We are going to try all options 707*cdf0e10cSrcweir dnl 708*cdf0e10cSrcweir if test "z$NSS_FOUND" = "zno" ; then 709*cdf0e10cSrcweir+ PKG_CHECK_MODULES(NSS, $MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION, 710*cdf0e10cSrcweir+ [NSS_FOUND=yes NSPR_PACKAGE=$MOZ_FLAVOUR-nspr NSS_PACKAGE=$MOZ_FLAVOUR-nss], 711*cdf0e10cSrcweir+ [NSS_FOUND=no]) 712*cdf0e10cSrcweir+ fi 713*cdf0e10cSrcweir+ if test "z$NSS_FOUND" = "zno" ; then 714*cdf0e10cSrcweir PKG_CHECK_MODULES(NSS, mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION, 715*cdf0e10cSrcweir [NSS_FOUND=yes NSPR_PACKAGE=mozilla-nspr NSS_PACKAGE=mozilla-nss], 716*cdf0e10cSrcweir [NSS_FOUND=no]) 717*cdf0e10cSrcweir@@ -612,8 +635,8 @@ 718*cdf0e10cSrcweir ac_mozilla_name=mozilla-$MOZILLA_MIN_VERSION 719*cdf0e10cSrcweir fi 720*cdf0e10cSrcweir 721*cdf0e10cSrcweir- ac_nss_lib_dir="/usr/lib /usr/lib64 /usr/local/lib /usr/lib/$ac_mozilla_name /usr/local/lib/$ac_mozilla_name" 722*cdf0e10cSrcweir- ac_nss_inc_dir="/usr/include /usr/include/mozilla /usr/local/include /usr/local/include/mozilla /usr/include/$ac_mozilla_name /usr/local/include/$ac_mozilla_name" 723*cdf0e10cSrcweir+ ac_nss_lib_dir="${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT}" 724*cdf0e10cSrcweir+ ac_nss_inc_dir="${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/mozilla" 725*cdf0e10cSrcweir 726*cdf0e10cSrcweir AC_MSG_CHECKING(for nspr libraries >= $NSPR_MIN_VERSION) 727*cdf0e10cSrcweir NSPR_INCLUDES_FOUND="no" 728*cdf0e10cSrcweir@@ -648,7 +671,7 @@ 729*cdf0e10cSrcweir done 730*cdf0e10cSrcweir 731*cdf0e10cSrcweir for dir in $ac_nss_lib_dir ; do 732*cdf0e10cSrcweir- if test -f $dir/libnspr4$shrext ; then 733*cdf0e10cSrcweir+ if test -f $dir/libnspr4.so -o -f $dir/libnspr4.dylib ; then 734*cdf0e10cSrcweir dnl do not add -L/usr/lib because compiler does it anyway 735*cdf0e10cSrcweir if test "z$dir" = "z/usr/lib" ; then 736*cdf0e10cSrcweir NSPR_LIBS="$NSPR_LIBS_LIST" 737*cdf0e10cSrcweir@@ -719,7 +742,7 @@ 738*cdf0e10cSrcweir done 739*cdf0e10cSrcweir 740*cdf0e10cSrcweir for dir in $ac_nss_lib_dir ; do 741*cdf0e10cSrcweir- if test -f $dir/libnss3$shrext ; then 742*cdf0e10cSrcweir+ if test -f $dir/libnss3.so -o -f $dir/libnss3.dylib ; then 743*cdf0e10cSrcweir dnl do not add -L/usr/lib because compiler does it anyway 744*cdf0e10cSrcweir if test "z$dir" = "z/usr/lib" ; then 745*cdf0e10cSrcweir NSS_LIBS="$NSS_LIBS_LIST" 746*cdf0e10cSrcweir@@ -738,7 +761,7 @@ 747*cdf0e10cSrcweir 748*cdf0e10cSrcweir if test "z$NSS_INCLUDES_FOUND" = "zyes" -a "z$NSS_LIBS_FOUND" = "zyes" ; then 749*cdf0e10cSrcweir OLD_CPPFLAGS=$CPPFLAGS 750*cdf0e10cSrcweir- CPPFLAGS="$NSS_CFLAGS" 751*cdf0e10cSrcweir+ CPPFLAGS="$NSS_CFLAGS $NSPR_CFLAGS" 752*cdf0e10cSrcweir AC_EGREP_CPP(yes,[ 753*cdf0e10cSrcweir #include <nss.h> 754*cdf0e10cSrcweir #if NSS_VMAJOR >= 3 && NSS_VMINOR >= 2 755*cdf0e10cSrcweir--- misc/xmlsec1-1.2.14/win32/Makefile.msvc 2009-06-25 22:53:18.000000000 +0200 756*cdf0e10cSrcweir+++ misc/build/xmlsec1-1.2.14/win32/Makefile.msvc 2009-10-01 10:28:50.997747312 +0200 757*cdf0e10cSrcweir@@ -376,7 +376,7 @@ 758*cdf0e10cSrcweir XMLSEC_OPENSSL_SOLIBS = libeay32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib 759*cdf0e10cSrcweir XMLSEC_OPENSSL_ALIBS = libeay32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib 760*cdf0e10cSrcweir 761*cdf0e10cSrcweir-XMLSEC_NSS_SOLIBS = smime3.lib ssl3.lib nss3.lib libnspr4.lib libplds4.lib libplc4.lib kernel32.lib user32.lib gdi32.lib 762*cdf0e10cSrcweir+XMLSEC_NSS_SOLIBS = smime3.lib nss3.lib nspr4.lib kernel32.lib user32.lib gdi32.lib 763*cdf0e10cSrcweir XMLSEC_NSS_ALIBS = smime3.lib ssl3.lib nss3.lib libnspr4_s.lib libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib 764*cdf0e10cSrcweir 765*cdf0e10cSrcweir XMLSEC_MSCRYPTO_SOLIBS = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib 766