From 967db880652c8eed947e5a05a694e64a89422f8a Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 26 May 2008 16:28:09 +0000 Subject: [PATCH] - Update to 0.19.1 --- .cvsignore | 2 +- devhelp-0.19-xulrunner.patch | 2812 ++++++++++++++++++++++++++-------- devhelp.spec | 9 +- sources | 2 +- 4 files changed, 2159 insertions(+), 666 deletions(-) diff --git a/.cvsignore b/.cvsignore index 45c953f..90a1b06 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -devhelp-0.19.tar.bz2 +devhelp-0.19.1.tar.bz2 diff --git a/devhelp-0.19-xulrunner.patch b/devhelp-0.19-xulrunner.patch index 69b90d6..a5bb66f 100644 --- a/devhelp-0.19-xulrunner.patch +++ b/devhelp-0.19-xulrunner.patch @@ -1,6 +1,2154 @@ -diff -up devhelp-0.19/m4/gecko.m4.xl devhelp-0.19/m4/gecko.m4 ---- devhelp-0.19/m4/gecko.m4.xl 2007-02-13 09:34:26.000000000 +0100 -+++ devhelp-0.19/m4/gecko.m4 2008-02-26 12:10:21.000000000 +0100 +diff -up devhelp-0.19.1/configure.in.xulrunner devhelp-0.19.1/configure.in +--- devhelp-0.19.1/configure.in.xulrunner 2008-05-25 12:56:13.000000000 -0400 ++++ devhelp-0.19.1/configure.in 2008-05-26 12:18:07.000000000 -0400 +@@ -73,6 +73,7 @@ AC_SUBST([GECKO_INCLUDE_ROOT]) + AC_SUBST([GECKO_HOME]) + AC_SUBST([GECKO_PREFIX]) + AC_SUBST([GECKO_EXTRA_LIBS]) ++AC_SUBST([GECKO_XPCOM]) + + case "$GECKO" in + mozilla) gecko_min_version=1.7 ;; +@@ -80,9 +81,10 @@ seamonkey) gecko_min_version=1.0 ;; + *firefox) gecko_min_version=1.0 ;; + *thunderbird) gecko_min_version=1.0 ;; + xulrunner) gecko_min_version=1.8 ;; ++libxul*) gecko_min_version=1.9 ;; + esac + +-PKG_CHECK_MODULES([GECKO],[$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version]) ++PKG_CHECK_MODULES([GECKO],[$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO_XPCOM >= $gecko_min_version]) + AC_SUBST([GECKO_CFLAGS]) + AC_SUBST([GECKO_LIBS]) + +diff -up devhelp-0.19.1/configure.xulrunner devhelp-0.19.1/configure +--- devhelp-0.19.1/configure.xulrunner 2008-05-25 12:56:28.000000000 -0400 ++++ devhelp-0.19.1/configure 2008-05-26 12:19:15.000000000 -0400 +@@ -869,8 +869,6 @@ LN_S + ECHO + AR + RANLIB +-DSYMUTIL +-NMEDIT + CXXCPP + F77 + FFLAGS +@@ -945,6 +943,7 @@ GECKO_INCLUDE_ROOT + GECKO_HOME + GECKO_PREFIX + GECKO_EXTRA_LIBS ++GECKO_XPCOM + GECKO_CFLAGS + GECKO_LIBS + GECKO_WARN_CXXFLAGS +@@ -1600,7 +1599,7 @@ Optional Packages: + --with-gconf-source=sourceaddress Config database for installing schema files. + --with-gconf-schema-file-dir=dir Directory for installing schema files. + --with-compile-warnings=no/yes/error Compiler warnings +- --with-gecko[=mozilla|firefox|seamonkey|xulrunner] ++ --with-gecko[=mozilla|firefox|seamonkey|xulrunner|libxul] + Which gecko engine to use (autodetected by default) + + --with-zlib=DIR use libz in DIR +@@ -5265,7 +5264,7 @@ lt_cv_deplibs_check_method='unknown' + # whether `pass_all' will *always* work, you probably want this one. + + case $host_os in +-aix[4-9]*) ++aix4* | aix5*) + lt_cv_deplibs_check_method=pass_all + ;; + +@@ -5360,7 +5359,7 @@ linux* | k*bsd*-gnu) + lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd* | netbsdelf*-gnu) ++netbsd*) + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + else +@@ -5480,7 +5479,7 @@ ia64-*-hpux*) + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 5483 "configure"' > conftest.$ac_ext ++ echo '#line 5482 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -5545,6 +5544,7 @@ s390*-*linux*|sparc*-*linux*) + esac + ;; + *64-bit*) ++ libsuff=64 + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" +@@ -5652,11 +5652,7 @@ sparc*-*solaris*) + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; +- *) +- if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then +- LD="${LD-ld} -64" +- fi +- ;; ++ *) LD="${LD-ld} -64" ;; + esac + ;; + esac +@@ -6381,6 +6377,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! ++ + # find the maximum length of command line arguments + { echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 + echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } +@@ -6695,7 +6692,7 @@ EOF + echo "$progname: failed program was:" >&5 + cat conftest.$ac_ext >&5 + fi +- rm -rf conftest* conftst* ++ rm -f conftest* conftst* + + # Do not use the global_symbol_pipe unless it works. + if test "$pipe_works" = yes; then +@@ -7255,318 +7252,6 @@ fi + ;; + esac + +- +- case $host_os in +- rhapsody* | darwin*) +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. +-set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$DSYMUTIL"; then +- ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +-fi +-fi +-DSYMUTIL=$ac_cv_prog_DSYMUTIL +-if test -n "$DSYMUTIL"; then +- { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 +-echo "${ECHO_T}$DSYMUTIL" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- +- +-fi +-if test -z "$ac_cv_prog_DSYMUTIL"; then +- ac_ct_DSYMUTIL=$DSYMUTIL +- # Extract the first word of "dsymutil", so it can be a program name with args. +-set dummy dsymutil; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$ac_ct_DSYMUTIL"; then +- ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +-fi +-fi +-ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL +-if test -n "$ac_ct_DSYMUTIL"; then +- { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 +-echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- +- if test "x$ac_ct_DSYMUTIL" = x; then +- DSYMUTIL=":" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&5 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&2;} +-ac_tool_warned=yes ;; +-esac +- DSYMUTIL=$ac_ct_DSYMUTIL +- fi +-else +- DSYMUTIL="$ac_cv_prog_DSYMUTIL" +-fi +- +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. +-set dummy ${ac_tool_prefix}nmedit; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_NMEDIT+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$NMEDIT"; then +- ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +-fi +-fi +-NMEDIT=$ac_cv_prog_NMEDIT +-if test -n "$NMEDIT"; then +- { echo "$as_me:$LINENO: result: $NMEDIT" >&5 +-echo "${ECHO_T}$NMEDIT" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- +- +-fi +-if test -z "$ac_cv_prog_NMEDIT"; then +- ac_ct_NMEDIT=$NMEDIT +- # Extract the first word of "nmedit", so it can be a program name with args. +-set dummy nmedit; ac_word=$2 +-{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$ac_ct_NMEDIT"; then +- ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_ac_ct_NMEDIT="nmedit" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +-fi +-fi +-ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT +-if test -n "$ac_ct_NMEDIT"; then +- { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 +-echo "${ECHO_T}$ac_ct_NMEDIT" >&6; } +-else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- +- if test "x$ac_ct_NMEDIT" = x; then +- NMEDIT=":" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&5 +-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +-whose name does not start with the host triplet. If you think this +-configuration is useful to you, please write to autoconf@gnu.org." >&2;} +-ac_tool_warned=yes ;; +-esac +- NMEDIT=$ac_ct_NMEDIT +- fi +-else +- NMEDIT="$ac_cv_prog_NMEDIT" +-fi +- +- +- { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 +-echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; } +-if test "${lt_cv_apple_cc_single_mod+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- lt_cv_apple_cc_single_mod=no +- if test -z "${LT_MULTI_MODULE}"; then +- # By default we will add the -single_module flag. You can override +- # by either setting the environment variable LT_MULTI_MODULE +- # non-empty at configure time, or by adding -multi_module to the +- # link flags. +- echo "int foo(void){return 1;}" > conftest.c +- $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +- -dynamiclib ${wl}-single_module conftest.c +- if test -f libconftest.dylib; then +- lt_cv_apple_cc_single_mod=yes +- rm -rf libconftest.dylib* +- fi +- rm conftest.c +- fi +-fi +-{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 +-echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; } +- { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 +-echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; } +-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- lt_cv_ld_exported_symbols_list=no +- save_LDFLAGS=$LDFLAGS +- echo "_main" > conftest.sym +- LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && +- $as_test_x conftest$ac_exeext; then +- lt_cv_ld_exported_symbols_list=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- lt_cv_ld_exported_symbols_list=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +- LDFLAGS="$save_LDFLAGS" +- +-fi +-{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 +-echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; } +- case $host_os in +- rhapsody* | darwin1.[0123]) +- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; +- darwin1.*) +- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; +- darwin*) +- # if running on 10.5 or later, the deployment target defaults +- # to the OS version, if on x86, and 10.4, the deployment +- # target defaults to 10.4. Don't you love it? +- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in +- 10.0,*86*-darwin8*|10.0,*-darwin[91]*) +- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; +- 10.[012]*) +- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; +- 10.*) +- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; +- esac +- ;; +- esac +- if test "$lt_cv_apple_cc_single_mod" = "yes"; then +- _lt_dar_single_mod='$single_module' +- fi +- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then +- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' +- else +- _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" +- fi +- if test "$DSYMUTIL" != ":"; then +- _lt_dsymutil="~$DSYMUTIL \$lib || :" +- else +- _lt_dsymutil= +- fi +- ;; +- esac +- +- + enable_dlopen=no + enable_win32_dll=no + +@@ -7632,7 +7317,7 @@ ac_outfile=conftest.$ac_objext + echo "$lt_simple_link_test_code" >conftest.$ac_ext + eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_linker_boilerplate=`cat conftest.err` +-$rm -r conftest* ++$rm conftest* + + + +@@ -7660,11 +7345,11 @@ else + -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:7663: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7348: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:7667: \$? = $ac_status" >&5 ++ echo "$as_me:7352: \$? = $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. +@@ -7934,10 +7619,10 @@ if test -n "$lt_prog_compiler_pic"; then + + { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 + echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } +-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then ++if test "${lt_prog_compiler_pic_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- lt_cv_prog_compiler_pic_works=no ++ lt_prog_compiler_pic_works=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" +@@ -7950,27 +7635,27 @@ else + -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:7953: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7638: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:7957: \$? = $ac_status" >&5 ++ echo "$as_me:7642: \$? = $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. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then +- lt_cv_prog_compiler_pic_works=yes ++ lt_prog_compiler_pic_works=yes + fi + fi + $rm conftest* + + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 +-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 ++echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; } + +-if test x"$lt_cv_prog_compiler_pic_works" = xyes; then ++if test x"$lt_prog_compiler_pic_works" = xyes; then + case $lt_prog_compiler_pic in + "" | " "*) ;; + *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; +@@ -7997,10 +7682,10 @@ esac + wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" + { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 + echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } +-if test "${lt_cv_prog_compiler_static_works+set}" = set; then ++if test "${lt_prog_compiler_static_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- lt_cv_prog_compiler_static_works=no ++ lt_prog_compiler_static_works=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$lt_simple_link_test_code" > conftest.$ac_ext +@@ -8013,20 +7698,20 @@ else + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then +- lt_cv_prog_compiler_static_works=yes ++ lt_prog_compiler_static_works=yes + fi + else +- lt_cv_prog_compiler_static_works=yes ++ lt_prog_compiler_static_works=yes + fi + fi +- $rm -r conftest* ++ $rm conftest* + LDFLAGS="$save_LDFLAGS" + + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 +-echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 ++echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; } + +-if test x"$lt_cv_prog_compiler_static_works" = xyes; then ++if test x"$lt_prog_compiler_static_works" = xyes; then + : + else + lt_prog_compiler_static= +@@ -8054,11 +7739,11 @@ else + -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:8057: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7742: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:8061: \$? = $ac_status" >&5 ++ echo "$as_me:7746: \$? = $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 +@@ -8138,13 +7823,12 @@ echo $ECHO_N "checking whether the $comp + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. +- exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' ++ exclude_expsyms="_GLOBAL_OFFSET_TABLE_" + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. +- # Exclude shared library initialization/finalization symbols. + extract_expsyms_cmds= + # Just being paranoid about ensuring that cc_basename is set. + for cc_temp in $compiler""; do +@@ -8203,7 +7887,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed - + + # See if GNU ld supports shared libraries. + case $host_os in +- aix[3-9]*) ++ aix3* | aix4* | aix5*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + ld_shlibs=no +@@ -8319,13 +8003,12 @@ EOF + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi +- link_all_deplibs=no + else + ld_shlibs=no + fi + ;; + +- netbsd* | netbsdelf*-gnu) ++ netbsd*) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -8423,7 +8106,7 @@ _LT_EOF + fi + ;; + +- aix[4-9]*) ++ aix4* | aix5*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. +@@ -8443,7 +8126,7 @@ _LT_EOF + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. +- case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) ++ case $host_os in aix4.[23]|aix4.[23].*|aix5*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes +@@ -8715,10 +8398,11 @@ if test -z "$aix_libpath"; then aix_libp + link_all_deplibs=yes + if test "$GCC" = yes ; then + output_verbose_link_cmd='echo' +- archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" +- module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" +- module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' ++ module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' ++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds ++ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + case $cc_basename in + xlc*) +@@ -8868,7 +8552,7 @@ if test -z "$aix_libpath"; then aix_libp + link_all_deplibs=yes + ;; + +- netbsd* | netbsdelf*-gnu) ++ netbsd*) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -9238,7 +8922,7 @@ aix3*) + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +-aix[4-9]*) ++aix4* | aix5*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -9563,11 +9247,13 @@ linux* | k*bsd*-gnu) + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes ++ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" ++ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -9579,18 +9265,6 @@ linux* | k*bsd*-gnu) + dynamic_linker='GNU/Linux ld.so' + ;; + +-netbsdelf*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='NetBSD ld.elf_so' +- ;; +- + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -9772,21 +9446,6 @@ esac + echo "${ECHO_T}$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + +-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" +-fi +- +-sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" +-fi +- +-sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" +- + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" + if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +@@ -10106,7 +9765,7 @@ fi + { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 + echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } + if test $ac_cv_lib_dld_shl_load = yes; then +- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" ++ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" + else + { echo "$as_me:$LINENO: checking for dlopen" >&5 + echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } +@@ -10382,7 +10041,7 @@ fi + { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 + echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } + if test $ac_cv_lib_dld_dld_link = yes; then +- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" ++ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" + fi + + +@@ -10431,7 +10090,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < conftest.$ac_ext <&6;} + # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) + # NOTE: Changes made to this file will be lost: look at ltmain.sh. + # +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 + # Free Software Foundation, Inc. + # + # This file is part of GNU Libtool: +@@ -11011,10 +10669,6 @@ predeps=$lt_predeps + # shared library. + postdeps=$lt_postdeps + +-# The directories searched by this compiler when creating a shared +-# library +-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs +- + # The library search path used internally by the compiler when linking + # a shared library. + compiler_lib_search_path=$lt_compiler_lib_search_path +@@ -11263,7 +10917,6 @@ postdep_objects_CXX= + predeps_CXX= + postdeps_CXX= + compiler_lib_search_path_CXX= +-compiler_lib_search_dirs_CXX= + + # Source file extension for C++ test sources. + ac_ext=cpp +@@ -11301,7 +10954,7 @@ ac_outfile=conftest.$ac_objext + echo "$lt_simple_link_test_code" >conftest.$ac_ext + eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_linker_boilerplate=`cat conftest.err` +-$rm -r conftest* ++$rm conftest* + + + # Allow CC to be a program name with arguments. +@@ -11508,7 +11161,7 @@ case $host_os in + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; +- aix[4-9]*) ++ aix4* | aix5*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. +@@ -11521,7 +11174,7 @@ case $host_os in + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. +- case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) ++ case $host_os in aix4.[23]|aix4.[23].*|aix5*) + for ld_flag in $LDFLAGS; do + case $ld_flag in + *-brtl*) +@@ -11779,23 +11432,51 @@ if test -z "$aix_libpath"; then aix_libp + fi + ;; + darwin* | rhapsody*) ++ case $host_os in ++ rhapsody* | darwin1.[012]) ++ allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress' ++ ;; ++ *) # Darwin 1.3 on ++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then ++ allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ++ else ++ case ${MACOSX_DEPLOYMENT_TARGET} in ++ 10.[012]) ++ allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ++ ;; ++ 10.*) ++ allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup' ++ ;; ++ esac ++ fi ++ ;; ++ esac + archive_cmds_need_lc_CXX=no + hardcode_direct_CXX=no + hardcode_automatic_CXX=yes + hardcode_shlibpath_var_CXX=unsupported + whole_archive_flag_spec_CXX='' + link_all_deplibs_CXX=yes +- allow_undefined_flag_CXX="$_lt_dar_allow_undefined" +- if test "$GXX" = yes ; then ++ ++ if test "$GXX" = yes ; then ++ lt_int_apple_cc_single_mod=no + output_verbose_link_cmd='echo' +- archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" +- module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" +- module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" +- if test "$lt_cv_apple_cc_single_mod" != "yes"; then +- archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" +- archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" ++ if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then ++ lt_int_apple_cc_single_mod=yes + fi ++ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then ++ archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' ++ else ++ archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' ++ fi ++ module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' ++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds ++ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then ++ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ else ++ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ fi ++ module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + case $cc_basename in + xlc*) +@@ -12046,7 +11727,7 @@ if test -z "$aix_libpath"; then aix_libp + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + ;; +- pgCC* | pgcpp*) ++ pgCC*) + # Portland Group C++ compiler + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' +@@ -12119,7 +11800,7 @@ if test -z "$aix_libpath"; then aix_libp + ;; + esac + ;; +- netbsd* | netbsdelf*-gnu) ++ netbsd*) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= +@@ -12453,6 +12134,7 @@ test "$ld_shlibs_CXX" = no && can_build_ + GCC_CXX="$GXX" + LD_CXX="$LD" + ++ + cat > conftest.$ac_ext <&5 + echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } +-if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then ++if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- lt_cv_prog_compiler_pic_works_CXX=no ++ lt_prog_compiler_pic_works_CXX=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" +@@ -12932,27 +12610,27 @@ else + -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:12935: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:12613: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:12939: \$? = $ac_status" >&5 ++ echo "$as_me:12617: \$? = $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. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then +- lt_cv_prog_compiler_pic_works_CXX=yes ++ lt_prog_compiler_pic_works_CXX=yes + fi + fi + $rm conftest* + + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 +-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 ++echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; } + +-if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then ++if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then + case $lt_prog_compiler_pic_CXX in + "" | " "*) ;; + *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; +@@ -12979,10 +12657,10 @@ esac + wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" + { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 + echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } +-if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then ++if test "${lt_prog_compiler_static_works_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- lt_cv_prog_compiler_static_works_CXX=no ++ lt_prog_compiler_static_works_CXX=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$lt_simple_link_test_code" > conftest.$ac_ext +@@ -12995,20 +12673,20 @@ else + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then +- lt_cv_prog_compiler_static_works_CXX=yes ++ lt_prog_compiler_static_works_CXX=yes + fi + else +- lt_cv_prog_compiler_static_works_CXX=yes ++ lt_prog_compiler_static_works_CXX=yes + fi + fi +- $rm -r conftest* ++ $rm conftest* + LDFLAGS="$save_LDFLAGS" + + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 +-echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 ++echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; } + +-if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then ++if test x"$lt_prog_compiler_static_works_CXX" = xyes; then + : + else + lt_prog_compiler_static_CXX= +@@ -13036,11 +12714,11 @@ else + -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:13039: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:12717: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:13043: \$? = $ac_status" >&5 ++ echo "$as_me:12721: \$? = $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 +@@ -13093,7 +12771,7 @@ echo $ECHO_N "checking whether the $comp + + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + case $host_os in +- aix[4-9]*) ++ aix4* | aix5*) + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + if $NM -V 2>&1 | grep 'GNU' > /dev/null; then +@@ -13108,14 +12786,10 @@ echo $ECHO_N "checking whether the $comp + cygwin* | mingw*) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + ;; +- linux* | k*bsd*-gnu) +- link_all_deplibs_CXX=no +- ;; + *) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; + esac +- exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' + + { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 + echo "${ECHO_T}$ld_shlibs_CXX" >&6; } +@@ -13217,7 +12891,7 @@ aix3*) + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +-aix[4-9]*) ++aix4* | aix5*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -13541,11 +13215,13 @@ linux* | k*bsd*-gnu) + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes ++ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" ++ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -13557,18 +13233,6 @@ linux* | k*bsd*-gnu) + dynamic_linker='GNU/Linux ld.so' + ;; + +-netbsdelf*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='NetBSD ld.elf_so' +- ;; +- + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -13750,21 +13414,6 @@ esac + echo "${ECHO_T}$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + +-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" +-fi +- +-sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" +-fi +- +-sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" +- + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" + if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +@@ -13848,7 +13497,6 @@ if test -f "$ltmain"; then + predeps_CXX \ + postdeps_CXX \ + compiler_lib_search_path_CXX \ +- compiler_lib_search_dirs_CXX \ + archive_cmds_CXX \ + archive_expsym_cmds_CXX \ + postinstall_cmds_CXX \ +@@ -14097,10 +13745,6 @@ predeps=$lt_predeps_CXX + # shared library. + postdeps=$lt_postdeps_CXX + +-# The directories searched by this compiler when creating a shared +-# library +-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX +- + # The library search path used internally by the compiler when linking + # a shared library. + compiler_lib_search_path=$lt_compiler_lib_search_path_CXX +@@ -14315,7 +13959,7 @@ ac_outfile=conftest.$ac_objext + echo "$lt_simple_link_test_code" >conftest.$ac_ext + eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_linker_boilerplate=`cat conftest.err` +-$rm -r conftest* ++$rm conftest* + + + # Allow CC to be a program name with arguments. +@@ -14353,7 +13997,7 @@ aix3*) + postinstall_cmds='$RANLIB $lib' + fi + ;; +-aix[4-9]*) ++aix4* | aix5*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi +@@ -14618,10 +14262,10 @@ if test -n "$lt_prog_compiler_pic_F77"; + + { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 + echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } +-if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then ++if test "${lt_prog_compiler_pic_works_F77+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- lt_cv_prog_compiler_pic_works_F77=no ++ lt_prog_compiler_pic_works_F77=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic_F77" +@@ -14634,27 +14278,27 @@ else + -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:14637: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14281: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:14641: \$? = $ac_status" >&5 ++ echo "$as_me:14285: \$? = $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. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then +- lt_cv_prog_compiler_pic_works_F77=yes ++ lt_prog_compiler_pic_works_F77=yes + fi + fi + $rm conftest* + + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5 +-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 ++echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; } + +-if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then ++if test x"$lt_prog_compiler_pic_works_F77" = xyes; then + case $lt_prog_compiler_pic_F77 in + "" | " "*) ;; + *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;; +@@ -14681,10 +14325,10 @@ esac + wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" + { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 + echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } +-if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then ++if test "${lt_prog_compiler_static_works_F77+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- lt_cv_prog_compiler_static_works_F77=no ++ lt_prog_compiler_static_works_F77=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$lt_simple_link_test_code" > conftest.$ac_ext +@@ -14697,20 +14341,20 @@ else + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then +- lt_cv_prog_compiler_static_works_F77=yes ++ lt_prog_compiler_static_works_F77=yes + fi + else +- lt_cv_prog_compiler_static_works_F77=yes ++ lt_prog_compiler_static_works_F77=yes + fi + fi +- $rm -r conftest* ++ $rm conftest* + LDFLAGS="$save_LDFLAGS" + + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5 +-echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 ++echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; } + +-if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then ++if test x"$lt_prog_compiler_static_works_F77" = xyes; then + : + else + lt_prog_compiler_static_F77= +@@ -14738,11 +14382,11 @@ else + -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:14741: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14385: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:14745: \$? = $ac_status" >&5 ++ echo "$as_me:14389: \$? = $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 +@@ -14822,13 +14466,12 @@ echo $ECHO_N "checking whether the $comp + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. +- exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' ++ exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_" + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. +- # Exclude shared library initialization/finalization symbols. + extract_expsyms_cmds= + # Just being paranoid about ensuring that cc_basename is set. + for cc_temp in $compiler""; do +@@ -14887,7 +14530,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed - + + # See if GNU ld supports shared libraries. + case $host_os in +- aix[3-9]*) ++ aix3* | aix4* | aix5*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + ld_shlibs_F77=no +@@ -15003,13 +14646,12 @@ EOF + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi +- link_all_deplibs_F77=no + else + ld_shlibs_F77=no + fi + ;; + +- netbsd* | netbsdelf*-gnu) ++ netbsd*) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -15107,7 +14749,7 @@ _LT_EOF + fi + ;; + +- aix[4-9]*) ++ aix4* | aix5*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. +@@ -15127,7 +14769,7 @@ _LT_EOF + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. +- case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) ++ case $host_os in aix4.[23]|aix4.[23].*|aix5*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes +@@ -15379,10 +15021,11 @@ if test -z "$aix_libpath"; then aix_libp + link_all_deplibs_F77=yes + if test "$GCC" = yes ; then + output_verbose_link_cmd='echo' +- archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" +- module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" +- module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' ++ module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' ++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds ++ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + case $cc_basename in + xlc*) +@@ -15532,7 +15175,7 @@ if test -z "$aix_libpath"; then aix_libp + link_all_deplibs_F77=yes + ;; + +- netbsd* | netbsdelf*-gnu) ++ netbsd*) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -15851,7 +15494,7 @@ aix3*) + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +-aix[4-9]*) ++aix4* | aix5*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -16175,11 +15818,13 @@ linux* | k*bsd*-gnu) + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes ++ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" ++ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -16191,18 +15836,6 @@ linux* | k*bsd*-gnu) + dynamic_linker='GNU/Linux ld.so' + ;; + +-netbsdelf*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='NetBSD ld.elf_so' +- ;; +- + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -16384,21 +16017,6 @@ esac + echo "${ECHO_T}$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + +-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" +-fi +- +-sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" +-fi +- +-sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" +- + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" + if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +@@ -16482,7 +16100,6 @@ if test -f "$ltmain"; then + predeps_F77 \ + postdeps_F77 \ + compiler_lib_search_path_F77 \ +- compiler_lib_search_dirs_F77 \ + archive_cmds_F77 \ + archive_expsym_cmds_F77 \ + postinstall_cmds_F77 \ +@@ -16731,10 +16348,6 @@ predeps=$lt_predeps_F77 + # shared library. + postdeps=$lt_postdeps_F77 + +-# The directories searched by this compiler when creating a shared +-# library +-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77 +- + # The library search path used internally by the compiler when linking + # a shared library. + compiler_lib_search_path=$lt_compiler_lib_search_path_F77 +@@ -16909,7 +16522,7 @@ ac_outfile=conftest.$ac_objext + echo "$lt_simple_link_test_code" >conftest.$ac_ext + eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_linker_boilerplate=`cat conftest.err` +-$rm -r conftest* ++$rm conftest* + + + # Allow CC to be a program name with arguments. +@@ -16958,11 +16571,11 @@ else + -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:16961: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16574: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:16965: \$? = $ac_status" >&5 ++ echo "$as_me:16578: \$? = $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. +@@ -17022,7 +16635,7 @@ echo $ECHO_N "checking for $compiler opt + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries +- ++ lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' + ;; + + darwin* | rhapsody*) +@@ -17092,7 +16705,7 @@ echo $ECHO_N "checking for $compiler opt + mingw* | cygwin* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). +- ++ lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' + ;; + + hpux9* | hpux10* | hpux11*) +@@ -17232,10 +16845,10 @@ if test -n "$lt_prog_compiler_pic_GCJ"; + + { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 + echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } +-if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then ++if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- lt_cv_prog_compiler_pic_works_GCJ=no ++ lt_prog_compiler_pic_works_GCJ=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic_GCJ" +@@ -17248,27 +16861,27 @@ else + -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:17251: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16864: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:17255: \$? = $ac_status" >&5 ++ echo "$as_me:16868: \$? = $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. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then +- lt_cv_prog_compiler_pic_works_GCJ=yes ++ lt_prog_compiler_pic_works_GCJ=yes + fi + fi + $rm conftest* + + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5 +-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 ++echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; } + +-if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then ++if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then + case $lt_prog_compiler_pic_GCJ in + "" | " "*) ;; + *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;; +@@ -17295,10 +16908,10 @@ esac + wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" + { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 + echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } +-if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then ++if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- lt_cv_prog_compiler_static_works_GCJ=no ++ lt_prog_compiler_static_works_GCJ=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$lt_simple_link_test_code" > conftest.$ac_ext +@@ -17311,20 +16924,20 @@ else + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then +- lt_cv_prog_compiler_static_works_GCJ=yes ++ lt_prog_compiler_static_works_GCJ=yes + fi + else +- lt_cv_prog_compiler_static_works_GCJ=yes ++ lt_prog_compiler_static_works_GCJ=yes + fi + fi +- $rm -r conftest* ++ $rm conftest* + LDFLAGS="$save_LDFLAGS" + + fi +-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5 +-echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 ++echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; } + +-if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then ++if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then + : + else + lt_prog_compiler_static_GCJ= +@@ -17352,11 +16965,11 @@ else + -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:17355: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16968: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:17359: \$? = $ac_status" >&5 ++ echo "$as_me:16972: \$? = $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 +@@ -17436,13 +17049,12 @@ echo $ECHO_N "checking whether the $comp + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. +- exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' ++ exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_" + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. +- # Exclude shared library initialization/finalization symbols. + extract_expsyms_cmds= + # Just being paranoid about ensuring that cc_basename is set. + for cc_temp in $compiler""; do +@@ -17501,7 +17113,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed - + + # See if GNU ld supports shared libraries. + case $host_os in +- aix[3-9]*) ++ aix3* | aix4* | aix5*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + ld_shlibs_GCJ=no +@@ -17617,13 +17229,12 @@ EOF + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi +- link_all_deplibs_GCJ=no + else + ld_shlibs_GCJ=no + fi + ;; + +- netbsd* | netbsdelf*-gnu) ++ netbsd*) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -17721,7 +17332,7 @@ _LT_EOF + fi + ;; + +- aix[4-9]*) ++ aix4* | aix5*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. +@@ -17741,7 +17352,7 @@ _LT_EOF + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. +- case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) ++ case $host_os in aix4.[23]|aix4.[23].*|aix5*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes +@@ -18013,10 +17624,11 @@ if test -z "$aix_libpath"; then aix_libp + link_all_deplibs_GCJ=yes + if test "$GCC" = yes ; then + output_verbose_link_cmd='echo' +- archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" +- module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" +- module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' ++ module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' ++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds ++ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + case $cc_basename in + xlc*) +@@ -18166,7 +17778,7 @@ if test -z "$aix_libpath"; then aix_libp + link_all_deplibs_GCJ=yes + ;; + +- netbsd* | netbsdelf*-gnu) ++ netbsd*) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -18485,7 +18097,7 @@ aix3*) + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +-aix[4-9]*) ++aix4* | aix5*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -18809,11 +18421,13 @@ linux* | k*bsd*-gnu) + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes ++ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" ++ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -18825,18 +18439,6 @@ linux* | k*bsd*-gnu) + dynamic_linker='GNU/Linux ld.so' + ;; + +-netbsdelf*-gnu) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- dynamic_linker='NetBSD ld.elf_so' +- ;; +- + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -19018,21 +18620,6 @@ esac + echo "${ECHO_T}$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + +-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" +-fi +- +-sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" +-fi +- +-sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" +- + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" + if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +@@ -19116,7 +18703,6 @@ if test -f "$ltmain"; then + predeps_GCJ \ + postdeps_GCJ \ + compiler_lib_search_path_GCJ \ +- compiler_lib_search_dirs_GCJ \ + archive_cmds_GCJ \ + archive_expsym_cmds_GCJ \ + postinstall_cmds_GCJ \ +@@ -19365,10 +18951,6 @@ predeps=$lt_predeps_GCJ + # shared library. + postdeps=$lt_postdeps_GCJ + +-# The directories searched by this compiler when creating a shared +-# library +-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ +- + # The library search path used internally by the compiler when linking + # a shared library. + compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ +@@ -19542,7 +19124,7 @@ ac_outfile=conftest.$ac_objext + echo "$lt_simple_link_test_code" >conftest.$ac_ext + eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err + _lt_linker_boilerplate=`cat conftest.err` +-$rm -r conftest* ++$rm conftest* + + + # Allow CC to be a program name with arguments. +@@ -19602,7 +19184,6 @@ if test -f "$ltmain"; then + predeps_RC \ + postdeps_RC \ + compiler_lib_search_path_RC \ +- compiler_lib_search_dirs_RC \ + archive_cmds_RC \ + archive_expsym_cmds_RC \ + postinstall_cmds_RC \ +@@ -19851,10 +19432,6 @@ predeps=$lt_predeps_RC + # shared library. + postdeps=$lt_postdeps_RC + +-# The directories searched by this compiler when creating a shared +-# library +-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC +- + # The library search path used internally by the compiler when linking + # a shared library. + compiler_lib_search_path=$lt_compiler_lib_search_path_RC +@@ -21195,11 +20772,10 @@ pkg_failed=no + { echo "$as_me:$LINENO: checking for DEVHELP" >&5 + echo $ECHO_N "checking for DEVHELP... $ECHO_C" >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$DEVHELP_CFLAGS"; then +- pkg_cv_DEVHELP_CFLAGS="$DEVHELP_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$DEVHELP_CFLAGS"; then ++ pkg_cv_DEVHELP_CFLAGS="$DEVHELP_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + gtk+-2.0 >= 2.8.0 + \$gconf_pkgconfig +@@ -21218,15 +20794,13 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$DEVHELP_LIBS"; then +- pkg_cv_DEVHELP_LIBS="$DEVHELP_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$DEVHELP_LIBS"; then ++ pkg_cv_DEVHELP_LIBS="$DEVHELP_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + gtk+-2.0 >= 2.8.0 + \$gconf_pkgconfig +@@ -21245,9 +20819,8 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -21260,15 +20833,15 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- DEVHELP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " ++ DEVHELP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " + gtk+-2.0 >= 2.8.0 + $gconf_pkgconfig +-"` ++" 2>&1` + else +- DEVHELP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " ++ DEVHELP_PKG_ERRORS=`$PKG_CONFIG --print-errors " + gtk+-2.0 >= 2.8.0 + $gconf_pkgconfig +-"` ++" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$DEVHELP_PKG_ERRORS" >&5 +@@ -21337,11 +20910,10 @@ pkg_failed=no + { echo "$as_me:$LINENO: checking for LIBDEVHELP" >&5 + echo $ECHO_N "checking for LIBDEVHELP... $ECHO_C" >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$LIBDEVHELP_CFLAGS"; then +- pkg_cv_LIBDEVHELP_CFLAGS="$LIBDEVHELP_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$LIBDEVHELP_CFLAGS"; then ++ pkg_cv_LIBDEVHELP_CFLAGS="$LIBDEVHELP_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + gthread-2.0 >= 2.8.0 + gtk+-2.0 >= 2.8.0 +@@ -21369,15 +20941,13 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$LIBDEVHELP_LIBS"; then +- pkg_cv_LIBDEVHELP_LIBS="$LIBDEVHELP_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ ++if test -n "$LIBDEVHELP_LIBS"; then ++ pkg_cv_LIBDEVHELP_LIBS="$LIBDEVHELP_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + gthread-2.0 >= 2.8.0 + gtk+-2.0 >= 2.8.0 +@@ -21405,9 +20975,8 @@ if test -n "$PKG_CONFIG"; then + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -21420,21 +20989,21 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- LIBDEVHELP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " ++ LIBDEVHELP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " + gthread-2.0 >= 2.8.0 + gtk+-2.0 >= 2.8.0 + libglade-2.0 >= 2.4.0 + $gconf_pkgconfig + $libwnck_pkgconfig +-"` ++" 2>&1` + else +- LIBDEVHELP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " ++ LIBDEVHELP_PKG_ERRORS=`$PKG_CONFIG --print-errors " + gthread-2.0 >= 2.8.0 + gtk+-2.0 >= 2.8.0 + libglade-2.0 >= 2.4.0 + $gconf_pkgconfig + $libwnck_pkgconfig +-"` ++" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBDEVHELP_PKG_ERRORS" >&5 +@@ -21575,13 +21144,23 @@ fi + + + gecko_cv_gecko=$with_gecko ++if $PKG_CONFIG --exists $with_gecko-xpcom; then ++ gecko_cv_gecko_xpcom=$with_gecko-xpcom ++else ++ gecko_cv_gecko_xpcom=$with_gecko ++fi + + # Autodetect gecko +-_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla" ++_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla libxul" + if test -z "$gecko_cv_gecko"; then + for lizard in $_geckos; do + if $PKG_CONFIG --exists $lizard-xpcom; then + gecko_cv_gecko=$lizard ++ gecko_cv_gecko_xpcom=$lizard-xpcom ++ break; ++ elif $PKG_CONFIG --exists $lizard; then ++ gecko_cv_gecko=$lizard ++ gecko_cv_gecko_xpcom=$lizard + break; + fi + done +@@ -21615,12 +21194,13 @@ mozilla) gecko_cv_gecko_flavour=mozilla + seamonkey) gecko_cv_gecko_flavour=mozilla ;; + *firefox) gecko_cv_gecko_flavour=toolkit ;; + xulrunner) gecko_cv_gecko_flavour=toolkit ;; ++libxul*) gecko_cv_gecko_flavour=toolkit ;; + esac + +-_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}-xpcom`" +-_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" +-_GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" +-_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`" ++_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko_xpcom}`" ++_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko_xpcom}`" ++_GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko_xpcom}`" ++_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko_xpcom}`" + + fi # if gecko_cv_have_gecko + +@@ -21647,6 +21227,7 @@ GECKO_INCLUDE_ROOT=$_GECKO_INCLUDE_ROOT + GECKO_LIBDIR=$_GECKO_LIBDIR + GECKO_HOME=$_GECKO_HOME + GECKO_PREFIX=$_GECKO_PREFIX ++GECKO_XPCOM=$gecko_cv_gecko_xpcom + + # ************************************************************** + # This is really gcc-only +@@ -22147,12 +21728,14 @@ GECKO_GLUE_LIBS="$gecko_cv_glue_libs" + + + ++ + case "$GECKO" in + mozilla) gecko_min_version=1.7 ;; + seamonkey) gecko_min_version=1.0 ;; + *firefox) gecko_min_version=1.0 ;; + *thunderbird) gecko_min_version=1.0 ;; + xulrunner) gecko_min_version=1.8 ;; ++libxul*) gecko_min_version=1.9 ;; + esac + + +@@ -22160,41 +21743,37 @@ pkg_failed=no + { echo "$as_me:$LINENO: checking for GECKO" >&5 + echo $ECHO_N "checking for GECKO... $ECHO_C" >&6; } + +-if test -n "$PKG_CONFIG"; then +- if test -n "$GECKO_CFLAGS"; then +- pkg_cv_GECKO_CFLAGS="$GECKO_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GECKO_EXTRA_PKG_DEPENDENCIES \$GECKO-xpcom >= \$gecko_min_version\"") >&5 +- ($PKG_CONFIG --exists --print-errors "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version") 2>&5 ++if test -n "$GECKO_CFLAGS"; then ++ pkg_cv_GECKO_CFLAGS="$GECKO_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GECKO_EXTRA_PKG_DEPENDENCIES \$GECKO_XPCOM >= \$gecko_min_version\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO_XPCOM >= $gecko_min_version") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_GECKO_CFLAGS=`$PKG_CONFIG --cflags "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version" 2>/dev/null` ++ pkg_cv_GECKO_CFLAGS=`$PKG_CONFIG --cflags "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO_XPCOM >= $gecko_min_version" 2>/dev/null` + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$GECKO_LIBS"; then +- pkg_cv_GECKO_LIBS="$GECKO_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GECKO_EXTRA_PKG_DEPENDENCIES \$GECKO-xpcom >= \$gecko_min_version\"") >&5 +- ($PKG_CONFIG --exists --print-errors "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version") 2>&5 ++if test -n "$GECKO_LIBS"; then ++ pkg_cv_GECKO_LIBS="$GECKO_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GECKO_EXTRA_PKG_DEPENDENCIES \$GECKO_XPCOM >= \$gecko_min_version\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO_XPCOM >= $gecko_min_version") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_GECKO_LIBS=`$PKG_CONFIG --libs "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version" 2>/dev/null` ++ pkg_cv_GECKO_LIBS=`$PKG_CONFIG --libs "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO_XPCOM >= $gecko_min_version" 2>/dev/null` + else + pkg_failed=yes + fi +- fi +-else +- pkg_failed=untried ++ else ++ pkg_failed=untried + fi + + +@@ -22207,14 +21786,14 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GECKO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version"` ++ GECKO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO_XPCOM >= $gecko_min_version" 2>&1` + else +- GECKO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version"` ++ GECKO_PKG_ERRORS=`$PKG_CONFIG --print-errors "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO_XPCOM >= $gecko_min_version" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GECKO_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements ($GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version) were not met: ++ { { echo "$as_me:$LINENO: error: Package requirements ($GECKO_EXTRA_PKG_DEPENDENCIES $GECKO_XPCOM >= $gecko_min_version) were not met: + + $GECKO_PKG_ERRORS + +@@ -22225,7 +21804,7 @@ Alternatively, you may set the environme + and GECKO_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements ($GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version) were not met: ++echo "$as_me: error: Package requirements ($GECKO_EXTRA_PKG_DEPENDENCIES $GECKO_XPCOM >= $gecko_min_version) were not met: + + $GECKO_PKG_ERRORS + +@@ -22299,10 +21878,10 @@ _SAVE_CPPFLAGS="$CPPFLAGS" + _SAVE_CXXFLAGS="$CXXFLAGS" + _SAVE_LDFLAGS="$LDFLAGS" + _SAVE_LIBS="$LIBS" +-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)" +-CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" ++CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko_xpcom})" ++CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko_xpcom})" + LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" +-LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" ++LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko_xpcom})" + + _GECKO_DISPATCH_INCLUDEDIRS="content" + +@@ -22406,10 +21985,10 @@ _SAVE_CPPFLAGS="$CPPFLAGS" + _SAVE_CXXFLAGS="$CXXFLAGS" + _SAVE_LDFLAGS="$LDFLAGS" + _SAVE_LIBS="$LIBS" +-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)" +-CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" ++CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko_xpcom})" ++CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko_xpcom})" + LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" +-LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" ++LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko_xpcom})" + + _GECKO_DISPATCH_INCLUDEDIRS="" + +@@ -25503,8 +25082,6 @@ for ac_last_try in false false false fal + ECHO!$ECHO$ac_delim + AR!$AR$ac_delim + RANLIB!$RANLIB$ac_delim +-DSYMUTIL!$DSYMUTIL$ac_delim +-NMEDIT!$NMEDIT$ac_delim + CXXCPP!$CXXCPP$ac_delim + F77!$F77$ac_delim + FFLAGS!$FFLAGS$ac_delim +@@ -25579,6 +25156,7 @@ GECKO_INCLUDE_ROOT!$GECKO_INCLUDE_ROOT$a + GECKO_HOME!$GECKO_HOME$ac_delim + GECKO_PREFIX!$GECKO_PREFIX$ac_delim + GECKO_EXTRA_LIBS!$GECKO_EXTRA_LIBS$ac_delim ++GECKO_XPCOM!$GECKO_XPCOM$ac_delim + GECKO_CFLAGS!$GECKO_CFLAGS$ac_delim + GECKO_LIBS!$GECKO_LIBS$ac_delim + GECKO_WARN_CXXFLAGS!$GECKO_WARN_CXXFLAGS$ac_delim +@@ -25597,6 +25175,7 @@ PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$a + PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim + POFILES!$POFILES$ac_delim + POSUB!$POSUB$ac_delim ++MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim + _ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then +@@ -25638,7 +25217,6 @@ _ACEOF + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +-MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim + PYTHON!$PYTHON$ac_delim + PYTHON_VERSION!$PYTHON_VERSION$ac_delim + PYTHON_PREFIX!$PYTHON_PREFIX$ac_delim +@@ -25652,7 +25230,7 @@ LIBOBJS!$LIBOBJS$ac_delim + LTLIBOBJS!$LTLIBOBJS$ac_delim + _ACEOF + +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 12; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 11; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +diff -up devhelp-0.19.1/m4/gecko.m4.xulrunner devhelp-0.19.1/m4/gecko.m4 +--- devhelp-0.19.1/m4/gecko.m4.xulrunner 2008-05-25 12:55:36.000000000 -0400 ++++ devhelp-0.19.1/m4/gecko.m4 2008-05-26 12:18:07.000000000 -0400 @@ -51,22 +51,32 @@ AC_PROG_AWK AC_MSG_CHECKING([which gecko to use]) @@ -91,661 +2239,3 @@ diff -up devhelp-0.19/m4/gecko.m4.xl devhelp-0.19/m4/gecko.m4 # Older geckos don't have this variable, see # https://bugzilla.mozilla.org/show_bug.cgi?id=240473 -diff -up devhelp-0.19/configure.in.xl devhelp-0.19/configure.in ---- devhelp-0.19/configure.in.xl 2008-02-07 10:18:55.000000000 +0100 -+++ devhelp-0.19/configure.in 2008-02-26 12:11:01.000000000 +0100 -@@ -73,6 +73,7 @@ AC_SUBST([GECKO_INCLUDE_ROOT]) - AC_SUBST([GECKO_HOME]) - AC_SUBST([GECKO_PREFIX]) - AC_SUBST([GECKO_EXTRA_LIBS]) -+AC_SUBST([GECKO_XPCOM]) - - case "$GECKO" in - mozilla) gecko_min_version=1.7 ;; -@@ -80,9 +81,10 @@ seamonkey) gecko_min_version=1.0 ;; - *firefox) gecko_min_version=1.0 ;; - *thunderbird) gecko_min_version=1.0 ;; - xulrunner) gecko_min_version=1.8 ;; -+libxul*) gecko_min_version=1.9 ;; - esac - --PKG_CHECK_MODULES([GECKO],[$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version]) -+PKG_CHECK_MODULES([GECKO],[$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO_XPCOM >= $gecko_min_version]) - AC_SUBST([GECKO_CFLAGS]) - AC_SUBST([GECKO_LIBS]) - -diff -up devhelp-0.19/configure.xl devhelp-0.19/configure ---- devhelp-0.19/configure.xl 2008-02-07 13:39:49.000000000 +0100 -+++ devhelp-0.19/configure 2008-02-26 12:14:58.000000000 +0100 -@@ -940,6 +940,7 @@ GECKO_INCLUDE_ROOT - GECKO_HOME - GECKO_PREFIX - GECKO_EXTRA_LIBS -+GECKO_XPCOM - GECKO_CFLAGS - GECKO_LIBS - GECKO_WARN_CXXFLAGS -@@ -1597,7 +1598,7 @@ Optional Packages: - --with-gconf-source=sourceaddress Config database for installing schema files. - --with-gconf-schema-file-dir=dir Directory for installing schema files. - --with-compile-warnings=no/yes/error Compiler warnings -- --with-gecko[=mozilla|firefox|seamonkey|xulrunner] -+ --with-gecko[=mozilla|firefox|seamonkey|xulrunner|libxul] - Which gecko engine to use (autodetected by default) - - --with-zlib=DIR use libz in DIR -@@ -5357,7 +5358,7 @@ linux* | k*bsd*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; - --netbsd* | netbsdelf*-gnu) -+netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' - else -@@ -5477,7 +5478,7 @@ ia64-*-hpux*) - ;; - *-*-irix6*) - # Find out which ABI we are using. -- echo '#line 5480 "configure"' > conftest.$ac_ext -+ echo '#line 5481 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -@@ -5542,6 +5543,7 @@ s390*-*linux*|sparc*-*linux*) - esac - ;; - *64-bit*) -+ libsuff=64 - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_x86_64_fbsd" -@@ -7342,11 +7344,11 @@ else - -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:7345: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:7347: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:7349: \$? = $ac_status" >&5 -+ echo "$as_me:7351: \$? = $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. -@@ -7632,11 +7634,11 @@ else - -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:7635: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:7637: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:7639: \$? = $ac_status" >&5 -+ echo "$as_me:7641: \$? = $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. -@@ -7736,11 +7738,11 @@ else - -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:7741: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:7743: \$? = $ac_status" >&5 -+ echo "$as_me:7745: \$? = $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 -@@ -8000,13 +8002,12 @@ EOF - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi -- link_all_deplibs=no - else - ld_shlibs=no - fi - ;; - -- netbsd* | netbsdelf*-gnu) -+ netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= -@@ -8550,7 +8551,7 @@ if test -z "$aix_libpath"; then aix_libp - link_all_deplibs=yes - ;; - -- netbsd* | netbsdelf*-gnu) -+ netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else -@@ -9245,11 +9246,13 @@ linux* | k*bsd*-gnu) - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes -+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" -+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -9261,18 +9264,6 @@ linux* | k*bsd*-gnu) - dynamic_linker='GNU/Linux ld.so' - ;; - --netbsdelf*-gnu) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=no -- hardcode_into_libs=yes -- dynamic_linker='NetBSD ld.elf_so' -- ;; -- - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -10098,7 +10089,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < conftest.$ac_ext </dev/null; then - archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= -@@ -12509,7 +12500,7 @@ echo $ECHO_N "checking for $compiler opt - ;; - esac - ;; -- netbsd* | netbsdelf*-gnu) -+ netbsd*) - ;; - osf3* | osf4* | osf5*) - case $cc_basename in -@@ -12618,11 +12609,11 @@ else - -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:12621: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:12612: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:12625: \$? = $ac_status" >&5 -+ echo "$as_me:12616: \$? = $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. -@@ -12722,11 +12713,11 @@ else - -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:12725: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:12716: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:12729: \$? = $ac_status" >&5 -+ echo "$as_me:12720: \$? = $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 -@@ -12794,9 +12785,6 @@ echo $ECHO_N "checking whether the $comp - cygwin* | mingw*) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - ;; -- linux* | k*bsd*-gnu) -- link_all_deplibs_CXX=no -- ;; - *) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; -@@ -13226,11 +13214,13 @@ linux* | k*bsd*-gnu) - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes -+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" -+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -13242,18 +13232,6 @@ linux* | k*bsd*-gnu) - dynamic_linker='GNU/Linux ld.so' - ;; - --netbsdelf*-gnu) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=no -- hardcode_into_libs=yes -- dynamic_linker='NetBSD ld.elf_so' -- ;; -- - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -14299,11 +14277,11 @@ else - -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:14302: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:14280: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:14306: \$? = $ac_status" >&5 -+ echo "$as_me:14284: \$? = $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. -@@ -14403,11 +14381,11 @@ else - -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:14406: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:14384: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:14410: \$? = $ac_status" >&5 -+ echo "$as_me:14388: \$? = $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 -@@ -14667,13 +14645,12 @@ EOF - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi -- link_all_deplibs_F77=no - else - ld_shlibs_F77=no - fi - ;; - -- netbsd* | netbsdelf*-gnu) -+ netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= -@@ -15197,7 +15174,7 @@ if test -z "$aix_libpath"; then aix_libp - link_all_deplibs_F77=yes - ;; - -- netbsd* | netbsdelf*-gnu) -+ netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else -@@ -15840,11 +15817,13 @@ linux* | k*bsd*-gnu) - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes -+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" -+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -15856,18 +15835,6 @@ linux* | k*bsd*-gnu) - dynamic_linker='GNU/Linux ld.so' - ;; - --netbsdelf*-gnu) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=no -- hardcode_into_libs=yes -- dynamic_linker='NetBSD ld.elf_so' -- ;; -- - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -16603,11 +16570,11 @@ else - -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:16606: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:16573: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:16610: \$? = $ac_status" >&5 -+ echo "$as_me:16577: \$? = $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. -@@ -16893,11 +16860,11 @@ else - -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:16896: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:16863: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:16900: \$? = $ac_status" >&5 -+ echo "$as_me:16867: \$? = $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. -@@ -16997,11 +16964,11 @@ else - -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:17000: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:16967: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:17004: \$? = $ac_status" >&5 -+ echo "$as_me:16971: \$? = $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 -@@ -17261,13 +17228,12 @@ EOF - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi -- link_all_deplibs_GCJ=no - else - ld_shlibs_GCJ=no - fi - ;; - -- netbsd* | netbsdelf*-gnu) -+ netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= -@@ -17811,7 +17777,7 @@ if test -z "$aix_libpath"; then aix_libp - link_all_deplibs_GCJ=yes - ;; - -- netbsd* | netbsdelf*-gnu) -+ netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else -@@ -18454,11 +18420,13 @@ linux* | k*bsd*-gnu) - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes -+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" -+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -18470,18 +18438,6 @@ linux* | k*bsd*-gnu) - dynamic_linker='GNU/Linux ld.so' - ;; - --netbsdelf*-gnu) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=no -- hardcode_into_libs=yes -- dynamic_linker='NetBSD ld.elf_so' -- ;; -- - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -19797,7 +19753,7 @@ fi - - fi - if test -n "$PKG_CONFIG"; then -- _pkg_min_version=0.7 -+ _pkg_min_version=0.16 - { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 - echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then -@@ -21057,13 +21013,23 @@ fi - - - gecko_cv_gecko=$with_gecko -+if $PKG_CONFIG --exists $with_gecko-xpcom; then -+ gecko_cv_gecko_xpcom=$with_gecko-xpcom -+else -+ gecko_cv_gecko_xpcom=$with_gecko -+fi - - # Autodetect gecko --_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla" -+_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla libxul" - if test -z "$gecko_cv_gecko"; then - for lizard in $_geckos; do - if $PKG_CONFIG --exists $lizard-xpcom; then - gecko_cv_gecko=$lizard -+ gecko_cv_gecko_xpcom=$lizard-xpcom -+ break; -+ elif $PKG_CONFIG --exists $lizard; then -+ gecko_cv_gecko=$lizard -+ gecko_cv_gecko_xpcom=$lizard - break; - fi - done -@@ -21097,12 +21063,13 @@ mozilla) gecko_cv_gecko_flavour=mozilla - seamonkey) gecko_cv_gecko_flavour=mozilla ;; - *firefox) gecko_cv_gecko_flavour=toolkit ;; - xulrunner) gecko_cv_gecko_flavour=toolkit ;; -+libxul*) gecko_cv_gecko_flavour=toolkit ;; - esac - --_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}-xpcom`" --_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" --_GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" --_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`" -+_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko_xpcom}`" -+_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko_xpcom}`" -+_GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko_xpcom}`" -+_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko_xpcom}`" - - fi # if gecko_cv_have_gecko - -@@ -21129,6 +21096,7 @@ GECKO_INCLUDE_ROOT=$_GECKO_INCLUDE_ROOT - GECKO_LIBDIR=$_GECKO_LIBDIR - GECKO_HOME=$_GECKO_HOME - GECKO_PREFIX=$_GECKO_PREFIX -+GECKO_XPCOM=$gecko_cv_gecko_xpcom - - # ************************************************************** - # This is really gcc-only -@@ -21629,12 +21597,14 @@ GECKO_GLUE_LIBS="$gecko_cv_glue_libs" - - - -+ - case "$GECKO" in - mozilla) gecko_min_version=1.7 ;; - seamonkey) gecko_min_version=1.0 ;; - *firefox) gecko_min_version=1.0 ;; - *thunderbird) gecko_min_version=1.0 ;; - xulrunner) gecko_min_version=1.8 ;; -+libxul*) gecko_min_version=1.9 ;; - esac - - -@@ -21647,12 +21617,12 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_GECKO_CFLAGS="$GECKO_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GECKO_EXTRA_PKG_DEPENDENCIES \$GECKO-xpcom >= \$gecko_min_version\"") >&5 -- ($PKG_CONFIG --exists --print-errors "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version") 2>&5 -+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GECKO_EXTRA_PKG_DEPENDENCIES \$GECKO_XPCOM >= \$gecko_min_version\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO_XPCOM >= $gecko_min_version") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- pkg_cv_GECKO_CFLAGS=`$PKG_CONFIG --cflags "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version" 2>/dev/null` -+ pkg_cv_GECKO_CFLAGS=`$PKG_CONFIG --cflags "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO_XPCOM >= $gecko_min_version" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -21665,12 +21635,12 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_GECKO_LIBS="$GECKO_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GECKO_EXTRA_PKG_DEPENDENCIES \$GECKO-xpcom >= \$gecko_min_version\"") >&5 -- ($PKG_CONFIG --exists --print-errors "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version") 2>&5 -+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GECKO_EXTRA_PKG_DEPENDENCIES \$GECKO_XPCOM >= \$gecko_min_version\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO_XPCOM >= $gecko_min_version") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- pkg_cv_GECKO_LIBS=`$PKG_CONFIG --libs "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version" 2>/dev/null` -+ pkg_cv_GECKO_LIBS=`$PKG_CONFIG --libs "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO_XPCOM >= $gecko_min_version" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -21689,14 +21659,14 @@ else - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- GECKO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version"` -+ GECKO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO_XPCOM >= $gecko_min_version"` - else -- GECKO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version"` -+ GECKO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO_XPCOM >= $gecko_min_version"` - fi - # Put the nasty error message in config.log where it belongs - echo "$GECKO_PKG_ERRORS" >&5 - -- { { echo "$as_me:$LINENO: error: Package requirements ($GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version) were not met: -+ { { echo "$as_me:$LINENO: error: Package requirements ($GECKO_EXTRA_PKG_DEPENDENCIES $GECKO_XPCOM >= $gecko_min_version) were not met: - - $GECKO_PKG_ERRORS - -@@ -21707,7 +21677,7 @@ Alternatively, you may set the environme - and GECKO_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - " >&5 --echo "$as_me: error: Package requirements ($GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version) were not met: -+echo "$as_me: error: Package requirements ($GECKO_EXTRA_PKG_DEPENDENCIES $GECKO_XPCOM >= $gecko_min_version) were not met: - - $GECKO_PKG_ERRORS - -@@ -21781,10 +21751,10 @@ _SAVE_CPPFLAGS="$CPPFLAGS" - _SAVE_CXXFLAGS="$CXXFLAGS" - _SAVE_LDFLAGS="$LDFLAGS" - _SAVE_LIBS="$LIBS" --CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)" --CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" -+CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko_xpcom})" -+CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko_xpcom})" - LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" --LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" -+LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko_xpcom})" - - _GECKO_DISPATCH_INCLUDEDIRS="content" - -@@ -21888,10 +21858,10 @@ _SAVE_CPPFLAGS="$CPPFLAGS" - _SAVE_CXXFLAGS="$CXXFLAGS" - _SAVE_LDFLAGS="$LDFLAGS" - _SAVE_LIBS="$LIBS" --CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)" --CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" -+CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko_xpcom})" -+CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko_xpcom})" - LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" --LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" -+LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko_xpcom})" - - _GECKO_DISPATCH_INCLUDEDIRS="" - -@@ -25056,6 +25026,7 @@ GECKO_INCLUDE_ROOT!$GECKO_INCLUDE_ROOT$a - GECKO_HOME!$GECKO_HOME$ac_delim - GECKO_PREFIX!$GECKO_PREFIX$ac_delim - GECKO_EXTRA_LIBS!$GECKO_EXTRA_LIBS$ac_delim -+GECKO_XPCOM!$GECKO_XPCOM$ac_delim - GECKO_CFLAGS!$GECKO_CFLAGS$ac_delim - GECKO_LIBS!$GECKO_LIBS$ac_delim - GECKO_WARN_CXXFLAGS!$GECKO_WARN_CXXFLAGS$ac_delim -@@ -25078,7 +25049,6 @@ POFILES!$POFILES$ac_delim - POSUB!$POSUB$ac_delim - MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim - PYTHON!$PYTHON$ac_delim --PYTHON_VERSION!$PYTHON_VERSION$ac_delim - _ACEOF - - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then -@@ -25120,6 +25090,7 @@ _ACEOF - ac_delim='%!_!# ' - for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -+PYTHON_VERSION!$PYTHON_VERSION$ac_delim - PYTHON_PREFIX!$PYTHON_PREFIX$ac_delim - PYTHON_EXEC_PREFIX!$PYTHON_EXEC_PREFIX$ac_delim - PYTHON_PLATFORM!$PYTHON_PLATFORM$ac_delim -@@ -25131,7 +25102,7 @@ LIBOBJS!$LIBOBJS$ac_delim - LTLIBOBJS!$LTLIBOBJS$ac_delim - _ACEOF - -- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 9; then -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 10; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/devhelp.spec b/devhelp.spec index 1a1580c..765e2b4 100644 --- a/devhelp.spec +++ b/devhelp.spec @@ -6,8 +6,8 @@ ### Abstract ### Name: devhelp -Version: 0.19 -Release: 5%{?dist} +Version: 0.19.1 +Release: 1%{?dist} License: GPLv2+ Group: Development/Tools Summary: API document browser @@ -51,7 +51,7 @@ Library of Devhelp for embedding into other applications %prep %setup -q -n devhelp-%{version} -%patch -p1 -b .xl +%patch -p1 -b .xulrunner %build %configure --disable-static @@ -135,6 +135,9 @@ fi %{_libdir}/pkgconfig/* %changelog +* Mon May 26 2008 Matthew Barnes - 0.19.1-1 +- Update to 0.19.1 + * Sun May 4 2008 Matthias Clasen - 0.19-5 - Fix source url diff --git a/sources b/sources index 8db3953..b7d9c27 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -66c9fb480e123c96eb1efdbad56b2d90 devhelp-0.19.tar.bz2 +6c12a272a94ac9cfc1dc6234590b46d8 devhelp-0.19.1.tar.bz2