| --- misc/xmlsec1-1.2.14/Makefile.in 2009-06-25 22:53:34.000000000 +0200 |
| +++ misc/build/xmlsec1-1.2.14/Makefile.in 2009-10-01 10:32:48.708515261 +0200 |
| @@ -341,8 +341,9 @@ |
| top_srcdir = @top_srcdir@ |
| NULL = |
| SAFE_VERSION = @XMLSEC_VERSION_SAFE@ |
| -SUBDIRS = include src apps man docs |
| -TEST_APP = apps/xmlsec1$(EXEEXT) |
| +#Do not build xmlsec1 app. It is not needed. Also the libtool includes |
| +#a -L/path_to_lib_dir which may contain an incompatible lixbml2. |
| +SUBDIRS = include src man docs |
| DEFAULT_CRYPTO = @XMLSEC_CRYPTO@ |
| bin_SCRIPTS = xmlsec1-config |
| pkgconfig_DATA = xmlsec1.pc @XMLSEC_CRYPTO_PC_FILES_LIST@ |
| --- misc/xmlsec1-1.2.14/configure 2009-06-25 22:53:35.000000000 +0200 |
| +++ misc/build/xmlsec1-1.2.14/configure 2009-10-01 10:28:50.980389049 +0200 |
| @@ -1,12 +1,14 @@ |
| #! /bin/sh |
| # Guess values for system-dependent variables and create Makefiles. |
| -# Generated by GNU Autoconf 2.64 for xmlsec1 1.2.14. |
| +# Generated by GNU Autoconf 2.65 for xmlsec1 1.2.14. |
| # |
| # Report bugs to <http://www.aleksey.com/xmlsec>. |
| # |
| +# |
| # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, |
| -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software |
| -# Foundation, Inc. |
| +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
| +# Inc. |
| +# |
| # |
| # This configure script is free software; the Free Software Foundation |
| # gives unlimited permission to copy, distribute and modify it. |
| @@ -676,7 +678,8 @@ |
| |
| |
| |
| -exec 7<&0 </dev/null 6>&1 |
| +test -n "$DJDIR" || exec 7<&0 </dev/null |
| +exec 6>&1 |
| |
| # Name of the host. |
| # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, |
| @@ -1749,7 +1752,7 @@ |
| LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a |
| nonstandard directory <lib dir> |
| LIBS libraries to pass to the linker, e.g. -l<library> |
| - CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if |
| + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if |
| you have headers in a nonstandard directory <include dir> |
| CPP C preprocessor |
| PKG_CONFIG path to pkg-config utility |
| @@ -1837,7 +1840,7 @@ |
| if $ac_init_version; then |
| cat <<\_ACEOF |
| xmlsec1 configure 1.2.14 |
| -generated by GNU Autoconf 2.64 |
| +generated by GNU Autoconf 2.65 |
| |
| Copyright (C) 2009 Free Software Foundation, Inc. |
| This configure script is free software; the Free Software Foundation |
| @@ -1884,7 +1887,7 @@ |
| ac_retval=1 |
| fi |
| eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
| - return $ac_retval |
| + as_fn_set_status $ac_retval |
| |
| } # ac_fn_c_try_compile |
| |
| @@ -1921,7 +1924,7 @@ |
| ac_retval=1 |
| fi |
| eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
| - return $ac_retval |
| + as_fn_set_status $ac_retval |
| |
| } # ac_fn_c_try_cpp |
| |
| @@ -1963,7 +1966,7 @@ |
| fi |
| rm -rf conftest.dSYM conftest_ipa8_conftest.oo |
| eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
| - return $ac_retval |
| + as_fn_set_status $ac_retval |
| |
| } # ac_fn_c_try_run |
| |
| @@ -2009,7 +2012,7 @@ |
| # left behind by Apple's compiler. We do this before executing the actions. |
| rm -rf conftest.dSYM conftest_ipa8_conftest.oo |
| eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
| - return $ac_retval |
| + as_fn_set_status $ac_retval |
| |
| } # ac_fn_c_try_link |
| |
| @@ -2378,7 +2381,7 @@ |
| |
| fi |
| eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
| - return $ac_retval |
| + as_fn_set_status $ac_retval |
| |
| } # ac_fn_c_compute_int |
| cat >config.log <<_ACEOF |
| @@ -2386,7 +2389,7 @@ |
| running configure, to aid debugging if configure makes a mistake. |
| |
| It was created by xmlsec1 $as_me 1.2.14, which was |
| -generated by GNU Autoconf 2.64. Invocation command line was |
| +generated by GNU Autoconf 2.65. Invocation command line was |
| |
| $ $0 $@ |
| |
| @@ -2639,7 +2642,7 @@ |
| for ac_site_file in "$ac_site_file1" "$ac_site_file2" |
| do |
| test "x$ac_site_file" = xNONE && continue |
| - if test -r "$ac_site_file"; then |
| + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then |
| { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 |
| $as_echo "$as_me: loading site script $ac_site_file" >&6;} |
| sed 's/^/| /' "$ac_site_file" >&5 |
| @@ -2648,9 +2651,9 @@ |
| done |
| |
| if test -r "$cache_file"; then |
| - # Some versions of bash will fail to source /dev/null (special |
| - # files actually), so we avoid doing that. |
| - if test -f "$cache_file"; then |
| + # Some versions of bash will fail to source /dev/null (special files |
| + # actually), so we avoid doing that. DJGPP emulates it as a regular file. |
| + if test /dev/null != "$cache_file" && test -f "$cache_file"; then |
| { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 |
| $as_echo "$as_me: loading cache $cache_file" >&6;} |
| case $cache_file in |
| @@ -3160,6 +3163,7 @@ |
| |
| fi |
| |
| + test -d ./--version && rmdir ./--version |
| if test "${ac_cv_path_mkdir+set}" = set; then |
| MKDIR_P="$ac_cv_path_mkdir -p" |
| else |
| @@ -3167,7 +3171,6 @@ |
| # value for MKDIR_P within a source directory, because that will |
| # break other packages using the cache if that directory is |
| # removed, or if the value is a relative name. |
| - test -d ./--version && rmdir ./--version |
| MKDIR_P="$ac_install_sh -d" |
| fi |
| fi |
| @@ -3753,32 +3756,30 @@ |
| ... rest of stderr output deleted ... |
| 10q' conftest.err >conftest.er1 |
| cat conftest.er1 >&5 |
| - rm -f conftest.er1 conftest.err |
| fi |
| + rm -f conftest.er1 conftest.err |
| $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| test $ac_status = 0; } |
| done |
| |
| cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| /* end confdefs.h. */ |
| -#include <stdio.h> |
| + |
| int |
| main () |
| { |
| -FILE *f = fopen ("conftest.out", "w"); |
| - return ferror (f) || fclose (f) != 0; |
| |
| ; |
| return 0; |
| } |
| _ACEOF |
| ac_clean_files_save=$ac_clean_files |
| -ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out" |
| +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" |
| # Try to create an executable without -o first, disregard a.out. |
| # It will help us diagnose broken compilers, and finding out an intuition |
| # of exeext. |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 |
| -$as_echo_n "checking for C compiler default output file name... " >&6; } |
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 |
| +$as_echo_n "checking whether the C compiler works... " >&6; } |
| ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` |
| |
| # The possible output files: |
| @@ -3840,10 +3841,10 @@ |
| else |
| ac_file='' |
| fi |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 |
| -$as_echo "$ac_file" >&6; } |
| if test -z "$ac_file"; then : |
| - $as_echo "$as_me: failed program was:" >&5 |
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| +$as_echo "no" >&6; } |
| +$as_echo "$as_me: failed program was:" >&5 |
| sed 's/^/| /' conftest.$ac_ext >&5 |
| |
| { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
| @@ -3851,51 +3852,18 @@ |
| { as_fn_set_status 77 |
| as_fn_error "C compiler cannot create executables |
| See \`config.log' for more details." "$LINENO" 5; }; } |
| +else |
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
| +$as_echo "yes" >&6; } |
| fi |
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 |
| +$as_echo_n "checking for C compiler default output file name... " >&6; } |
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 |
| +$as_echo "$ac_file" >&6; } |
| ac_exeext=$ac_cv_exeext |
| |
| -# Check that the compiler produces executables we can run. If not, either |
| -# the compiler is broken, or we cross compile. |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 |
| -$as_echo_n "checking whether the C compiler works... " >&6; } |
| -# If not cross compiling, check that we can run a simple program. |
| -if test "$cross_compiling" != yes; then |
| - if { ac_try='./$ac_file' |
| - { { case "(($ac_try" in |
| - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| - *) ac_try_echo=$ac_try;; |
| -esac |
| -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
| -$as_echo "$ac_try_echo"; } >&5 |
| - (eval "$ac_try") 2>&5 |
| - ac_status=$? |
| - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| - test $ac_status = 0; }; }; then |
| - cross_compiling=no |
| - else |
| - if test "$cross_compiling" = maybe; then |
| - cross_compiling=yes |
| - else |
| - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
| -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| -as_fn_error "cannot run C compiled programs. |
| -If you meant to cross compile, use \`--host'. |
| -See \`config.log' for more details." "$LINENO" 5; } |
| - fi |
| - fi |
| -fi |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
| -$as_echo "yes" >&6; } |
| - |
| -rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out |
| +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out |
| ac_clean_files=$ac_clean_files_save |
| -# Check that the compiler produces executables we can run. If not, either |
| -# the compiler is broken, or we cross compile. |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 |
| -$as_echo_n "checking whether we are cross compiling... " >&6; } |
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 |
| -$as_echo "$cross_compiling" >&6; } |
| - |
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 |
| $as_echo_n "checking for suffix of executables... " >&6; } |
| if { { ac_try="$ac_link" |
| @@ -3928,13 +3896,72 @@ |
| as_fn_error "cannot compute suffix of executables: cannot compile and link |
| See \`config.log' for more details." "$LINENO" 5; } |
| fi |
| -rm -f conftest$ac_cv_exeext |
| +rm -f conftest conftest$ac_cv_exeext |
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 |
| $as_echo "$ac_cv_exeext" >&6; } |
| |
| rm -f conftest.$ac_ext |
| EXEEXT=$ac_cv_exeext |
| ac_exeext=$EXEEXT |
| +cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| +/* end confdefs.h. */ |
| +#include <stdio.h> |
| +int |
| +main () |
| +{ |
| +FILE *f = fopen ("conftest.out", "w"); |
| + return ferror (f) || fclose (f) != 0; |
| + |
| + ; |
| + return 0; |
| +} |
| +_ACEOF |
| +ac_clean_files="$ac_clean_files conftest.out" |
| +# Check that the compiler produces executables we can run. If not, either |
| +# the compiler is broken, or we cross compile. |
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 |
| +$as_echo_n "checking whether we are cross compiling... " >&6; } |
| +if test "$cross_compiling" != yes; then |
| + { { ac_try="$ac_link" |
| +case "(($ac_try" in |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| + *) ac_try_echo=$ac_try;; |
| +esac |
| +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
| +$as_echo "$ac_try_echo"; } >&5 |
| + (eval "$ac_link") 2>&5 |
| + ac_status=$? |
| + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| + test $ac_status = 0; } |
| + if { ac_try='./conftest$ac_cv_exeext' |
| + { { case "(($ac_try" in |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| + *) ac_try_echo=$ac_try;; |
| +esac |
| +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
| +$as_echo "$ac_try_echo"; } >&5 |
| + (eval "$ac_try") 2>&5 |
| + ac_status=$? |
| + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| + test $ac_status = 0; }; }; then |
| + cross_compiling=no |
| + else |
| + if test "$cross_compiling" = maybe; then |
| + cross_compiling=yes |
| + else |
| + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
| +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| +as_fn_error "cannot run C compiled programs. |
| +If you meant to cross compile, use \`--host'. |
| +See \`config.log' for more details." "$LINENO" 5; } |
| + fi |
| + fi |
| +fi |
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 |
| +$as_echo "$cross_compiling" >&6; } |
| + |
| +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out |
| +ac_clean_files=$ac_clean_files_save |
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 |
| $as_echo_n "checking for suffix of object files... " >&6; } |
| if test "${ac_cv_objext+set}" = set; then : |
| @@ -5249,13 +5276,13 @@ |
| else |
| lt_cv_nm_interface="BSD nm" |
| echo "int some_variable = 0;" > conftest.$ac_ext |
| - (eval echo "\"\$as_me:5252: $ac_compile\"" >&5) |
| + (eval echo "\"\$as_me:5279: $ac_compile\"" >&5) |
| (eval "$ac_compile" 2>conftest.err) |
| cat conftest.err >&5 |
| - (eval echo "\"\$as_me:5255: $NM \\\"conftest.$ac_objext\\\"\"" >&5) |
| + (eval echo "\"\$as_me:5282: $NM \\\"conftest.$ac_objext\\\"\"" >&5) |
| (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) |
| cat conftest.err >&5 |
| - (eval echo "\"\$as_me:5258: output\"" >&5) |
| + (eval echo "\"\$as_me:5285: output\"" >&5) |
| cat conftest.out >&5 |
| if $GREP 'External.*some_variable' conftest.out > /dev/null; then |
| lt_cv_nm_interface="MS dumpbin" |
| @@ -6460,7 +6487,7 @@ |
| ;; |
| *-*-irix6*) |
| # Find out which ABI we are using. |
| - echo '#line 6463 "configure"' > conftest.$ac_ext |
| + echo '#line 6490 "configure"' > conftest.$ac_ext |
| if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
| (eval $ac_compile) 2>&5 |
| ac_status=$? |
| @@ -7736,11 +7763,11 @@ |
| -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
| -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
| -e 's:$: $lt_compiler_flag:'` |
| - (eval echo "\"\$as_me:7739: $lt_compile\"" >&5) |
| + (eval echo "\"\$as_me:7766: $lt_compile\"" >&5) |
| (eval "$lt_compile" 2>conftest.err) |
| ac_status=$? |
| cat conftest.err >&5 |
| - echo "$as_me:7743: \$? = $ac_status" >&5 |
| + echo "$as_me:7770: \$? = $ac_status" >&5 |
| if (exit $ac_status) && test -s "$ac_outfile"; then |
| # The compiler can only warn and ignore the option if not recognized |
| # So say no if there are warnings other than the usual output. |
| @@ -8075,11 +8102,11 @@ |
| -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
| -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
| -e 's:$: $lt_compiler_flag:'` |
| - (eval echo "\"\$as_me:8078: $lt_compile\"" >&5) |
| + (eval echo "\"\$as_me:8105: $lt_compile\"" >&5) |
| (eval "$lt_compile" 2>conftest.err) |
| ac_status=$? |
| cat conftest.err >&5 |
| - echo "$as_me:8082: \$? = $ac_status" >&5 |
| + echo "$as_me:8109: \$? = $ac_status" >&5 |
| if (exit $ac_status) && test -s "$ac_outfile"; then |
| # The compiler can only warn and ignore the option if not recognized |
| # So say no if there are warnings other than the usual output. |
| @@ -8180,11 +8207,11 @@ |
| -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
| -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
| -e 's:$: $lt_compiler_flag:'` |
| - (eval echo "\"\$as_me:8183: $lt_compile\"" >&5) |
| + (eval echo "\"\$as_me:8210: $lt_compile\"" >&5) |
| (eval "$lt_compile" 2>out/conftest.err) |
| ac_status=$? |
| cat out/conftest.err >&5 |
| - echo "$as_me:8187: \$? = $ac_status" >&5 |
| + echo "$as_me:8214: \$? = $ac_status" >&5 |
| if (exit $ac_status) && test -s out/conftest2.$ac_objext |
| then |
| # The compiler can only warn and ignore the option if not recognized |
| @@ -8235,11 +8262,11 @@ |
| -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
| -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
| -e 's:$: $lt_compiler_flag:'` |
| - (eval echo "\"\$as_me:8238: $lt_compile\"" >&5) |
| + (eval echo "\"\$as_me:8265: $lt_compile\"" >&5) |
| (eval "$lt_compile" 2>out/conftest.err) |
| ac_status=$? |
| cat out/conftest.err >&5 |
| - echo "$as_me:8242: \$? = $ac_status" >&5 |
| + echo "$as_me:8269: \$? = $ac_status" >&5 |
| if (exit $ac_status) && test -s out/conftest2.$ac_objext |
| then |
| # The compiler can only warn and ignore the option if not recognized |
| @@ -10618,7 +10645,7 @@ |
| lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| lt_status=$lt_dlunknown |
| cat > conftest.$ac_ext <<_LT_EOF |
| -#line 10621 "configure" |
| +#line 10648 "configure" |
| #include "confdefs.h" |
| |
| #if HAVE_DLFCN_H |
| @@ -10714,7 +10741,7 @@ |
| lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| lt_status=$lt_dlunknown |
| cat > conftest.$ac_ext <<_LT_EOF |
| -#line 10717 "configure" |
| +#line 10744 "configure" |
| #include "confdefs.h" |
| |
| #if HAVE_DLFCN_H |
| @@ -11804,8 +11831,12 @@ |
| fi |
| fi |
| |
| -LIBXML_MIN_VERSION="2.7.4" |
| LIBXML_CONFIG="xml2-config" |
| +if test -f "$SOLARVERSION/$INPATH/bin$UPDMINOREXT/xml2-config" ; then |
| + LIBXML_CONFIG="$SOLARVERSION/$INPATH/bin$UPDMINOREXT/xml2-config" |
| +else |
| + LIBXML_CONFIG="xml2-config" |
| +fi |
| LIBXML_CFLAGS="" |
| LIBXML_LIBS="" |
| LIBXML_FOUND="no" |
| @@ -12757,12 +12788,26 @@ |
| |
| XMLSEC_NO_NSS="1" |
| MOZILLA_MIN_VERSION="1.4" |
| +if test "z$MOZ_FLAVOUR" = "zfirefox" ; then |
| + MOZILLA_MIN_VERSION="1.0" |
| +fi |
| NSS_MIN_VERSION="3.2" |
| NSPR_MIN_VERSION="4.0" |
| NSS_CFLAGS="" |
| NSS_LIBS="" |
| -NSS_LIBS_LIST="-lnss3 -lsmime3" |
| -NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4" |
| + |
| +case $host_os in |
| +cygwin* | mingw* | pw32*) |
| + NSS_LIBS_LIST="-lnss3 -lsmime3" |
| + NSPR_LIBS_LIST="-lnspr4" |
| + ;; |
| + |
| +*) |
| + NSS_LIBS_LIST="-lnss3 -lsoftokn3 -lsmime3" |
| + NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4" |
| + ;; |
| +esac |
| + |
| NSS_CRYPTO_LIB="$XMLSEC_PACKAGE-nss" |
| NSS_FOUND="no" |
| NSPR_PACKAGE=mozilla-nspr |
| @@ -12811,6 +12856,79 @@ |
| pkg_cv_NSS_CFLAGS="$NSS_CFLAGS" |
| else |
| if test -n "$PKG_CONFIG" && \ |
| + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$MOZ_FLAVOUR-nspr >= \$MOZILLA_MIN_VERSION \$MOZ_FLAVOUR >= \$MOZILLA_MIN_VERSION\""; } >&5 |
| + ($PKG_CONFIG --exists --print-errors "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION") 2>&5 |
| + ac_status=$? |
| + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| + test $ac_status = 0; }; then |
| + pkg_cv_NSS_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION" 2>/dev/null` |
| +else |
| + pkg_failed=yes |
| +fi |
| + fi |
| +else |
| + pkg_failed=untried |
| +fi |
| +if test -n "$PKG_CONFIG"; then |
| + if test -n "$NSS_LIBS"; then |
| + pkg_cv_NSS_LIBS="$NSS_LIBS" |
| + else |
| + if test -n "$PKG_CONFIG" && \ |
| + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$MOZ_FLAVOUR-nspr >= \$MOZILLA_MIN_VERSION \$MOZ_FLAVOUR >= \$MOZILLA_MIN_VERSION\""; } >&5 |
| + ($PKG_CONFIG --exists --print-errors "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION") 2>&5 |
| + ac_status=$? |
| + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
| + test $ac_status = 0; }; then |
| + pkg_cv_NSS_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION" 2>/dev/null` |
| +else |
| + pkg_failed=yes |
| +fi |
| + fi |
| +else |
| + pkg_failed=untried |
| +fi |
| + |
| + |
| + |
| +if test $pkg_failed = yes; then |
| + |
| +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
| + _pkg_short_errors_supported=yes |
| +else |
| + _pkg_short_errors_supported=no |
| +fi |
| + if test $_pkg_short_errors_supported = yes; then |
| + NSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION"` |
| + else |
| + NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION"` |
| + fi |
| + # Put the nasty error message in config.log where it belongs |
| + echo "$NSS_PKG_ERRORS" >&5 |
| + |
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| +$as_echo "no" >&6; } |
| + NSS_FOUND=no |
| +elif test $pkg_failed = untried; then |
| + NSS_FOUND=no |
| +else |
| + NSS_CFLAGS=$pkg_cv_NSS_CFLAGS |
| + NSS_LIBS=$pkg_cv_NSS_LIBS |
| + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
| +$as_echo "yes" >&6; } |
| + NSS_FOUND=yes NSPR_PACKAGE=$MOZ_FLAVOUR-nspr NSS_PACKAGE=$MOZ_FLAVOUR-nss |
| +fi |
| + fi |
| + if test "z$NSS_FOUND" = "zno" ; then |
| + |
| +pkg_failed=no |
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSS" >&5 |
| +$as_echo_n "checking for NSS... " >&6; } |
| + |
| +if test -n "$PKG_CONFIG"; then |
| + if test -n "$NSS_CFLAGS"; then |
| + pkg_cv_NSS_CFLAGS="$NSS_CFLAGS" |
| + else |
| + if test -n "$PKG_CONFIG" && \ |
| { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mozilla-nspr >= \$MOZILLA_MIN_VERSION mozilla-nss >= \$MOZILLA_MIN_VERSION\""; } >&5 |
| ($PKG_CONFIG --exists --print-errors "mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION") 2>&5 |
| ac_status=$? |
| @@ -13030,8 +13148,8 @@ |
| ac_mozilla_name=mozilla-$MOZILLA_MIN_VERSION |
| fi |
| |
| - ac_nss_lib_dir="/usr/lib /usr/lib64 /usr/local/lib /usr/lib/$ac_mozilla_name /usr/local/lib/$ac_mozilla_name" |
| - 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" |
| + ac_nss_lib_dir="${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT}" |
| + ac_nss_inc_dir="${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/mozilla" |
| |
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nspr libraries >= $NSPR_MIN_VERSION" >&5 |
| $as_echo_n "checking for nspr libraries >= $NSPR_MIN_VERSION... " >&6; } |
| @@ -13066,7 +13184,7 @@ |
| done |
| |
| for dir in $ac_nss_lib_dir ; do |
| - if test -f $dir/libnspr4$shrext ; then |
| + if test -f $dir/libnspr4.so -o -f $dir/libnspr4.dylib ; then |
| if test "z$dir" = "z/usr/lib" ; then |
| NSPR_LIBS="$NSPR_LIBS_LIST" |
| else |
| @@ -13148,7 +13266,7 @@ |
| done |
| |
| for dir in $ac_nss_lib_dir ; do |
| - if test -f $dir/libnss3$shrext ; then |
| + if test -f $dir/libnss3.so -o -f $dir/libnss3.dylib ; then |
| if test "z$dir" = "z/usr/lib" ; then |
| NSS_LIBS="$NSS_LIBS_LIST" |
| else |
| @@ -13166,7 +13284,7 @@ |
| |
| if test "z$NSS_INCLUDES_FOUND" = "zyes" -a "z$NSS_LIBS_FOUND" = "zyes" ; then |
| OLD_CPPFLAGS=$CPPFLAGS |
| - CPPFLAGS="$NSS_CFLAGS" |
| + CPPFLAGS="$NSS_CFLAGS $NSPR_CFLAGS" |
| cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| /* end confdefs.h. */ |
| |
| @@ -15036,7 +15154,7 @@ |
| # values after options handling. |
| ac_log=" |
| This file was extended by xmlsec1 $as_me 1.2.14, which was |
| -generated by GNU Autoconf 2.64. Invocation command line was |
| +generated by GNU Autoconf 2.65. Invocation command line was |
| |
| CONFIG_FILES = $CONFIG_FILES |
| CONFIG_HEADERS = $CONFIG_HEADERS |
| @@ -15076,6 +15194,7 @@ |
| |
| -h, --help print this help, then exit |
| -V, --version print version number and configuration settings, then exit |
| + --config print configuration, then exit |
| -q, --quiet, --silent |
| do not print progress messages |
| -d, --debug don't remove temporary files |
| @@ -15098,10 +15217,11 @@ |
| |
| _ACEOF |
| cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
| +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
| ac_cs_version="\\ |
| xmlsec1 config.status 1.2.14 |
| -configured by $0, generated by GNU Autoconf 2.64, |
| - with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" |
| +configured by $0, generated by GNU Autoconf 2.65, |
| + with options \\"\$ac_cs_config\\" |
| |
| Copyright (C) 2009 Free Software Foundation, Inc. |
| This config.status script is free software; the Free Software Foundation |
| @@ -15139,6 +15259,8 @@ |
| ac_cs_recheck=: ;; |
| --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) |
| $as_echo "$ac_cs_version"; exit ;; |
| + --config | --confi | --conf | --con | --co | --c ) |
| + $as_echo "$ac_cs_config"; exit ;; |
| --debug | --debu | --deb | --de | --d | -d ) |
| debug=: ;; |
| --file | --fil | --fi | --f ) |
| @@ -15606,7 +15728,7 @@ |
| t delim |
| :nl |
| h |
| -s/\(.\{148\}\).*/\1/ |
| +s/\(.\{148\}\)..*/\1/ |
| t more1 |
| s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ |
| p |
| @@ -15620,7 +15742,7 @@ |
| t nl |
| :delim |
| h |
| -s/\(.\{148\}\).*/\1/ |
| +s/\(.\{148\}\)..*/\1/ |
| t more2 |
| s/["\\]/\\&/g; s/^/"/; s/$/"/ |
| p |
| --- misc/xmlsec1-1.2.14/configure.in 2009-06-25 22:53:18.000000000 +0200 |
| +++ misc/build/xmlsec1-1.2.14/configure.in 2009-10-01 10:28:50.990755126 +0200 |
| @@ -190,8 +190,12 @@ |
| dnl ========================================================================== |
| dnl find libxml |
| dnl ========================================================================== |
| -LIBXML_MIN_VERSION="2.7.4" |
| LIBXML_CONFIG="xml2-config" |
| +if test -f "$SOLARVERSION/$INPATH/bin$UPDMINOREXT/xml2-config" ; then |
| + LIBXML_CONFIG="$SOLARVERSION/$INPATH/bin$UPDMINOREXT/xml2-config" |
| +else |
| + LIBXML_CONFIG="xml2-config" |
| +fi |
| LIBXML_CFLAGS="" |
| LIBXML_LIBS="" |
| LIBXML_FOUND="no" |
| @@ -555,12 +559,26 @@ |
| |
| XMLSEC_NO_NSS="1" |
| MOZILLA_MIN_VERSION="1.4" |
| +if test "z$MOZ_FLAVOUR" = "zfirefox" ; then |
| + MOZILLA_MIN_VERSION="1.0" |
| +fi |
| NSS_MIN_VERSION="3.2" |
| NSPR_MIN_VERSION="4.0" |
| NSS_CFLAGS="" |
| NSS_LIBS="" |
| -NSS_LIBS_LIST="-lnss3 -lsmime3" |
| -NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4" |
| + |
| +case $host_os in |
| +cygwin* | mingw* | pw32*) |
| + NSS_LIBS_LIST="-lnss3 -lsmime3" |
| + NSPR_LIBS_LIST="-lnspr4" |
| + ;; |
| + |
| +*) |
| + NSS_LIBS_LIST="-lnss3 -lsoftokn3 -lsmime3" |
| + NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4" |
| + ;; |
| +esac |
| + |
| NSS_CRYPTO_LIB="$XMLSEC_PACKAGE-nss" |
| NSS_FOUND="no" |
| NSPR_PACKAGE=mozilla-nspr |
| @@ -586,6 +604,11 @@ |
| dnl We are going to try all options |
| dnl |
| if test "z$NSS_FOUND" = "zno" ; then |
| + PKG_CHECK_MODULES(NSS, $MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION, |
| + [NSS_FOUND=yes NSPR_PACKAGE=$MOZ_FLAVOUR-nspr NSS_PACKAGE=$MOZ_FLAVOUR-nss], |
| + [NSS_FOUND=no]) |
| + fi |
| + if test "z$NSS_FOUND" = "zno" ; then |
| PKG_CHECK_MODULES(NSS, mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION, |
| [NSS_FOUND=yes NSPR_PACKAGE=mozilla-nspr NSS_PACKAGE=mozilla-nss], |
| [NSS_FOUND=no]) |
| @@ -612,8 +635,8 @@ |
| ac_mozilla_name=mozilla-$MOZILLA_MIN_VERSION |
| fi |
| |
| - ac_nss_lib_dir="/usr/lib /usr/lib64 /usr/local/lib /usr/lib/$ac_mozilla_name /usr/local/lib/$ac_mozilla_name" |
| - 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" |
| + ac_nss_lib_dir="${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT}" |
| + ac_nss_inc_dir="${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/mozilla" |
| |
| AC_MSG_CHECKING(for nspr libraries >= $NSPR_MIN_VERSION) |
| NSPR_INCLUDES_FOUND="no" |
| @@ -648,7 +671,7 @@ |
| done |
| |
| for dir in $ac_nss_lib_dir ; do |
| - if test -f $dir/libnspr4$shrext ; then |
| + if test -f $dir/libnspr4.so -o -f $dir/libnspr4.dylib ; then |
| dnl do not add -L/usr/lib because compiler does it anyway |
| if test "z$dir" = "z/usr/lib" ; then |
| NSPR_LIBS="$NSPR_LIBS_LIST" |
| @@ -719,7 +742,7 @@ |
| done |
| |
| for dir in $ac_nss_lib_dir ; do |
| - if test -f $dir/libnss3$shrext ; then |
| + if test -f $dir/libnss3.so -o -f $dir/libnss3.dylib ; then |
| dnl do not add -L/usr/lib because compiler does it anyway |
| if test "z$dir" = "z/usr/lib" ; then |
| NSS_LIBS="$NSS_LIBS_LIST" |
| @@ -738,7 +761,7 @@ |
| |
| if test "z$NSS_INCLUDES_FOUND" = "zyes" -a "z$NSS_LIBS_FOUND" = "zyes" ; then |
| OLD_CPPFLAGS=$CPPFLAGS |
| - CPPFLAGS="$NSS_CFLAGS" |
| + CPPFLAGS="$NSS_CFLAGS $NSPR_CFLAGS" |
| AC_EGREP_CPP(yes,[ |
| #include <nss.h> |
| #if NSS_VMAJOR >= 3 && NSS_VMINOR >= 2 |
| --- misc/xmlsec1-1.2.14/win32/Makefile.msvc 2009-06-25 22:53:18.000000000 +0200 |
| +++ misc/build/xmlsec1-1.2.14/win32/Makefile.msvc 2009-10-01 10:28:50.997747312 +0200 |
| @@ -376,7 +376,7 @@ |
| XMLSEC_OPENSSL_SOLIBS = libeay32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib |
| XMLSEC_OPENSSL_ALIBS = libeay32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib |
| |
| -XMLSEC_NSS_SOLIBS = smime3.lib ssl3.lib nss3.lib libnspr4.lib libplds4.lib libplc4.lib kernel32.lib user32.lib gdi32.lib |
| +XMLSEC_NSS_SOLIBS = smime3.lib nss3.lib nspr4.lib kernel32.lib user32.lib gdi32.lib |
| XMLSEC_NSS_ALIBS = smime3.lib ssl3.lib nss3.lib libnspr4_s.lib libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib |
| |
| XMLSEC_MSCRYPTO_SOLIBS = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib |
