libxmlsec/xmlsec1-configure.patch

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