incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mba...@apache.org
Subject svn commit: r1163527 [2/3] - in /incubator/ooo/trunk/main: configure configure.in
Date Wed, 31 Aug 2011 08:43:29 GMT

Modified: incubator/ooo/trunk/main/configure
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure?rev=1163527&r1=1163526&r2=1163527&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure (original)
+++ incubator/ooo/trunk/main/configure Wed Aug 31 08:43:29 2011
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.in Revision: 1.290  .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68.
+# Generated by GNU Autoconf 2.67.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -90,7 +90,6 @@ fi
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -216,18 +215,11 @@ IFS=$as_save_IFS
   # We cannot yet assume a decent shell, so we have to provide a
 	# neutralization value for shells without unset; and this also
 	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
 	BASH_ENV=/dev/null
 	ENV=/dev/null
 	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
 	export CONFIG_SHELL
-	case $- in # ((((
-	  *v*x* | *x*v* ) as_opts=-vx ;;
-	  *v* ) as_opts=-v ;;
-	  *x* ) as_opts=-x ;;
-	  * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
     if test x$as_have_required = xno; then :
@@ -1702,7 +1694,7 @@ Try \`$0 --help' for more information"
     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
   esac
@@ -2711,7 +2703,7 @@ test -n "$ac_init_help" && exit $ac_stat
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.68
+generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
@@ -2757,7 +2749,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
 fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_compile
@@ -2803,7 +2795,7 @@ fi
   # interfere with the next link command; also delete a directory that is
   # left behind by Apple's compiler.  We do this before executing the actions.
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_link
@@ -2840,7 +2832,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
     ac_retval=1
 fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_cpp
@@ -2882,7 +2874,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
        ac_retval=$ac_status
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_run
@@ -2920,7 +2912,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
 fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_compile
@@ -2957,7 +2949,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
     ac_retval=1
 fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_cpp
@@ -3135,7 +3127,7 @@ rm -f core *.core core.conftest.* gmon.o
 rm -f conftest.val
 
   fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_compute_int
@@ -3149,7 +3141,7 @@ ac_fn_c_check_header_compile ()
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3167,7 +3159,7 @@ fi
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 
 } # ac_fn_c_check_header_compile
 
@@ -3179,10 +3171,10 @@ $as_echo "$ac_res" >&6; }
 ac_fn_c_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval \${$3+:} false; then :
+  if eval "test \"\${$3+set}\"" = set; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
@@ -3245,7 +3237,7 @@ $as_echo "$as_me: WARNING: $2: proceedin
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=\$ac_header_compiler"
@@ -3254,7 +3246,7 @@ eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 
 } # ac_fn_c_check_header_mongrel
 
@@ -3299,7 +3291,7 @@ fi
   # interfere with the next link command; also delete a directory that is
   # left behind by Apple's compiler.  We do this before executing the actions.
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_link
@@ -3312,7 +3304,7 @@ ac_fn_c_check_func ()
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3367,7 +3359,7 @@ fi
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 
 } # ac_fn_c_check_func
 
@@ -3379,10 +3371,10 @@ $as_echo "$ac_res" >&6; }
 ac_fn_cxx_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval \${$3+:} false; then :
+  if eval "test \"\${$3+set}\"" = set; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
@@ -3445,7 +3437,7 @@ $as_echo "$as_me: WARNING: $2: proceedin
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=\$ac_header_compiler"
@@ -3454,7 +3446,7 @@ eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 
 } # ac_fn_cxx_check_header_mongrel
 
@@ -3495,7 +3487,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
        ac_retval=$ac_status
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_run
@@ -3509,7 +3501,7 @@ ac_fn_c_check_member ()
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
 $as_echo_n "checking for $2.$3... " >&6; }
-if eval \${$4+:} false; then :
+if eval "test \"\${$4+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3553,7 +3545,7 @@ fi
 eval ac_res=\$$4
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 
 } # ac_fn_c_check_member
 cat >config.log <<_ACEOF
@@ -3561,7 +3553,7 @@ This file contains any messages produced
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
 
@@ -3819,7 +3811,7 @@ $as_echo "$as_me: loading site script $a
       || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
   fi
 done
 
@@ -5029,7 +5021,7 @@ echo ""
 cat /dev/null > warn
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
+if test "${ac_cv_path_GREP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$GREP"; then
@@ -5092,7 +5084,7 @@ $as_echo "$ac_cv_path_GREP" >&6; }
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
+if test "${ac_cv_path_EGREP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -5163,7 +5155,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
+if test "${ac_cv_prog_AWK+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
@@ -5203,7 +5195,7 @@ done
 set dummy $AWK; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_AWK+:} false; then :
+if test "${ac_cv_path_AWK+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $AWK in
@@ -5249,7 +5241,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_SED+:} false; then :
+if test "${ac_cv_path_SED+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $SED in
@@ -5357,7 +5349,7 @@ $SHELL "$ac_aux_dir/config.sub" sun4 >/d
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
+if test "${ac_cv_build+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
@@ -5373,7 +5365,7 @@ fi
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -5391,7 +5383,7 @@ case $build_os in *\ *) build_os=`echo "
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 $as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
+if test "${ac_cv_host+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
@@ -5406,7 +5398,7 @@ fi
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -5424,7 +5416,7 @@ case $host_os in *\ *) host_os=`echo "$h
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
 $as_echo_n "checking target system type... " >&6; }
-if ${ac_cv_target+:} false; then :
+if test "${ac_cv_target+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test "x$target_alias" = x; then
@@ -5439,7 +5431,7 @@ fi
 $as_echo "$ac_cv_target" >&6; }
 case $ac_cv_target in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;;
 esac
 target=$ac_cv_target
 ac_save_IFS=$IFS; IFS='-'
@@ -5497,7 +5489,7 @@ case "$build_os" in
 set dummy gtar; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GNUTAR+:} false; then :
+if test "${ac_cv_path_GNUTAR+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $GNUTAR in
@@ -5687,14 +5679,13 @@ esac
 
 
 
-
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -5737,7 +5728,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the
 set dummy pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $ac_pt_PKG_CONFIG in
@@ -5944,7 +5935,6 @@ if test "$enable_copyleft" != "yes"; the
    enable_mozilla="no"
    enable_nss_module="no"
    enable_gstreamer="no"
-   enable_epm="no"
    with_myspell_dicts="no"
    enable_neon="no"
 
@@ -5953,6 +5943,7 @@ if test "$enable_copyleft" != "yes"; the
    DISABLE_LIBWPD="TRUE"
    DISABLE_SAXON="TRUE"
    DISABLE_NEON="TRUE"
+
    BUILD_EPM="NO"
 
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -6183,7 +6174,7 @@ fi
 set dummy bash; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_SHELLPATH+:} false; then :
+if test "${ac_cv_path_SHELLPATH+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $SHELLPATH in
@@ -6257,7 +6248,7 @@ if test -n "$ac_tool_prefix"; then
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -6297,7 +6288,7 @@ if test -z "$ac_cv_prog_CC"; then
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -6350,7 +6341,7 @@ if test -z "$CC"; then
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -6390,7 +6381,7 @@ if test -z "$CC"; then
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -6449,7 +6440,7 @@ if test -z "$CC"; then
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -6493,7 +6484,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -6548,7 +6539,7 @@ fi
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -6663,7 +6654,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -6706,7 +6697,7 @@ else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -6765,7 +6756,7 @@ $as_echo "$ac_try_echo"; } >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
     fi
   fi
 fi
@@ -6776,7 +6767,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_ex
 ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
+if test "${ac_cv_objext+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6817,7 +6808,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -6827,7 +6818,7 @@ OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6864,7 +6855,7 @@ ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
+if test "${ac_cv_prog_cc_g+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
@@ -6942,7 +6933,7 @@ else
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
@@ -7047,7 +7038,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_COMPATH+:} false; then :
+if test "${ac_cv_path_COMPATH+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $COMPATH in
@@ -7250,7 +7241,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path__cc+:} false; then :
+if test "${ac_cv_path__cc+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $_cc in
@@ -7355,7 +7346,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path__cc+:} false; then :
+if test "${ac_cv_path__cc+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $_cc in
@@ -7415,7 +7406,7 @@ if test -z "$with_perl_home"; then
 set dummy perl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PERL+:} false; then :
+if test "${ac_cv_path_PERL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $PERL in
@@ -7524,7 +7515,7 @@ $as_echo "done" >&6; }
 set dummy mspdb80.dll; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MSPDB_PATH+:} false; then :
+if test "${ac_cv_path_MSPDB_PATH+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $MSPDB_PATH in
@@ -7564,7 +7555,7 @@ fi
 set dummy mspdb71.dll; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MSPDB_PATH+:} false; then :
+if test "${ac_cv_path_MSPDB_PATH+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $MSPDB_PATH in
@@ -7619,7 +7610,7 @@ $as_echo_n "checking the Microsoft C/C++
 set dummy cl.exe; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CC+:} false; then :
+if test "${ac_cv_path_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $CC in
@@ -7724,7 +7715,7 @@ if test "$WITH_MINGWIN" = "yes" || test 
 set dummy midl.exe; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MIDL_PATH+:} false; then :
+if test "${ac_cv_path_MIDL_PATH+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $MIDL_PATH in
@@ -7795,7 +7786,7 @@ fi
 set dummy csc.exe; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CSC_PATH+:} false; then :
+if test "${ac_cv_path_CSC_PATH+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $CSC_PATH in
@@ -7901,7 +7892,7 @@ if test -n "$CPP" && test -d "$CPP"; the
   CPP=
 fi
 if test -z "$CPP"; then
-  if ${ac_cv_prog_CPP+:} false; then :
+  if test "${ac_cv_prog_CPP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
@@ -8017,7 +8008,7 @@ else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 
 ac_ext=c
@@ -8029,7 +8020,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
+if test "${ac_cv_header_stdc+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8158,7 +8149,7 @@ if test -z "$CXX"; then
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CXX+:} false; then :
+if test "${ac_cv_prog_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CXX"; then
@@ -8202,7 +8193,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CXX+:} false; then :
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CXX"; then
@@ -8280,7 +8271,7 @@ done
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if ${ac_cv_cxx_compiler_gnu+:} false; then :
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8317,7 +8308,7 @@ ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
 $as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if ${ac_cv_prog_cxx_g+:} false; then :
+if test "${ac_cv_prog_cxx_g+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
@@ -8407,7 +8398,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
 $as_echo_n "checking how to run the C++ preprocessor... " >&6; }
 if test -z "$CXXCPP"; then
-  if ${ac_cv_prog_CXXCPP+:} false; then :
+  if test "${ac_cv_prog_CXXCPP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CXXCPP needs to be expanded
@@ -8523,7 +8514,7 @@ else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 
 ac_ext=c
@@ -8548,7 +8539,7 @@ if test -n "$CPP" && test -d "$CPP"; the
   CPP=
 fi
 if test -z "$CPP"; then
-  if ${ac_cv_prog_CPP+:} false; then :
+  if test "${ac_cv_prog_CPP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
@@ -8664,7 +8655,7 @@ else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 
 ac_ext=c
@@ -8699,7 +8690,7 @@ done
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
 $as_echo_n "checking size of long... " >&6; }
-if ${ac_cv_sizeof_long+:} false; then :
+if test "${ac_cv_sizeof_long+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
@@ -8709,7 +8700,7 @@ else
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long)
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
    else
      ac_cv_sizeof_long=0
    fi
@@ -8730,7 +8721,7 @@ SIZEOF_LONG=$ac_cv_sizeof_long
 
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
 $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if ${ac_cv_c_bigendian+:} false; then :
+if test "${ac_cv_c_bigendian+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_c_bigendian=unknown
@@ -8949,7 +8940,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUI
      ;; #(
    *)
      as_fn_error $? "unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5  ;;
  esac
 
 WORDS_BIGENDIAN=$ac_cv_c_bigendian
@@ -8964,7 +8955,7 @@ if test "$enable_largefile" != no; then
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
 $as_echo_n "checking for special C compiler options needed for large files... " >&6; }
-if ${ac_cv_sys_largefile_CC+:} false; then :
+if test "${ac_cv_sys_largefile_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_sys_largefile_CC=no
@@ -9015,7 +9006,7 @@ $as_echo "$ac_cv_sys_largefile_CC" >&6; 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
 $as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
-if ${ac_cv_sys_file_offset_bits+:} false; then :
+if test "${ac_cv_sys_file_offset_bits+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   while :; do
@@ -9084,7 +9075,7 @@ rm -rf conftest*
   if test $ac_cv_sys_file_offset_bits = unknown; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
 $as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
-if ${ac_cv_sys_large_files+:} false; then :
+if test "${ac_cv_sys_large_files+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   while :; do
@@ -9167,7 +9158,7 @@ if test -n "$enable_dbgutil" && test "$e
    if test -z "$VALGRIND_CFLAGS"; then
       CPPFLAGS="-I/usr/include/valgrind"
       ac_fn_c_check_header_mongrel "$LINENO" "valgrind.h" "ac_cv_header_valgrind_h" "$ac_includes_default"
-if test "x$ac_cv_header_valgrind_h" = xyes; then :
+if test "x$ac_cv_header_valgrind_h" = x""yes; then :
   VALGRIND_CFLAGS=$CPPFLAGS
 else
   unset ac_cv_header_valgrind_h
@@ -9178,7 +9169,7 @@ fi
    if test -z "$VALGRIND_CFLAGS"; then
       CPPFLAGS="-I/usr/local/include/valgrind"
       ac_fn_c_check_header_mongrel "$LINENO" "valgrind.h" "ac_cv_header_valgrind_h" "$ac_includes_default"
-if test "x$ac_cv_header_valgrind_h" = xyes; then :
+if test "x$ac_cv_header_valgrind_h" = x""yes; then :
   VALGRIND_CFLAGS=$CPPFLAGS
 fi
 
@@ -9187,7 +9178,7 @@ fi
    if test -n "$VALGRIND_CFLAGS"; then
       CPPFLAGS=$VALGRIND_CFLAGS
       ac_fn_c_check_header_mongrel "$LINENO" "memcheck.h" "ac_cv_header_memcheck_h" "$ac_includes_default"
-if test "x$ac_cv_header_memcheck_h" = xyes; then :
+if test "x$ac_cv_header_memcheck_h" = x""yes; then :
 
 else
   VALGRIND_CFLAGS=""
@@ -9201,7 +9192,7 @@ fi
 
 if test "$test_cups" = "yes" -a "$ENABLE_CUPS" = "TRUE" ; then
     ac_fn_c_check_header_mongrel "$LINENO" "cups/cups.h" "ac_cv_header_cups_cups_h" "$ac_includes_default"
-if test "x$ac_cv_header_cups_cups_h" = xyes; then :
+if test "x$ac_cv_header_cups_cups_h" = x""yes; then :
 
 else
   as_fn_error $? "cups/cups.h could not be found. libcupsys2-dev or cups???-devel missing?" "$LINENO" 5
@@ -9218,7 +9209,7 @@ $as_echo_n "checking whether to enable p
 $as_echo "yes" >&6; }
     PAM=YES
     ac_fn_c_check_header_mongrel "$LINENO" "security/pam_appl.h" "ac_cv_header_security_pam_appl_h" "$ac_includes_default"
-if test "x$ac_cv_header_security_pam_appl_h" = xyes; then :
+if test "x$ac_cv_header_security_pam_appl_h" = x""yes; then :
 
 else
   as_fn_error $? "pam_appl.h could not be found. libpam-dev or pam-devel missing?" "$LINENO" 5
@@ -9233,7 +9224,7 @@ $as_echo "yes" >&6; }
       PAM_LINK=YES
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pam_start in -lpam" >&5
 $as_echo_n "checking for pam_start in -lpam... " >&6; }
-if ${ac_cv_lib_pam_pam_start+:} false; then :
+if test "${ac_cv_lib_pam_pam_start+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -9267,7 +9258,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pam_pam_start" >&5
 $as_echo "$ac_cv_lib_pam_pam_start" >&6; }
-if test "x$ac_cv_lib_pam_pam_start" = xyes; then :
+if test "x$ac_cv_lib_pam_pam_start" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBPAM 1
 _ACEOF
@@ -9299,7 +9290,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking how many arguments getspnam_r() takes" >&5
 $as_echo_n "checking how many arguments getspnam_r() takes... " >&6; }
 
-    if ${ac_cv_func_which_getspnam_r+:} false; then :
+    if test "${ac_cv_func_which_getspnam_r+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -9458,7 +9449,7 @@ $as_echo "yes" >&6; }
         CRYPT_LINK=YES
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
 $as_echo_n "checking for crypt in -lcrypt... " >&6; }
-if ${ac_cv_lib_crypt_crypt+:} false; then :
+if test "${ac_cv_lib_crypt_crypt+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -9492,7 +9483,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5
 $as_echo "$ac_cv_lib_crypt_crypt" >&6; }
-if test "x$ac_cv_lib_crypt_crypt" = xyes; then :
+if test "x$ac_cv_lib_crypt_crypt" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBCRYPT 1
 _ACEOF
@@ -9540,7 +9531,7 @@ if test -z "$CXX"; then
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CXX+:} false; then :
+if test "${ac_cv_prog_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CXX"; then
@@ -9584,7 +9575,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CXX+:} false; then :
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CXX"; then
@@ -9662,7 +9653,7 @@ done
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if ${ac_cv_cxx_compiler_gnu+:} false; then :
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -9699,7 +9690,7 @@ ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
 $as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if ${ac_cv_prog_cxx_g+:} false; then :
+if test "${ac_cv_prog_cxx_g+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
@@ -9816,7 +9807,7 @@ if test "$cross_compiling" = yes; then :
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -10359,7 +10350,7 @@ $as_echo "probing..." >&6; }
 set dummy ccache; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CCACHE+:} false; then :
+if test "${ac_cv_path_CCACHE+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $CCACHE in
@@ -10641,7 +10632,7 @@ $as_echo "tcmalloc" >&6; }
     fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for malloc in -ltcmalloc" >&5
 $as_echo_n "checking for malloc in -ltcmalloc... " >&6; }
-if ${ac_cv_lib_tcmalloc_malloc+:} false; then :
+if test "${ac_cv_lib_tcmalloc_malloc+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -10675,7 +10666,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tcmalloc_malloc" >&5
 $as_echo "$ac_cv_lib_tcmalloc_malloc" >&6; }
-if test "x$ac_cv_lib_tcmalloc_malloc" = xyes; then :
+if test "x$ac_cv_lib_tcmalloc_malloc" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBTCMALLOC 1
 _ACEOF
@@ -10696,7 +10687,7 @@ $as_echo "jemalloc" >&6; }
     CFLAGS="$CFLAGS -pthread"
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for malloc in -ljemalloc" >&5
 $as_echo_n "checking for malloc in -ljemalloc... " >&6; }
-if ${ac_cv_lib_jemalloc_malloc+:} false; then :
+if test "${ac_cv_lib_jemalloc_malloc+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -10730,7 +10721,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jemalloc_malloc" >&5
 $as_echo "$ac_cv_lib_jemalloc_malloc" >&6; }
-if test "x$ac_cv_lib_jemalloc_malloc" = xyes; then :
+if test "x$ac_cv_lib_jemalloc_malloc" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBJEMALLOC 1
 _ACEOF
@@ -10822,7 +10813,7 @@ if test "$SOLAR_JAVA" != ""; then
 set dummy $WITH_JAVA; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_JAVAINTERPRETER+:} false; then :
+if test "${ac_cv_path_JAVAINTERPRETER+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $JAVAINTERPRETER in
@@ -11003,7 +10994,7 @@ if test "$SOLAR_JAVA" != ""; then
 set dummy $javacompiler; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_JAVACOMPILER+:} false; then :
+if test "${ac_cv_path_JAVACOMPILER+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $JAVACOMPILER in
@@ -11087,7 +11078,7 @@ if test "$SOLAR_JAVA" != ""; then
 set dummy javadoc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_JAVADOC+:} false; then :
+if test "${ac_cv_path_JAVADOC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $JAVADOC in
@@ -11137,7 +11128,7 @@ fi
 set dummy javadoc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_JAVADOC+:} false; then :
+if test "${ac_cv_path_JAVADOC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $JAVADOC in
@@ -11310,7 +11301,7 @@ $as_echo_n "checking for jawt lib name..
       LDFLAGS="$LDFLAGS -L$JAVA_HOME/lib -lgcj"
       exec 6>/dev/null # no output
       ac_fn_c_check_header_mongrel "$LINENO" "jni.h" "ac_cv_header_jni_h" "$ac_includes_default"
-if test "x$ac_cv_header_jni_h" = xyes; then :
+if test "x$ac_cv_header_jni_h" = x""yes; then :
 
 else
   as_fn_error $? "jni.h could not be found. Mismatch between gcc and libgcj or libgcj-devel missing?" "$LINENO" 5
@@ -11319,7 +11310,7 @@ fi
 
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JAWT_GetAWT in -lgcjawt" >&5
 $as_echo_n "checking for JAWT_GetAWT in -lgcjawt... " >&6; }
-if ${ac_cv_lib_gcjawt_JAWT_GetAWT+:} false; then :
+if test "${ac_cv_lib_gcjawt_JAWT_GetAWT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -11353,7 +11344,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gcjawt_JAWT_GetAWT" >&5
 $as_echo "$ac_cv_lib_gcjawt_JAWT_GetAWT" >&6; }
-if test "x$ac_cv_lib_gcjawt_JAWT_GetAWT" = xyes; then :
+if test "x$ac_cv_lib_gcjawt_JAWT_GetAWT" = x""yes; then :
    AWTLIB="-lgcjawt -lgcj"
 fi
 
@@ -11373,7 +11364,7 @@ fi
       export LD_LIBRARY_PATH
       exec 6>/dev/null # no output
       ac_fn_c_check_header_mongrel "$LINENO" "jni.h" "ac_cv_header_jni_h" "$ac_includes_default"
-if test "x$ac_cv_header_jni_h" = xyes; then :
+if test "x$ac_cv_header_jni_h" = x""yes; then :
 
 else
   as_fn_error $? "jni.h could not be found." "$LINENO" 5
@@ -11382,7 +11373,7 @@ fi
 
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JAWT_GetAWT in -ljawt" >&5
 $as_echo_n "checking for JAWT_GetAWT in -ljawt... " >&6; }
-if ${ac_cv_lib_jawt_JAWT_GetAWT+:} false; then :
+if test "${ac_cv_lib_jawt_JAWT_GetAWT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -11416,7 +11407,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jawt_JAWT_GetAWT" >&5
 $as_echo "$ac_cv_lib_jawt_JAWT_GetAWT" >&6; }
-if test "x$ac_cv_lib_jawt_JAWT_GetAWT" = xyes; then :
+if test "x$ac_cv_lib_jawt_JAWT_GetAWT" = x""yes; then :
    AWTLIB="-ljawt"
 fi
 
@@ -11424,7 +11415,7 @@ fi
          LDFLAGS="$LDFLAGS -L$JAVA_HOME/jre/bin/xawt -ljawt"
          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JAWT_GetAWT in -lmawt" >&5
 $as_echo_n "checking for JAWT_GetAWT in -lmawt... " >&6; }
-if ${ac_cv_lib_mawt_JAWT_GetAWT+:} false; then :
+if test "${ac_cv_lib_mawt_JAWT_GetAWT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -11458,7 +11449,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mawt_JAWT_GetAWT" >&5
 $as_echo "$ac_cv_lib_mawt_JAWT_GetAWT" >&6; }
-if test "x$ac_cv_lib_mawt_JAWT_GetAWT" = xyes; then :
+if test "x$ac_cv_lib_mawt_JAWT_GetAWT" = x""yes; then :
    AWTLIB="-L$JAVA_HOME/jre/bin/xawt -ljawt -lmawt"
 fi
 
@@ -11500,7 +11491,7 @@ $as_echo "$gcjaot" >&6; }
 set dummy $gcjaot; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_JAVAAOTCOMPILER+:} false; then :
+if test "${ac_cv_path_JAVAAOTCOMPILER+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $JAVAAOTCOMPILER in
@@ -11562,7 +11553,7 @@ fi
 set dummy dmake; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_DMAKE+:} false; then :
+if test "${ac_cv_path_DMAKE+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $DMAKE in
@@ -11653,7 +11644,7 @@ $as_echo "yes" >&6; }
 set dummy epm; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_EPM+:} false; then :
+if test "${ac_cv_path_EPM+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $EPM in
@@ -11838,7 +11829,7 @@ $as_echo "$RPM_PATH" >&6; }
 set dummy dpkg; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_DPKG+:} false; then :
+if test "${ac_cv_path_DPKG+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $DPKG in
@@ -11933,7 +11924,7 @@ $as_echo "$as_me: WARNING: if you want t
 set dummy pkgmk; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKGMK+:} false; then :
+if test "${ac_cv_path_PKGMK+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $PKGMK in
@@ -11991,7 +11982,7 @@ fi
 set dummy gperf; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GPERF+:} false; then :
+if test "${ac_cv_path_GPERF+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $GPERF in
@@ -12094,7 +12085,7 @@ $as_echo "$as_me: WARNING: not found, wi
 set dummy ${ac_tool_prefix}$WITH_MINGWIN; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MINGWCXX+:} false; then :
+if test "${ac_cv_prog_MINGWCXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$MINGWCXX"; then
@@ -12134,7 +12125,7 @@ if test -z "$ac_cv_prog_MINGWCXX"; then
 set dummy $WITH_MINGWIN; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_MINGWCXX+:} false; then :
+if test "${ac_cv_prog_ac_ct_MINGWCXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_MINGWCXX"; then
@@ -12201,7 +12192,7 @@ $as_echo "yes" >&6; }
 set dummy ${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/`; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MINGWSTRIP+:} false; then :
+if test "${ac_cv_prog_MINGWSTRIP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$MINGWSTRIP"; then
@@ -12241,7 +12232,7 @@ if test -z "$ac_cv_prog_MINGWSTRIP"; the
 set dummy `echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/`; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_MINGWSTRIP+:} false; then :
+if test "${ac_cv_prog_ac_ct_MINGWSTRIP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_MINGWSTRIP"; then
@@ -12312,7 +12303,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
       LIBS=""
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lkernel32" >&5
 $as_echo_n "checking for main in -lkernel32... " >&6; }
-if ${ac_cv_lib_kernel32_main+:} false; then :
+if test "${ac_cv_lib_kernel32_main+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -12340,7 +12331,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kernel32_main" >&5
 $as_echo "$ac_cv_lib_kernel32_main" >&6; }
-if test "x$ac_cv_lib_kernel32_main" = xyes; then :
+if test "x$ac_cv_lib_kernel32_main" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBKERNEL32 1
 _ACEOF
@@ -12352,7 +12343,7 @@ ac_cv_lib_kernel32=ac_cv_lib_kernel32_ma
 
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ladvapi32" >&5
 $as_echo_n "checking for main in -ladvapi32... " >&6; }
-if ${ac_cv_lib_advapi32_main+:} false; then :
+if test "${ac_cv_lib_advapi32_main+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -12380,7 +12371,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_advapi32_main" >&5
 $as_echo "$ac_cv_lib_advapi32_main" >&6; }
-if test "x$ac_cv_lib_advapi32_main" = xyes; then :
+if test "x$ac_cv_lib_advapi32_main" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBADVAPI32 1
 _ACEOF
@@ -12391,7 +12382,7 @@ fi
 ac_cv_lib_advapi32=ac_cv_lib_advapi32_main
 
       ac_fn_cxx_check_header_mongrel "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default"
-if test "x$ac_cv_header_windows_h" = xyes; then :
+if test "x$ac_cv_header_windows_h" = x""yes; then :
 
 else
   as_fn_error $? "windows.h missing" "$LINENO" 5
@@ -12446,7 +12437,7 @@ if test -n "$with_system_zlib" -o -n "$w
 $as_echo "external" >&6; }
     SYSTEM_ZLIB=YES
     ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_zlib_h" = xyes; then :
+if test "x$ac_cv_header_zlib_h" = x""yes; then :
 
 else
   as_fn_error $? "zlib.h not found. install zlib" "$LINENO" 5
@@ -12455,7 +12446,7 @@ fi
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for deflate in -lz" >&5
 $as_echo_n "checking for deflate in -lz... " >&6; }
-if ${ac_cv_lib_z_deflate+:} false; then :
+if test "${ac_cv_lib_z_deflate+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -12489,7 +12480,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_deflate" >&5
 $as_echo "$ac_cv_lib_z_deflate" >&6; }
-if test "x$ac_cv_lib_z_deflate" = xyes; then :
+if test "x$ac_cv_lib_z_deflate" = x""yes; then :
    ZLIB=-lz
 else
   as_fn_error $? "zlib not found or functional" "$LINENO" 5
@@ -12511,7 +12502,7 @@ if test -n "$with_system_jpeg" -o -n "$w
 $as_echo "external" >&6; }
     SYSTEM_JPEG=YES
     ac_fn_c_check_header_mongrel "$LINENO" "jpeglib.h" "ac_cv_header_jpeglib_h" "$ac_includes_default"
-if test "x$ac_cv_header_jpeglib_h" = xyes; then :
+if test "x$ac_cv_header_jpeglib_h" = x""yes; then :
 
 else
   as_fn_error $? "jpeg.h not found. install libjpeg" "$LINENO" 5
@@ -12520,7 +12511,7 @@ fi
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_resync_to_restart in -ljpeg" >&5
 $as_echo_n "checking for jpeg_resync_to_restart in -ljpeg... " >&6; }
-if ${ac_cv_lib_jpeg_jpeg_resync_to_restart+:} false; then :
+if test "${ac_cv_lib_jpeg_jpeg_resync_to_restart+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -12554,7 +12545,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_resync_to_restart" >&5
 $as_echo "$ac_cv_lib_jpeg_jpeg_resync_to_restart" >&6; }
-if test "x$ac_cv_lib_jpeg_jpeg_resync_to_restart" = xyes; then :
+if test "x$ac_cv_lib_jpeg_jpeg_resync_to_restart" = x""yes; then :
    JPEG3RDLIB=-ljpeg
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking jpeg library not found or fuctional" >&5
@@ -12577,7 +12568,7 @@ if test -n "$with_system_expat" -o -n "$
 $as_echo "external" >&6; }
     SYSTEM_EXPAT=YES
     ac_fn_c_check_header_mongrel "$LINENO" "expat.h" "ac_cv_header_expat_h" "$ac_includes_default"
-if test "x$ac_cv_header_expat_h" = xyes; then :
+if test "x$ac_cv_header_expat_h" = x""yes; then :
 
 else
   as_fn_error $? "expat.h not found. install expat" "$LINENO" 5
@@ -12586,7 +12577,7 @@ fi
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML_ParserCreate in -lexpat" >&5
 $as_echo_n "checking for XML_ParserCreate in -lexpat... " >&6; }
-if ${ac_cv_lib_expat_XML_ParserCreate+:} false; then :
+if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -12620,7 +12611,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
 $as_echo "$ac_cv_lib_expat_XML_ParserCreate" >&6; }
-if test "x$ac_cv_lib_expat_XML_ParserCreate" = xyes; then :
+if test "x$ac_cv_lib_expat_XML_ParserCreate" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBEXPAT 1
 _ACEOF
@@ -12663,7 +12654,6 @@ if test -n "$LIBWPD_CFLAGS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBWPD_CFLAGS=`$PKG_CONFIG --cflags "libwpd-0.8 " 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -12680,7 +12670,6 @@ if test -n "$LIBWPD_LIBS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBWPD_LIBS=`$PKG_CONFIG --libs "libwpd-0.8 " 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -12700,9 +12689,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LIBWPD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libwpd-0.8 " 2>&1`
+	        LIBWPD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libwpd-0.8 " 2>&1`
         else
-	        LIBWPD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libwpd-0.8 " 2>&1`
+	        LIBWPD_PKG_ERRORS=`$PKG_CONFIG --print-errors "libwpd-0.8 " 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBWPD_PKG_ERRORS" >&5
@@ -12731,7 +12720,7 @@ and LIBWPD_LIBS to avoid the need to cal
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
 	LIBWPD_CFLAGS=$pkg_cv_LIBWPD_CFLAGS
 	LIBWPD_LIBS=$pkg_cv_LIBWPD_LIBS
@@ -12773,7 +12762,6 @@ if test -n "$CPPUNIT_CFLAGS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_CPPUNIT_CFLAGS=`$PKG_CONFIG --cflags "cppunit >= 1.12.0 " 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -12790,7 +12778,6 @@ if test -n "$CPPUNIT_LIBS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_CPPUNIT_LIBS=`$PKG_CONFIG --libs "cppunit >= 1.12.0 " 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -12810,9 +12797,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        CPPUNIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "cppunit >= 1.12.0 " 2>&1`
+	        CPPUNIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "cppunit >= 1.12.0 " 2>&1`
         else
-	        CPPUNIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "cppunit >= 1.12.0 " 2>&1`
+	        CPPUNIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "cppunit >= 1.12.0 " 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$CPPUNIT_PKG_ERRORS" >&5
@@ -12841,7 +12828,7 @@ and CPPUNIT_LIBS to avoid the need to ca
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
 	CPPUNIT_CFLAGS=$pkg_cv_CPPUNIT_CFLAGS
 	CPPUNIT_LIBS=$pkg_cv_CPPUNIT_LIBS
@@ -12877,7 +12864,6 @@ if test -n "$FREETYPE_CFLAGS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2 >= 2.0 " 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -12894,7 +12880,6 @@ if test -n "$FREETYPE_LIBS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_FREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2 >= 2.0 " 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -12914,9 +12899,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "freetype2 >= 2.0 " 2>&1`
+	        FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "freetype2 >= 2.0 " 2>&1`
         else
-	        FREETYPE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "freetype2 >= 2.0 " 2>&1`
+	        FREETYPE_PKG_ERRORS=`$PKG_CONFIG --print-errors "freetype2 >= 2.0 " 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$FREETYPE_PKG_ERRORS" >&5
@@ -12945,7 +12930,7 @@ and FREETYPE_LIBS to avoid the need to c
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
 	FREETYPE_CFLAGS=$pkg_cv_FREETYPE_CFLAGS
 	FREETYPE_LIBS=$pkg_cv_FREETYPE_LIBS
@@ -12965,7 +12950,7 @@ if test  "$test_freetype" = "yes"; then
     LDFLAGS="$LDFLAGS $FREETYPE_LIBS"
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT_GlyphSlot_Embolden in -lfreetype" >&5
 $as_echo_n "checking for FT_GlyphSlot_Embolden in -lfreetype... " >&6; }
-if ${ac_cv_lib_freetype_FT_GlyphSlot_Embolden+:} false; then :
+if test "${ac_cv_lib_freetype_FT_GlyphSlot_Embolden+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -12999,7 +12984,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freetype_FT_GlyphSlot_Embolden" >&5
 $as_echo "$ac_cv_lib_freetype_FT_GlyphSlot_Embolden" >&6; }
-if test "x$ac_cv_lib_freetype_FT_GlyphSlot_Embolden" = xyes; then :
+if test "x$ac_cv_lib_freetype_FT_GlyphSlot_Embolden" = x""yes; then :
   USE_FT_EMBOLDEN="YES"
 else
   USE_FT_EMBOLDEN="NO"
@@ -13070,7 +13055,6 @@ if test -n "$LIBXSLT_CFLAGS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXSLT_CFLAGS=`$PKG_CONFIG --cflags "libxslt" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -13087,7 +13071,6 @@ if test -n "$LIBXSLT_LIBS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXSLT_LIBS=`$PKG_CONFIG --libs "libxslt" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -13107,9 +13090,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LIBXSLT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxslt" 2>&1`
+	        LIBXSLT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxslt" 2>&1`
         else
-	        LIBXSLT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxslt" 2>&1`
+	        LIBXSLT_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxslt" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBXSLT_PKG_ERRORS" >&5
@@ -13138,7 +13121,7 @@ and LIBXSLT_LIBS to avoid the need to ca
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
 	LIBXSLT_CFLAGS=$pkg_cv_LIBXSLT_CFLAGS
 	LIBXSLT_LIBS=$pkg_cv_LIBXSLT_LIBS
@@ -13153,7 +13136,7 @@ fi
 set dummy xsltproc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_XSLTPROC+:} false; then :
+if test "${ac_cv_path_XSLTPROC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $XSLTPROC in
@@ -13241,7 +13224,6 @@ if test -n "$LIBXML_CFLAGS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -13258,7 +13240,6 @@ if test -n "$LIBXML_LIBS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -13278,9 +13259,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LIBXML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxml-2.0 >= 2.0" 2>&1`
+	        LIBXML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxml-2.0 >= 2.0" 2>&1`
         else
-	        LIBXML_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxml-2.0 >= 2.0" 2>&1`
+	        LIBXML_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxml-2.0 >= 2.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBXML_PKG_ERRORS" >&5
@@ -13309,7 +13290,7 @@ and LIBXML_LIBS to avoid the need to cal
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
 	LIBXML_CFLAGS=$pkg_cv_LIBXML_CFLAGS
 	LIBXML_LIBS=$pkg_cv_LIBXML_LIBS
@@ -13376,11 +13357,11 @@ fi
       # VERSION.
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 2.2" >&5
 $as_echo_n "checking for a Python interpreter with version >= 2.2... " >&6; }
-if ${am_cv_pathless_PYTHON+:} false; then :
+if test "${am_cv_pathless_PYTHON+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
-	for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
+	for am_cv_pathless_PYTHON in python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
 	  test "$am_cv_pathless_PYTHON" = none && break
 	  prog="import sys
 # split strings by '.' and convert to numeric.  Append some zeros
@@ -13410,7 +13391,7 @@ $as_echo "$am_cv_pathless_PYTHON" >&6; }
 set dummy $am_cv_pathless_PYTHON; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PYTHON+:} false; then :
+if test "${ac_cv_path_PYTHON+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $PYTHON in
@@ -13458,7 +13439,7 @@ fi
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5
 $as_echo_n "checking for $am_display_PYTHON version... " >&6; }
-if ${am_cv_python_version+:} false; then :
+if test "${am_cv_python_version+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
@@ -13477,7 +13458,7 @@ $as_echo "$am_cv_python_version" >&6; }
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5
 $as_echo_n "checking for $am_display_PYTHON platform... " >&6; }
-if ${am_cv_python_platform+:} false; then :
+if test "${am_cv_python_platform+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`
@@ -13491,7 +13472,7 @@ $as_echo "$am_cv_python_platform" >&6; }
 
                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
 $as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }
-if ${am_cv_python_pythondir+:} false; then :
+if test "${am_cv_python_pythondir+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test "x$prefix" = xNONE
@@ -13529,7 +13510,7 @@ $as_echo "$am_cv_python_pythondir" >&6; 
 
             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5
 $as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; }
-if ${am_cv_python_pyexecdir+:} false; then :
+if test "${am_cv_python_pyexecdir+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test "x$exec_prefix" = xNONE
@@ -13580,7 +13561,7 @@ if test "$with_system_python" = "yes" ; 
       save_CPPFLAGS="$CPPFLAGS"
    CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS"
    ac_fn_c_check_header_mongrel "$LINENO" "Python.h" "ac_cv_header_Python_h" "$ac_includes_default"
-if test "x$ac_cv_header_Python_h" = xyes; then :
+if test "x$ac_cv_header_Python_h" = x""yes; then :
 
 else
   as_fn_error $? "Python headers not found" "$LINENO" 5
@@ -13603,7 +13584,7 @@ $as_echo "internal" >&6; }
 set dummy bzip2; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_BZIP2+:} false; then :
+if test "${ac_cv_path_BZIP2+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $BZIP2 in
@@ -13660,14 +13641,14 @@ $as_echo "external" >&6; }
     ac_fn_c_check_header_compile "$LINENO" "db.h" "ac_cv_header_db_h" "
 
 "
-if test "x$ac_cv_header_db_h" = xyes; then :
+if test "x$ac_cv_header_db_h" = x""yes; then :
    DB_INCLUDES=/usr/include
 else
 
              CFLAGS=-I/usr/include/db4
              ac_fn_c_check_header_compile "$LINENO" "db4/db.h" "ac_cv_header_db4_db_h" "+
 "
-if test "x$ac_cv_header_db4_db_h" = xyes; then :
+if test "x$ac_cv_header_db4_db_h" = x""yes; then :
    DB_INCLUDES=/usr/include/db4
 else
    as_fn_error $? "no. install the db4 libraries" "$LINENO" 5
@@ -13684,7 +13665,7 @@ $as_echo_n "checking whether db is at le
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -13709,7 +13690,7 @@ fi
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ldb" >&5
 $as_echo_n "checking for main in -ldb... " >&6; }
-if ${ac_cv_lib_db_main+:} false; then :
+if test "${ac_cv_lib_db_main+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -13737,7 +13718,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_db_main" >&5
 $as_echo "$ac_cv_lib_db_main" >&6; }
-if test "x$ac_cv_lib_db_main" = xyes; then :
+if test "x$ac_cv_lib_db_main" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBDB 1
 _ACEOF
@@ -13771,7 +13752,7 @@ $as_echo "external" >&6; }
         if test -z $LUCENE_CORE_JAR; then
           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/lucene-core-2.3.jar" >&5
 $as_echo_n "checking for /usr/share/java/lucene-core-2.3.jar... " >&6; }
-if ${ac_cv_file__usr_share_java_lucene_core_2_3_jar+:} false; then :
+if test "${ac_cv_file__usr_share_java_lucene_core_2_3_jar+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
@@ -13784,13 +13765,13 @@ fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_lucene_core_2_3_jar" >&5
 $as_echo "$ac_cv_file__usr_share_java_lucene_core_2_3_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_lucene_core_2_3_jar" = xyes; then :
+if test "x$ac_cv_file__usr_share_java_lucene_core_2_3_jar" = x""yes; then :
    LUCENE_CORE_JAR=/usr/share/java/lucene-core-2.3.jar
 else
 
               { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/lucene-core.jar" >&5
 $as_echo_n "checking for /usr/share/java/lucene-core.jar... " >&6; }
-if ${ac_cv_file__usr_share_java_lucene_core_jar+:} false; then :
+if test "${ac_cv_file__usr_share_java_lucene_core_jar+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
@@ -13803,12 +13784,12 @@ fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_lucene_core_jar" >&5
 $as_echo "$ac_cv_file__usr_share_java_lucene_core_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_lucene_core_jar" = xyes; then :
+if test "x$ac_cv_file__usr_share_java_lucene_core_jar" = x""yes; then :
    LUCENE_CORE_JAR=/usr/share/java/lucene-core.jar
 else
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/lucene.jar" >&5
 $as_echo_n "checking for /usr/share/java/lucene.jar... " >&6; }
-if ${ac_cv_file__usr_share_java_lucene_jar+:} false; then :
+if test "${ac_cv_file__usr_share_java_lucene_jar+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
@@ -13821,7 +13802,7 @@ fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_lucene_jar" >&5
 $as_echo "$ac_cv_file__usr_share_java_lucene_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_lucene_jar" = xyes; then :
+if test "x$ac_cv_file__usr_share_java_lucene_jar" = x""yes; then :
    LUCENE_CORE_JAR=/usr/share/java/lucene.jar
 else
    as_fn_error $? "lucene-core.jar replacement not found" "$LINENO" 5
@@ -13840,7 +13821,7 @@ fi
           as_ac_File=`$as_echo "ac_cv_file_$LUCENE_CORE_JAR" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LUCENE_CORE_JAR" >&5
 $as_echo_n "checking for $LUCENE_CORE_JAR... " >&6; }
-if eval \${$as_ac_File+:} false; then :
+if eval "test \"\${$as_ac_File+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
@@ -13865,7 +13846,7 @@ fi
         if test -z $LUCENE_ANALYZERS_JAR; then
           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/lucene-analyzers-2.3.jar" >&5
 $as_echo_n "checking for /usr/share/java/lucene-analyzers-2.3.jar... " >&6; }
-if ${ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar+:} false; then :
+if test "${ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
@@ -13878,13 +13859,13 @@ fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar" >&5
 $as_echo "$ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar" = xyes; then :
+if test "x$ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar" = x""yes; then :
    LUCENE_ANALYZERS_JAR=/usr/share/java/lucene-analyzers-2.3.jar
 else
 
               { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/lucene-contrib/lucene-analyzers.jar" >&5
 $as_echo_n "checking for /usr/share/java/lucene-contrib/lucene-analyzers.jar... " >&6; }
-if ${ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar+:} false; then :
+if test "${ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
@@ -13897,7 +13878,7 @@ fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar" >&5
 $as_echo "$ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar" = xyes; then :
+if test "x$ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar" = x""yes; then :
    LUCENE_ANALYZERS_JAR=/usr/share/java/lucene-contrib/lucene-analyzers.jar
 else
    as_fn_error $? "lucene-analyzers.jar replacement not found." "$LINENO" 5
@@ -13912,7 +13893,7 @@ fi
           as_ac_File=`$as_echo "ac_cv_file_$LUCENE_CORE_JAR" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LUCENE_CORE_JAR" >&5
 $as_echo_n "checking for $LUCENE_CORE_JAR... " >&6; }
-if eval \${$as_ac_File+:} false; then :
+if eval "test \"\${$as_ac_File+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
@@ -13995,7 +13976,7 @@ $as_echo "external MySQL" >&6; }
 set dummy mysql_config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MYSQLCONFIG+:} false; then :
+if test "${ac_cv_path_MYSQLCONFIG+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $MYSQLCONFIG in
@@ -14100,7 +14081,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXX
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 	ac_fn_cxx_check_header_mongrel "$LINENO" "mysql_driver.h" "ac_cv_header_mysql_driver_h" "$ac_includes_default"
-if test "x$ac_cv_header_mysql_driver_h" = xyes; then :
+if test "x$ac_cv_header_mysql_driver_h" = x""yes; then :
 
 else
   as_fn_error $? "mysql_driver.h not found. install MySQL C++ Connectivity" "$LINENO" 5
@@ -14109,7 +14090,7 @@ fi
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lmysqlcppconn" >&5
 $as_echo_n "checking for main in -lmysqlcppconn... " >&6; }
-if ${ac_cv_lib_mysqlcppconn_main+:} false; then :
+if test "${ac_cv_lib_mysqlcppconn_main+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -14137,7 +14118,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mysqlcppconn_main" >&5
 $as_echo "$ac_cv_lib_mysqlcppconn_main" >&6; }
-if test "x$ac_cv_lib_mysqlcppconn_main" = xyes; then :
+if test "x$ac_cv_lib_mysqlcppconn_main" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBMYSQLCPPCONN 1
 _ACEOF
@@ -14154,7 +14135,7 @@ $as_echo_n "checking version... " >&6; }
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -14226,7 +14207,7 @@ $as_echo "external" >&6; }
         as_ac_File=`$as_echo "ac_cv_file_$HSQLDB_JAR" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $HSQLDB_JAR" >&5
 $as_echo_n "checking for $HSQLDB_JAR... " >&6; }
-if eval \${$as_ac_File+:} false; then :
+if eval "test \"\${$as_ac_File+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
@@ -14297,7 +14278,7 @@ $as_echo "external" >&6; }
         as_ac_File=`$as_echo "ac_cv_file_$BSH_JAR" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $BSH_JAR" >&5
 $as_echo_n "checking for $BSH_JAR... " >&6; }
-if eval \${$as_ac_File+:} false; then :
+if eval "test \"\${$as_ac_File+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
@@ -14338,7 +14319,7 @@ $as_echo "external" >&6; }
         if test -z $SAXON_JAR; then
           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/saxon9.jar" >&5
 $as_echo_n "checking for /usr/share/java/saxon9.jar... " >&6; }
-if ${ac_cv_file__usr_share_java_saxon9_jar+:} false; then :
+if test "${ac_cv_file__usr_share_java_saxon9_jar+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
@@ -14351,13 +14332,13 @@ fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_saxon9_jar" >&5
 $as_echo "$ac_cv_file__usr_share_java_saxon9_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_saxon9_jar" = xyes; then :
+if test "x$ac_cv_file__usr_share_java_saxon9_jar" = x""yes; then :
    SAXON_JAR=/usr/share/java/saxon9.jar
 else
 
               { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/saxon.jar" >&5
 $as_echo_n "checking for /usr/share/java/saxon.jar... " >&6; }
-if ${ac_cv_file__usr_share_java_saxon_jar+:} false; then :
+if test "${ac_cv_file__usr_share_java_saxon_jar+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
@@ -14370,12 +14351,12 @@ fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_saxon_jar" >&5
 $as_echo "$ac_cv_file__usr_share_java_saxon_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_saxon_jar" = xyes; then :
+if test "x$ac_cv_file__usr_share_java_saxon_jar" = x""yes; then :
    SAXON_JAR=/usr/share/java/saxon.jar
 else
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/saxon9.jar" >&5
 $as_echo_n "checking for /usr/share/java/saxon9.jar... " >&6; }
-if ${ac_cv_file__usr_share_java_saxon9_jar+:} false; then :
+if test "${ac_cv_file__usr_share_java_saxon9_jar+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
@@ -14388,7 +14369,7 @@ fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_saxon9_jar" >&5
 $as_echo "$ac_cv_file__usr_share_java_saxon9_jar" >&6; }
-if test "x$ac_cv_file__usr_share_java_saxon9_jar" = xyes; then :
+if test "x$ac_cv_file__usr_share_java_saxon9_jar" = x""yes; then :
    SAXON_JAR=/usr/share/java/saxon9.jar
 else
    as_fn_error $? "saxon.jar replacement not found" "$LINENO" 5
@@ -14407,7 +14388,7 @@ fi
           as_ac_File=`$as_echo "ac_cv_file_$SAXON_JAR" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SAXON_JAR" >&5
 $as_echo_n "checking for $SAXON_JAR... " >&6; }
-if eval \${$as_ac_File+:} false; then :
+if eval "test \"\${$as_ac_File+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
@@ -14432,7 +14413,7 @@ fi
           as_ac_File=`$as_echo "ac_cv_file_$SERIALIZER_JAR" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SERIALIZER_JAR" >&5
 $as_echo_n "checking for $SERIALIZER_JAR... " >&6; }
-if eval \${$as_ac_File+:} false; then :
+if eval "test \"\${$as_ac_File+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
@@ -14554,7 +14535,7 @@ $as_echo "external" >&6; }
 set dummy curl-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CURLCONFIG+:} false; then :
+if test "${ac_cv_path_CURLCONFIG+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $CURLCONFIG in
@@ -14631,7 +14612,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXX
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
     ac_fn_cxx_check_header_mongrel "$LINENO" "mdds/flat_segment_tree.hpp" "ac_cv_header_mdds_flat_segment_tree_hpp" "$ac_includes_default"
-if test "x$ac_cv_header_mdds_flat_segment_tree_hpp" = xyes; then :
+if test "x$ac_cv_header_mdds_flat_segment_tree_hpp" = x""yes; then :
 
 else
   as_fn_error $? "mdds/flat_segment_tree.hpp not found. install mdds" "$LINENO" 5
@@ -14666,7 +14647,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXX
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
    ac_fn_cxx_check_header_mongrel "$LINENO" "boost/shared_ptr.hpp" "ac_cv_header_boost_shared_ptr_hpp" "$ac_includes_default"
-if test "x$ac_cv_header_boost_shared_ptr_hpp" = xyes; then :
+if test "x$ac_cv_header_boost_shared_ptr_hpp" = x""yes; then :
 
 else
   as_fn_error $? "boost/shared_ptr.hpp not found. install boost" "$LINENO" 5
@@ -14674,7 +14655,7 @@ fi
 
 
    ac_fn_cxx_check_header_mongrel "$LINENO" "boost/spirit/include/classic_core.hpp" "ac_cv_header_boost_spirit_include_classic_core_hpp" "$ac_includes_default"
-if test "x$ac_cv_header_boost_spirit_include_classic_core_hpp" = xyes; then :
+if test "x$ac_cv_header_boost_spirit_include_classic_core_hpp" = x""yes; then :
 
 else
   as_fn_error $? "boost/spirit/include/classic_core.hpp not found. install boost >= 1.36" "$LINENO" 5
@@ -14682,7 +14663,7 @@ fi
 
 
    ac_fn_cxx_check_header_mongrel "$LINENO" "boost/function.hpp" "ac_cv_header_boost_function_hpp" "$ac_includes_default"
-if test "x$ac_cv_header_boost_function_hpp" = xyes; then :
+if test "x$ac_cv_header_boost_function_hpp" = x""yes; then :
 
 else
   as_fn_error $? "boost/function.hpp not found. install boost" "$LINENO" 5
@@ -14748,7 +14729,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXX
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
    ac_fn_cxx_check_header_mongrel "$LINENO" "vigra/copyimage.hxx" "ac_cv_header_vigra_copyimage_hxx" "$ac_includes_default"
-if test "x$ac_cv_header_vigra_copyimage_hxx" = xyes; then :
+if test "x$ac_cv_header_vigra_copyimage_hxx" = x""yes; then :
 
 else
   as_fn_error $? "vigra/copyimage.hxx not found. install vigra" "$LINENO" 5
@@ -14778,7 +14759,7 @@ $as_echo "external" >&6; }
    SYSTEM_ODBC_HEADERS=YES
 
    ac_fn_c_check_header_mongrel "$LINENO" "sqlext.h" "ac_cv_header_sqlext_h" "$ac_includes_default"
-if test "x$ac_cv_header_sqlext_h" = xyes; then :
+if test "x$ac_cv_header_sqlext_h" = x""yes; then :
 
 else
   as_fn_error $? "odbc not found. install odbc" "$LINENO" 5
@@ -14858,7 +14839,7 @@ $as_echo "OpenLDAP" >&6; }
 	   for ac_header in ldap.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "ldap.h" "ac_cv_header_ldap_h" "$ac_includes_default"
-if test "x$ac_cv_header_ldap_h" = xyes; then :
+if test "x$ac_cv_header_ldap_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LDAP_H 1
 _ACEOF
@@ -14871,7 +14852,7 @@ done
 
 	   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_simple_bind_s in -lldap" >&5
 $as_echo_n "checking for ldap_simple_bind_s in -lldap... " >&6; }
-if ${ac_cv_lib_ldap_ldap_simple_bind_s+:} false; then :
+if test "${ac_cv_lib_ldap_ldap_simple_bind_s+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -14905,7 +14886,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_simple_bind_s" >&5
 $as_echo "$ac_cv_lib_ldap_ldap_simple_bind_s" >&6; }
-if test "x$ac_cv_lib_ldap_ldap_simple_bind_s" = xyes; then :
+if test "x$ac_cv_lib_ldap_ldap_simple_bind_s" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBLDAP 1
 _ACEOF
@@ -14920,7 +14901,7 @@ fi
 	   # it has it. Test for it to be sure
          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_set_option in -lldap" >&5
 $as_echo_n "checking for ldap_set_option in -lldap... " >&6; }
-if ${ac_cv_lib_ldap_ldap_set_option+:} false; then :
+if test "${ac_cv_lib_ldap_ldap_set_option+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -14954,7 +14935,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_set_option" >&5
 $as_echo "$ac_cv_lib_ldap_ldap_set_option" >&6; }
-if test "x$ac_cv_lib_ldap_ldap_set_option" = xyes; then :
+if test "x$ac_cv_lib_ldap_ldap_set_option" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBLDAP 1
 _ACEOF
@@ -15018,7 +14999,6 @@ if test -n "$MOZ_NSS_CFLAGS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_MOZ_NSS_CFLAGS=`$PKG_CONFIG --cflags "nss" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -15035,7 +15015,6 @@ if test -n "$MOZ_NSS_LIBS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_MOZ_NSS_LIBS=`$PKG_CONFIG --libs "nss" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -15055,9 +15034,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        MOZ_NSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "nss" 2>&1`
+	        MOZ_NSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "nss" 2>&1`
         else
-	        MOZ_NSS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "nss" 2>&1`
+	        MOZ_NSS_PKG_ERRORS=`$PKG_CONFIG --print-errors "nss" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$MOZ_NSS_PKG_ERRORS" >&5
@@ -15090,7 +15069,6 @@ if test -n "$MOZ_NSS_CFLAGS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_MOZ_NSS_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-nss " 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -15107,7 +15085,6 @@ if test -n "$MOZ_NSS_LIBS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_MOZ_NSS_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-nss " 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -15127,9 +15104,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        MOZ_NSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$MOZ_FLAVOUR-nss " 2>&1`
+	        MOZ_NSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$MOZ_FLAVOUR-nss " 2>&1`
         else
-	        MOZ_NSS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$MOZ_FLAVOUR-nss " 2>&1`
+	        MOZ_NSS_PKG_ERRORS=`$PKG_CONFIG --print-errors "$MOZ_FLAVOUR-nss " 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$MOZ_NSS_PKG_ERRORS" >&5
@@ -15158,7 +15135,7 @@ and MOZ_NSS_LIBS to avoid the need to ca
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
 	MOZ_NSS_CFLAGS=$pkg_cv_MOZ_NSS_CFLAGS
 	MOZ_NSS_LIBS=$pkg_cv_MOZ_NSS_LIBS
@@ -15187,7 +15164,6 @@ if test -n "$MOZ_NSPR_CFLAGS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_MOZ_NSPR_CFLAGS=`$PKG_CONFIG --cflags "nspr " 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -15204,7 +15180,6 @@ if test -n "$MOZ_NSPR_LIBS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_MOZ_NSPR_LIBS=`$PKG_CONFIG --libs "nspr " 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -15224,9 +15199,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        MOZ_NSPR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "nspr " 2>&1`
+	        MOZ_NSPR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "nspr " 2>&1`
         else
-	        MOZ_NSPR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "nspr " 2>&1`
+	        MOZ_NSPR_PKG_ERRORS=`$PKG_CONFIG --print-errors "nspr " 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$MOZ_NSPR_PKG_ERRORS" >&5
@@ -15255,7 +15230,7 @@ and MOZ_NSPR_LIBS to avoid the need to c
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
 	MOZ_NSPR_CFLAGS=$pkg_cv_MOZ_NSPR_CFLAGS
 	MOZ_NSPR_LIBS=$pkg_cv_MOZ_NSPR_LIBS
@@ -15281,7 +15256,6 @@ if test -n "$MOZ_NSPR_CFLAGS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_MOZ_NSPR_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-nspr " 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -15298,7 +15272,6 @@ if test -n "$MOZ_NSPR_LIBS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_MOZ_NSPR_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-nspr " 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -15318,9 +15291,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        MOZ_NSPR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$MOZ_FLAVOUR-nspr " 2>&1`
+	        MOZ_NSPR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$MOZ_FLAVOUR-nspr " 2>&1`
         else
-	        MOZ_NSPR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$MOZ_FLAVOUR-nspr " 2>&1`
+	        MOZ_NSPR_PKG_ERRORS=`$PKG_CONFIG --print-errors "$MOZ_FLAVOUR-nspr " 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$MOZ_NSPR_PKG_ERRORS" >&5
@@ -15349,7 +15322,7 @@ and MOZ_NSPR_LIBS to avoid the need to c
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
 	MOZ_NSPR_CFLAGS=$pkg_cv_MOZ_NSPR_CFLAGS
 	MOZ_NSPR_LIBS=$pkg_cv_MOZ_NSPR_LIBS
@@ -15375,7 +15348,6 @@ if test -n "$MOZILLAXPCOM_CFLAGS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_MOZILLAXPCOM_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-xpcom" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -15392,7 +15364,6 @@ if test -n "$MOZILLAXPCOM_LIBS"; then
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_MOZILLAXPCOM_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-xpcom" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -15412,9 +15383,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        MOZILLAXPCOM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$MOZ_FLAVOUR-xpcom" 2>&1`
+	        MOZILLAXPCOM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$MOZ_FLAVOUR-xpcom" 2>&1`
         else
-	        MOZILLAXPCOM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$MOZ_FLAVOUR-xpcom" 2>&1`
+	        MOZILLAXPCOM_PKG_ERRORS=`$PKG_CONFIG --print-errors "$MOZ_FLAVOUR-xpcom" 2>&1`
         fi

[... 2582 lines stripped ...]


Mime
View raw message