From 0c53c31250a1e5f51beee0da5b8074dd4efa745a Mon Sep 17 00:00:00 2001 From: Release Engineers Date: Wed, 5 Aug 2009 13:37:54 +0000 Subject: CWS-TOOLING: integrate CWS sb108 2009-07-03 09:29:08 +0200 sb r273678 : #i100407# reverted previous -c 269874 again (will be obsoleted by CWS moz2seamonkey01 soon, anyway) 2009-06-23 10:22:43 +0200 sb r273261 : missing dependency 2009-06-22 12:35:51 +0200 sb r273214 : CWS-TOOLING: rebase CWS sb108 to trunk@272827 (milestone: DEV300:m50) 2009-03-23 15:44:53 +0100 is r269881 : #i100443# patch for bsd builds 2009-03-23 14:56:31 +0100 sb r269874 : #i100407# fix for FreeBSD (patch by maho) --- solenv/bin/modules/installer/parameter.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm index 9bece8a3d069..bc797d257d14 100644 --- a/solenv/bin/modules/installer/parameter.pm +++ b/solenv/bin/modules/installer/parameter.pm @@ -297,6 +297,7 @@ sub setglobalvariables { if ( $installer::globals::packageformat eq "bsd" ) { + $installer::globals::epmoutpath = "freebsd"; $installer::globals::isfreebsdpkgbuild = 1; } } -- cgit From ced0d68a1ed76ada3a4908bcc1e2b94d48fd0f47 Mon Sep 17 00:00:00 2001 From: Release Engineers Date: Thu, 6 Aug 2009 07:01:05 +0000 Subject: CWS-TOOLING: integrate CWS jsc320 2009-07-31 11:40:04 +0200 jsc r274518 : #103926# apply patch 2009-07-16 17:17:01 +0200 jsc r274063 : #i103311# check new Solaris compiler version ox5100 2009-07-07 17:20:41 +0200 jsc r273811 : cleanup 2009-07-07 15:21:26 +0200 jsc r273799 : #98322# correct LD_LIBRARY_PATH, sdk/lib dir instead of sdkout/platfrom/lib, all unix excepting mac 2009-07-07 15:07:05 +0200 jsc r273798 : #i98322# correct link 2009-07-07 09:43:57 +0200 jsc r273773 : #i98322# correct link path 2009-07-06 15:49:07 +0200 jsc r273749 : #i98322# correct typo 2009-07-06 14:17:27 +0200 jsc r273743 : #i103311# support sunstudio compiler 12u1, version 5.10 (which results in 0x5100) 2009-07-03 13:54:58 +0200 jsc r273693 : #i96576# support opensolaris and enhance docu to relfect usage of gmake 2009-07-02 13:12:02 +0200 jsc r273643 : #i103260# improve fix by using EXECPOST variable 2009-07-02 13:11:30 +0200 jsc r273642 : #i103260# improve fix by using EXECPOST variable 2009-07-02 13:05:35 +0200 jsc r273640 : #i103260# correct typo for windows 2009-07-02 13:01:34 +0200 jsc r273639 : #i103260# provide regview with path as argument 2009-07-01 07:18:01 +0200 jsc r273541 : CWS-TOOLING: rebase CWS jsc320 to trunk@273468 (milestone: DEV300:m51) 2009-06-30 08:01:13 +0200 jsc r273485 : #98322# include import purpenvhelper lib under windows 2009-06-10 15:07:29 +0200 jsc r272815 : CWS-TOOLING: rebase CWS jsc320 to trunk@272291 (milestone: DEV300:m49) 2009-05-27 09:36:23 +0200 jsc r272329 : #i98322# create link for purpenvhelper library in SDK 2009-05-27 09:35:41 +0200 jsc r272328 : #i98322# create link for purpenvhelpr library in SDK 2009-05-14 16:19:41 +0200 jsc r271900 : increase version number in SDK header image 2009-05-14 16:11:05 +0200 jsc r271899 : #i101408# new version 3.2 2009-05-14 15:33:47 +0200 jsc r271894 : #i99163# apply patch to correct wrong tags for autodoc 2009-05-14 14:49:58 +0200 jsc r271889 : #i99707# apply patch to remove unused code --- scp2/source/sdkoo/sdkoo.scp | 10 ++++++++++ stlport/STLport-4.0-sunstudio12u1.patch | 21 +++++++++++++++++++++ stlport/makefile.mk | 2 +- 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 stlport/STLport-4.0-sunstudio12u1.patch diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp index f469a8178b5a..b8dd4e5faed4 100644 --- a/scp2/source/sdkoo/sdkoo.scp +++ b/scp2/source/sdkoo/sdkoo.scp @@ -236,3 +236,13 @@ Unixlink gid_Unixlink_Cppuhelper_Link_Sdk Target = "../../ure-link/lib/" SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3"); End #endif + +#if (!defined(WNT) && !defined( MACOSX) ) +Unixlink gid_Unixlink_Purpenvhelper_Link_Sdk + BIN_FILE_BODY; + Styles = (); + Name = SCP2_URE_DL_UNO_COMID_NORMAL("purpenvhelper"); + Dir = gid_Dir_Lib_Sdk; + Target = "../../ure-link/lib/" SCP2_URE_DL_UNO_COMID_VER("purpenvhelper", "3"); +End +#endif diff --git a/stlport/STLport-4.0-sunstudio12u1.patch b/stlport/STLport-4.0-sunstudio12u1.patch new file mode 100644 index 000000000000..49d76abbd836 --- /dev/null +++ b/stlport/STLport-4.0-sunstudio12u1.patch @@ -0,0 +1,21 @@ +--- misc/STLport-4.0/stlport/config/stl_sunpro.h Mon Jul 6 13:43:35 2009 ++++ misc/build/STLport-4.0/stlport/config/stl_sunpro.h Mon Jul 6 13:56:56 2009 +@@ -31,7 +31,8 @@ + # endif + # endif + +-# if (__SUNPRO_CC < 0x600) ++// support SunStudio compiler 12u1 version 5.10 (which results in 0x5100) ++# if (__SUNPRO_CC < 0x600 || ((__SUNPRO_CC | 0x0FFF) > 0x0FFF && __SUNPRO_CC < 0x6000)) + // those are tested and proved not to work... + # define __STL_STATIC_ARRAY_BUG 1 + # define __STL_STATIC_CONST_INIT_BUG 1 +@@ -57,7 +58,7 @@ + # define __STL_NO_FRIEND_TEMPLATES 1 + #endif + +-# if (__SUNPRO_CC < 0x600) ++# if (__SUNPRO_CC < 0x600 || ((__SUNPRO_CC | 0x0FFF) > 0x0FFF && __SUNPRO_CC < 0x6000)) + # define __STL_HAS_NO_NEW_C_HEADERS 1 + # define __STL_NO_EXPLICIT_FUNCTION_TMPL_ARGS + # define __STL_NON_TYPE_TMPL_PARAM_BUG 1 diff --git a/stlport/makefile.mk b/stlport/makefile.mk index 9689db5da3b6..ab4dfa244e72 100644 --- a/stlport/makefile.mk +++ b/stlport/makefile.mk @@ -77,7 +77,7 @@ $(INCCOM)$/stlport$/vector: systemstl$/$$(@:f) .ENDIF .ELSE TARFILE_NAME=STLport-4.0 - PATCH_FILES=STLport-4.0.patch + PATCH_FILES=STLport-4.0.patch STLport-4.0-sunstudio12u1.patch # To disable warnings from within STLport headers on unxsoli4 and # unxsols4, STLport-4.0.patch had to be extended mechanically by # -- cgit From adff17ff66d58e9a7ec5815b5e343017f88d4664 Mon Sep 17 00:00:00 2001 From: Release Engineers Date: Thu, 6 Aug 2009 15:00:07 +0000 Subject: CWS-TOOLING: integrate CWS tempdir 2009-08-03 21:39:51 +0200 cloph r274596 : ups, broke the build, get_tmp_dir always creates additional dir (misnomer), use TMPPATH var 2009-08-03 18:03:30 +0200 cloph r274593 : use get_tmp_dir for the html-output #i83414# 2009-08-03 17:51:06 +0200 cloph r274590 : mention issue-number in description for GXX_INCLUDE_PATH workaround (100049) whitespace cleanup 2009-07-25 15:05:27 +0200 rene r274340 : #i100049# workaround for mandriva gcc 2009-07-25 14:15:08 +0200 rene r274339 : #i83414#, #i83901#, #i103782# remove T(E)MP, rely on TMPDIR. Default to /tmp 2009-07-25 13:51:00 +0200 rene r274337 : #i103805# missing @ --- configure | 14459 +++++++++++++++++++++++------------------------ configure.in | 4 + set_soenv.in | 11 +- solenv/bin/build.pl | 6 +- solenv/bin/mhids.pl | 4 +- solenv/inc/settings.mk | 2 +- 6 files changed, 7022 insertions(+), 7464 deletions(-) diff --git a/configure b/configure index 8ba4664381db..156b853a06a6 100755 --- a/configure +++ b/configure @@ -1,10 +1,10 @@ #! /bin/sh # From configure.in Revision: 1.290 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63. +# Generated by GNU Autoconf 2.61. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## @@ -16,7 +16,7 @@ DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST @@ -38,45 +38,17 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits -as_nl=' -' -export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi - # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then - PATH_SEPARATOR=: - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { - (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || - PATH_SEPARATOR=';' - } + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh fi # Support unset when possible. @@ -92,6 +64,8 @@ fi # there to prevent editors from complaining about space-tab. # (If _AS_PATH_WALK were called with IFS unset, it would disable word # splitting by setting IFS to empty value.) +as_nl=' +' IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. @@ -114,7 +88,7 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 { (exit 1); exit 1; } fi @@ -127,10 +101,17 @@ PS2='> ' PS4='+ ' # NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + fi +done # Required to use basename. if expr a : '\(a\)' >/dev/null 2>&1 && @@ -152,7 +133,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | +echo X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -178,7 +159,7 @@ else as_have_required=no fi - if test $as_have_required = yes && (eval ": + if test $as_have_required = yes && (eval ": (as_func_return () { (exit \$1) } @@ -260,7 +241,7 @@ IFS=$as_save_IFS if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST @@ -281,7 +262,7 @@ _ASEOF if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST @@ -361,10 +342,10 @@ fi if test "x$CONFIG_SHELL" != x; then for as_var in BASH_ENV ENV - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - done - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + done + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} fi @@ -433,10 +414,9 @@ fi test \$exitcode = 0") || { echo No shell found that supports shell functions. - echo Please tell bug-autoconf@gnu.org about your system, - echo including any error possibly output before this message. - echo This can help us improve future autoconf versions. - echo Configuration will now proceed without shell functions. + echo Please tell autoconf@gnu.org about your system, + echo including any error possibly output before this + echo message } @@ -472,7 +452,7 @@ test \$exitcode = 0") || { s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems @@ -500,6 +480,7 @@ case `echo -n x` in *) ECHO_N='-n';; esac + if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -512,22 +493,19 @@ if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file else rm -f conf$$.dir - mkdir conf$$.dir 2>/dev/null -fi -if (echo >conf$$.file) 2>/dev/null; then - if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else + mkdir conf$$.dir +fi +echo >conf$$.file +if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -p' - fi +elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln else as_ln_s='cp -p' fi @@ -552,10 +530,10 @@ else as_test_x=' eval sh -c '\'' if test -d "$1"; then - test -d "$1/."; + test -d "$1/."; else case $1 in - -*)set "./$1";; + -*)set "./$1";; esac; case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ???[sx]*):;;*)false;;esac;fi @@ -635,546 +613,380 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='LTLIBOBJS -LIBOBJS -BUILD_TYPE -LOCAL_SOLVER -VERBOSE -ENABLE_LAYOUT -ENABLE_STATIC_GTK -UNIXWRAPPERNAME -OOO_VENDOR -ABOUT_BITMAPS -INTRO_BITMAPS -WITH_DICT -WITH_POOR_HELP_LOCALIZATIONS -WITH_LANG -ANT_LIB -ANT_HOME -ANT -XINERAMA_LINK -USE_XINERAMA -SCPDEFS -WITHOUT_AFMS -WITHOUT_PPDS -WITH_FONTS -SYSTEM_MSPACK -WITH_FONTOOO -ENABLE_KAB -ENABLE_EVOAB2 -GOBJECT_LIBS -GOBJECT_CFLAGS -ENABLE_LOCKDOWN -KDE_LIBS -KDE_CFLAGS -MOC -COMMONS_LOGGING_JAR -COMMONS_HTTPCLIENT_JAR -COMMONS_LANG_JAR -COMMONS_CODEC_JAR -SYSTEM_APACHE_COMMONS -LIBSERIALIZER_JAR -LIBFONTS_JAR -LIBREPOSITORY_JAR -LIBFORMULA_JAR -LIBLOADER_JAR -LIBLAYOUT_JAR -LIBBASE_JAR -JFREEREPORT_JAR -FLUTE_JAR -LIBXML_JAR -SAC_JAR -SYSTEM_JFREEREPORT -ENABLE_REPORTBUILDER -SERVLETAPI_JAR -SYSTEM_SERVLETAPI -ENABLE_MEDIAWIKI -SYSTEM_POPPLER -ENABLE_PDFIMPORT -POPPLER_LIBS -POPPLER_CFLAGS -ENABLE_PRESENTER_SCREEN -ENABLE_MINIMIZER -ENABLE_OPENGL -SYSTEM_CAIRO -BUILD_PIXMAN -ENABLE_CAIRO -CAIRO_LIBS -CAIRO_CFLAGS -ENABLE_SYSTRAY_GTK -ENABLE_DBUS -ENABLE_GIO -GIO_LIBS -GIO_CFLAGS -DBUS_LIBS -DBUS_CFLAGS -GTK_LIBS -GTK_CFLAGS -ENABLE_GNOMEVFS -GNOMEVFS_LIBS -GNOMEVFS_CFLAGS -ENABLE_GCONF -GCONF_LIBS -GCONF_CFLAGS -ENABLE_KDE -ENABLE_GTK -WITH_GPC -ZIP_HOME -UNZIP -ZIP -ASM_HOME -ML_EXE -CYGWIN_PATH -GNUPATCH -GNUCP -PATCH -FLEX -BISON -NSIS_PATH -DIRECTXSDK_LIB -DIRECTXSDK_HOME -WINDOWS_VISTA_PSDK -PSDK_HOME -SYSTEM_LPSOLVE -SYSTEM_MYTHES -HYPHEN_LIB -SYSTEM_HYPH -SYSTEM_HUNSPELL -HUNSPELL_LIBS -HUNSPELL_CFLAGS -SYSTEM_REDLAND -REDLAND_LIBS -REDLAND_CFLAGS -AGG_VERSION -SYSTEM_AGG -AGG_LIBS -AGG_CFLAGS -ENABLE_AGG -NEON_VERSION -SYSTEM_NEON -SYSTEM_OPENSSL -OPENSSL_LIBS -OPENSSL_CFLAGS -NEON_LIBS -NEON_CFLAGS -DISABLE_NEON -ENABLE_RANDR -XRANDR_DLOPEN -XRANDR_LIBS -XRANDR_CFLAGS -XRENDER_LINK -SYSTEM_XRENDER_HEADERS -DISABLE_XAW -XAU_LIBS -XLIB -XINC -X_EXTRA_LIBS -X_LIBS -X_PRE_LIBS -X_CFLAGS -XMKMF -SYSTEM_ICU -SYSTEM_GENCMN -SYSTEM_GENCCODE -SYSTEM_GENBRK -SYSTEM_SANE_HEADER -MOZ_LDAP_CFLAGS -MOZ_LIB_XPCOM -MOZ_LIB -MOZ_INC -MOZ_FLAVOUR -SYSTEM_MOZILLA -BUILD_MOZAB -MOZLIBREQ_LIBS -MOZLIBREQ_CFLAGS -MOZGTK2_LIBS -MOZGTK2_CFLAGS -MOZILLA_TOOLKIT -MOZILLA_VERSION -MOZILLAXPCOM_LIBS -MOZILLAXPCOM_CFLAGS -NSPR_LIB -MOZ_NSPR_LIBS -MOZ_NSPR_CFLAGS -NSS_LIB -MOZ_NSS_LIBS -MOZ_NSS_CFLAGS -WITH_OPENLDAP -WITH_LDAP -WITH_MOZILLA -SYSTEM_ODBC_HEADERS -SYSTEM_VIGRA -SYSTEM_BOOST -CURL_LIBS -CURL_CFLAGS -SYSTEM_CURL -CURLCONFIG -SAXON_JAR -SYSTEM_SAXON -SERIALIZER_JAR -BSH_JAR -SYSTEM_BSH -HSQLDB_JAR -SYSTEM_HSQLDB -LUCENE_ANALYZERS_JAR -LUCENE_CORE_JAR -SYSTEM_LUCENE -DB_JAR -DB_INCLUDES -DB_VERSION -SYSTEM_DB -HOME -PYTHON_LIBS -PYTHON_CFLAGS -SYSTEM_PYTHON -BZIP2 -pkgpyexecdir -pyexecdir -pkgpythondir -pythondir -PYTHON_PLATFORM -PYTHON_EXEC_PREFIX -PYTHON_PREFIX -PYTHON_VERSION -PYTHON -SYSTEM_LIBXML -LIBXML_LIBS -LIBXML_CFLAGS -SYSTEM_LIBXSLT -XSLTPROC -LIBXSLT_LIBS -LIBXSLT_CFLAGS -USE_FT_EMBOLDEN -FREETYPE_LIBS -FREETYPE_CFLAGS -SYSTEM_LIBWPD -LIBWPD_LIBS -LIBWPD_CFLAGS -PKG_CONFIG -SYSTEM_EXPAT -SYSTEM_JPEG -SYSTEM_ZLIB -SYSTEM_STDLIBS -BUILD_QADEVOOO -BUILD_UNOWINREG -MINGWSTRIP -MINGWCXX -GPERF -RPM -PKGFORMAT -BUILD_EPM -PKGMK -DPKG -EPM -BUILD_DMAKE -DMAKE -JAVAFLAGS -JDK -JAVA_HOME -JAVAAOTCOMPILER -AWTLIB -JAVADOC -JAVACISGCJ -JAVACOMPILER -JAVAINTERPRETER -SOLAR_JAVA -BUILD_VER_STRING -ALLOC -HAVE_GCC_VISIBILITY_FEATURE -USE_SYSTEM_STL -STLPORT_VER -STLPORT4 -MINGW_LIB_INCLUDE_PATH -GXX_INCLUDE_PATH -CRYPT_LINK -PAM_LINK -NEW_SHADOW_API -PAM -VBA_EXTENSION -ENABLE_VBA -LFS_CFLAGS -WORDS_BIGENDIAN -SIZEOF_LONG -CXXCPP -ac_ct_CXX -CXXFLAGS -CXX -CPP -FRAME_HOME -CSC_PATH -MIDL_PATH -USE_MINGW -COMEX -MSPDB_PATH -PERL -HAVE_LD_HASH_STYLE -_cc -GNUMAKE -NO_HIDS -ENABLE_PCH -HAVE_LD_BSYMBOLIC_FUNCTIONS -GCCVER -COMPATH -OBJEXT -EXEEXT -ac_ct_CC -CPPFLAGS -LDFLAGS -CFLAGS -CC -GCC_HOME -SHELLPATH -WITH_MINGWIN -USE_SHELL -THES_SYSTEM_DIR -HYPH_SYSTEM_DIR -DICT_SYSTEM_DIR -SYSTEM_DICTS -WITH_MYSPELL_DICTS -ENABLE_RPATH -DISABLE_ATL -DISABLE_ACTIVEX -ENABLE_DIRECTX -WITH_BINFILTER -ENABLE_FONTCONFIG -ENABLE_CUPS -DISABLE_STRIP -ENABLE_SYMBOLS -PROEXT -PROFULLSWITCH -PRODUCT -ENABLE_DEBUG -ENABLE_WERROR -VC_STANDARD -ENABLE_CRASHDUMP -PTHREAD_LIBS -PTHREAD_CFLAGS -OSVERSION -GNUTAR -target_os -target_vendor -target_cpu -target -host_os -host_vendor -host_cpu -host -build_os -build_vendor -build_cpu -build -SOURCEVERSION -UPD -_solenv -LOCAL_SOLENV -SED -AWK -EGREP -GREP -target_alias -host_alias -build_alias -LIBS -ECHO_T -ECHO_N -ECHO_C -DEFS -mandir -localedir -libdir -psdir -pdfdir -dvidir -htmldir -infodir -docdir -oldincludedir -includedir -localstatedir -sharedstatedir -sysconfdir -datadir -datarootdir -libexecdir -sbindir -bindir -program_transform_name -prefix -exec_prefix -PACKAGE_BUGREPORT -PACKAGE_STRING -PACKAGE_VERSION -PACKAGE_TARNAME -PACKAGE_NAME +ac_subst_vars='SHELL PATH_SEPARATOR -SHELL' +PACKAGE_NAME +PACKAGE_TARNAME +PACKAGE_VERSION +PACKAGE_STRING +PACKAGE_BUGREPORT +exec_prefix +prefix +program_transform_name +bindir +sbindir +libexecdir +datarootdir +datadir +sysconfdir +sharedstatedir +localstatedir +includedir +oldincludedir +docdir +infodir +htmldir +dvidir +pdfdir +psdir +libdir +localedir +mandir +DEFS +ECHO_C +ECHO_N +ECHO_T +LIBS +build_alias +host_alias +target_alias +GREP +EGREP +AWK +SED +LOCAL_SOLENV +_solenv +UPD +SOURCEVERSION +build +build_cpu +build_vendor +build_os +host +host_cpu +host_vendor +host_os +target +target_cpu +target_vendor +target_os +GNUTAR +OSVERSION +PTHREAD_CFLAGS +PTHREAD_LIBS +ENABLE_CRASHDUMP +VC_STANDARD +ENABLE_WERROR +ENABLE_DEBUG +PRODUCT +PROFULLSWITCH +PROEXT +ENABLE_SYMBOLS +DISABLE_STRIP +ENABLE_CUPS +ENABLE_FONTCONFIG +WITH_BINFILTER +ENABLE_DIRECTX +DISABLE_ACTIVEX +DISABLE_ATL +ENABLE_RPATH +WITH_MYSPELL_DICTS +SYSTEM_DICTS +DICT_SYSTEM_DIR +HYPH_SYSTEM_DIR +THES_SYSTEM_DIR +USE_SHELL +WITH_MINGWIN +SHELLPATH +GCC_HOME +CC +CFLAGS +LDFLAGS +CPPFLAGS +ac_ct_CC +EXEEXT +OBJEXT +COMPATH +GCCVER +HAVE_LD_BSYMBOLIC_FUNCTIONS +ENABLE_PCH +NO_HIDS +GNUMAKE +_cc +HAVE_LD_HASH_STYLE +PERL +MSPDB_PATH +COMEX +USE_MINGW +MIDL_PATH +CSC_PATH +FRAME_HOME +CPP +CXX +CXXFLAGS +ac_ct_CXX +CXXCPP +SIZEOF_LONG +WORDS_BIGENDIAN +LFS_CFLAGS +ENABLE_VBA +VBA_EXTENSION +PAM +NEW_SHADOW_API +PAM_LINK +CRYPT_LINK +GXX_INCLUDE_PATH +MINGW_LIB_INCLUDE_PATH +STLPORT4 +STLPORT_VER +USE_SYSTEM_STL +HAVE_GCC_VISIBILITY_FEATURE +ALLOC +BUILD_VER_STRING +SOLAR_JAVA +JAVAINTERPRETER +JAVACOMPILER +JAVACISGCJ +JAVADOC +AWTLIB +JAVAAOTCOMPILER +JAVA_HOME +JDK +JAVAFLAGS +DMAKE +BUILD_DMAKE +EPM +DPKG +PKGMK +BUILD_EPM +PKGFORMAT +RPM +GPERF +MINGWCXX +MINGWSTRIP +BUILD_UNOWINREG +BUILD_QADEVOOO +SYSTEM_STDLIBS +SYSTEM_ZLIB +SYSTEM_JPEG +SYSTEM_EXPAT +PKG_CONFIG +LIBWPD_CFLAGS +LIBWPD_LIBS +SYSTEM_LIBWPD +FREETYPE_CFLAGS +FREETYPE_LIBS +USE_FT_EMBOLDEN +LIBXSLT_CFLAGS +LIBXSLT_LIBS +XSLTPROC +SYSTEM_LIBXSLT +LIBXML_CFLAGS +LIBXML_LIBS +SYSTEM_LIBXML +PYTHON +PYTHON_VERSION +PYTHON_PREFIX +PYTHON_EXEC_PREFIX +PYTHON_PLATFORM +pythondir +pkgpythondir +pyexecdir +pkgpyexecdir +BZIP2 +SYSTEM_PYTHON +PYTHON_CFLAGS +PYTHON_LIBS +HOME +SYSTEM_DB +DB_VERSION +DB_INCLUDES +DB_JAR +SYSTEM_LUCENE +LUCENE_CORE_JAR +LUCENE_ANALYZERS_JAR +SYSTEM_HSQLDB +HSQLDB_JAR +SYSTEM_BSH +BSH_JAR +SERIALIZER_JAR +SYSTEM_SAXON +SAXON_JAR +CURLCONFIG +SYSTEM_CURL +CURL_CFLAGS +CURL_LIBS +SYSTEM_BOOST +SYSTEM_VIGRA +SYSTEM_ODBC_HEADERS +WITH_MOZILLA +WITH_LDAP +WITH_OPENLDAP +MOZ_NSS_CFLAGS +MOZ_NSS_LIBS +NSS_LIB +MOZ_NSPR_CFLAGS +MOZ_NSPR_LIBS +NSPR_LIB +MOZILLAXPCOM_CFLAGS +MOZILLAXPCOM_LIBS +MOZILLA_VERSION +MOZILLA_TOOLKIT +MOZGTK2_CFLAGS +MOZGTK2_LIBS +MOZLIBREQ_CFLAGS +MOZLIBREQ_LIBS +BUILD_MOZAB +SYSTEM_MOZILLA +MOZ_FLAVOUR +MOZ_INC +MOZ_LIB +MOZ_LIB_XPCOM +MOZ_LDAP_CFLAGS +SYSTEM_SANE_HEADER +SYSTEM_GENBRK +SYSTEM_GENCCODE +SYSTEM_GENCMN +SYSTEM_ICU +XMKMF +X_CFLAGS +X_PRE_LIBS +X_LIBS +X_EXTRA_LIBS +XINC +XLIB +XAU_LIBS +DISABLE_XAW +SYSTEM_XRENDER_HEADERS +XRENDER_LINK +XRANDR_CFLAGS +XRANDR_LIBS +XRANDR_DLOPEN +ENABLE_RANDR +DISABLE_NEON +NEON_CFLAGS +NEON_LIBS +OPENSSL_CFLAGS +OPENSSL_LIBS +SYSTEM_OPENSSL +SYSTEM_NEON +NEON_VERSION +ENABLE_AGG +AGG_CFLAGS +AGG_LIBS +SYSTEM_AGG +AGG_VERSION +REDLAND_CFLAGS +REDLAND_LIBS +SYSTEM_REDLAND +HUNSPELL_CFLAGS +HUNSPELL_LIBS +SYSTEM_HUNSPELL +SYSTEM_HYPH +HYPHEN_LIB +SYSTEM_MYTHES +SYSTEM_LPSOLVE +PSDK_HOME +WINDOWS_VISTA_PSDK +DIRECTXSDK_HOME +DIRECTXSDK_LIB +NSIS_PATH +BISON +FLEX +PATCH +GNUCP +GNUPATCH +CYGWIN_PATH +ML_EXE +ASM_HOME +ZIP +UNZIP +ZIP_HOME +WITH_GPC +ENABLE_GTK +ENABLE_KDE +GCONF_CFLAGS +GCONF_LIBS +ENABLE_GCONF +GNOMEVFS_CFLAGS +GNOMEVFS_LIBS +ENABLE_GNOMEVFS +GTK_CFLAGS +GTK_LIBS +DBUS_CFLAGS +DBUS_LIBS +GIO_CFLAGS +GIO_LIBS +ENABLE_GIO +ENABLE_DBUS +ENABLE_SYSTRAY_GTK +CAIRO_CFLAGS +CAIRO_LIBS +ENABLE_CAIRO +BUILD_PIXMAN +SYSTEM_CAIRO +ENABLE_OPENGL +ENABLE_MINIMIZER +ENABLE_PRESENTER_SCREEN +POPPLER_CFLAGS +POPPLER_LIBS +ENABLE_PDFIMPORT +SYSTEM_POPPLER +ENABLE_MEDIAWIKI +SYSTEM_SERVLETAPI +SERVLETAPI_JAR +ENABLE_REPORTBUILDER +SYSTEM_JFREEREPORT +SAC_JAR +LIBXML_JAR +FLUTE_JAR +JFREEREPORT_JAR +LIBBASE_JAR +LIBLAYOUT_JAR +LIBLOADER_JAR +LIBFORMULA_JAR +LIBREPOSITORY_JAR +LIBFONTS_JAR +LIBSERIALIZER_JAR +SYSTEM_APACHE_COMMONS +COMMONS_CODEC_JAR +COMMONS_LANG_JAR +COMMONS_HTTPCLIENT_JAR +COMMONS_LOGGING_JAR +MOC +KDE_CFLAGS +KDE_LIBS +ENABLE_LOCKDOWN +GOBJECT_CFLAGS +GOBJECT_LIBS +ENABLE_EVOAB2 +ENABLE_KAB +WITH_FONTOOO +SYSTEM_MSPACK +WITH_FONTS +WITHOUT_PPDS +WITHOUT_AFMS +SCPDEFS +USE_XINERAMA +XINERAMA_LINK +ANT +ANT_HOME +ANT_LIB +WITH_LANG +WITH_POOR_HELP_LOCALIZATIONS +WITH_DICT +INTRO_BITMAPS +ABOUT_BITMAPS +OOO_VENDOR +UNIXWRAPPERNAME +ENABLE_STATIC_GTK +ENABLE_LAYOUT +VERBOSE +LOCAL_SOLVER +BUILD_TYPE +LIBOBJS +LTLIBOBJS' ac_subst_files='' -ac_user_opts=' -enable_option_checking -with_gnu_patch -with_agg -with_gnu_cp -with_gpc -enable_ldap -with_openldap -enable_lockdown -enable_vba -with_vba_package_format -enable_pch -enable_hids -enable_mozilla -with_fonts -with_ppds -with_afms -enable_epm -with_epm -with_package_format -enable_odk -enable_qadevooo -enable_fontooo -enable_mathmldtd -enable_evolution2 -with_system_stdlibs -with_system_mspack -enable_cups -enable_fontconfig -enable_directx -enable_activex -enable_atl -enable_symbols -enable_strip_solver -enable_werror -enable_debug -enable_dbgutil -enable_crashdump -enable_cl_standard -enable_gtk -enable_systray -enable_cairo -with_system_cairo -enable_opengl -enable_dbus -enable_gconf -enable_gnome_vfs -enable_gio -enable_static_gtk -enable_layout -enable_build_mozilla -with_mozilla_version -with_mozilla_toolkit -enable_kde -enable_kdeab -enable_binfilter -enable_rpath -enable_pam -enable_pam_link -enable_crypt_link -enable_xrender_link -enable_randr -enable_randr_link -with_myspell_dicts -with_system_dicts -with_external_dict_dir -with_external_hyph_dir -with_external_thes_dir -with_system_libs -with_system_headers -with_system_jars -with_system_zlib -with_system_openssl -with_system_jpeg -with_system_expat -with_system_libwpd -with_system_libxml -with_system_python -with_system_icu -with_system_poppler -with_system_db -with_system_lucene -with_lucene_core_jar -with_lucene_analyzers_jar -with_system_hsqldb -with_hsqldb_jar -with_system_beanshell -with_beanshell_jar -enable_minimizer -enable_presenter_console -enable_pdfimport -enable_wiki_publisher -with_commons_codec_jar -with_commons_lang_jar -with_commons_httpclient_jar -with_commons_logging_jar -with_servlet_api_jar -enable_report_builder -with_system_jfreereport -with_sac_jar -with_libxml_jar -with_flute_jar -with_jfreereport_jar -with_liblayout_jar -with_libloader_jar -with_libformula_jar -with_librepository_jar -with_libfonts_jar -with_libserializer_jar -with_libbase_jar -with_system_saxon -with_saxon_jar -with_system_libxslt -with_system_odbc -with_system_sane -with_system_xrender -with_system_curl -with_system_boost -with_system_vigra -enable_neon -enable_Xaw -with_system_neon -with_system_agg -with_system_hunspell -with_system_mythes -with_system_altlinuxhyph -with_system_lpsolve -with_system_mozilla -with_stlport -with_jdk_home -with_gxx_include_path -with_java -enable_gcjaot -with_ant_home -with_perl_home -with_cl_home -with_mspdb_path -with_midl_path -with_csc_path -with_nsis_path -with_frame_home -with_psdk_home -with_directx_home -with_local_solenv -with_local_solver -enable_check_only -with_lang -with_poor_help_localizations -with_dict -with_intro_bitmaps -with_about_bitmaps -with_vendor -with_unix_wrapper -with_asm_home -with_os_version -with_unzip_home -with_zip_home -with_mingwin -with_use_shell -with_build_version -enable_sgistl -with_alloc -enable_verbose -enable_largefile -with_x -' ac_precious_vars='build_alias host_alias target_alias @@ -1194,8 +1006,6 @@ XMKMF' # Initialize some variables set by options. ac_init_help= ac_init_version=false -ac_unrecognized_opts= -ac_unrecognized_sep= # The variables have the same names as the options, with # dashes changed to underlines. cache_file=/dev/null @@ -1294,21 +1104,13 @@ do datarootdir=$ac_optarg ;; -disable-* | --disable-*) - ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"enable_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval enable_$ac_useropt=no ;; + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` + eval enable_$ac_feature=no ;; -docdir | --docdir | --docdi | --doc | --do) ac_prev=docdir ;; @@ -1321,21 +1123,13 @@ do dvidir=$ac_optarg ;; -enable-* | --enable-*) - ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"enable_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval enable_$ac_useropt=\$ac_optarg ;; + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` + eval enable_$ac_feature=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -1526,38 +1320,22 @@ do ac_init_version=: ;; -with-* | --with-*) - ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"with_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval with_$ac_useropt=\$ac_optarg ;; + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` + eval with_$ac_package=\$ac_optarg ;; -without-* | --without-*) - ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` + ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"with_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval with_$ac_useropt=no ;; + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` + eval with_$ac_package=no ;; --x) # Obsolete; use --with-x. @@ -1577,7 +1355,7 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) { $as_echo "$as_me: error: unrecognized option: $ac_option + -*) { echo "$as_me: error: unrecognized option: $ac_option Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } ;; @@ -1586,16 +1364,16 @@ Try \`$0 --help' for more information." >&2 ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` # Reject names that are not valid shell variable names. expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 + { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 { (exit 1); exit 1; }; } eval $ac_envvar=\$ac_optarg export $ac_envvar ;; *) # FIXME: should be removed in autoconf 3.0. - $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + 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 + echo "$as_me: WARNING: invalid host type: $ac_option" >&2 : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ;; @@ -1604,38 +1382,22 @@ done if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { $as_echo "$as_me: error: missing argument to $ac_option" >&2 + { echo "$as_me: error: missing argument to $ac_option" >&2 { (exit 1); exit 1; }; } fi -if test -n "$ac_unrecognized_opts"; then - case $enable_option_checking in - no) ;; - fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 - { (exit 1); exit 1; }; } ;; - *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; - esac -fi - -# Check all directory arguments for consistency. +# Be sure to have absolute directory names. for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ libdir localedir mandir do eval ac_val=\$$ac_var - # Remove trailing slashes. - case $ac_val in - */ ) - ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` - eval $ac_var=\$ac_val;; - esac - # Be sure to have absolute directory names. case $ac_val in [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; } done @@ -1650,7 +1412,7 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. If a cross compiler is detected then cross compile mode will be used." >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes @@ -1666,10 +1428,10 @@ test "$silent" = yes && exec 6>/dev/null ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - { $as_echo "$as_me: error: working directory cannot be determined" >&2 + { echo "$as_me: error: Working directory cannot be determined" >&2 { (exit 1); exit 1; }; } test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 + { echo "$as_me: error: pwd does not report name of working directory" >&2 { (exit 1); exit 1; }; } @@ -1677,12 +1439,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" || if test -z "$srcdir"; then ac_srcdir_defaulted=yes # Try the directory containing this script, then the parent directory. - ac_confdir=`$as_dirname -- "$as_myself" || -$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_myself" : 'X\(//\)[^/]' \| \ - X"$as_myself" : 'X\(//\)$' \| \ - X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_myself" | + ac_confdir=`$as_dirname -- "$0" || +$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +echo X"$0" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -1709,12 +1471,12 @@ else fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 { (exit 1); exit 1; }; } fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 + cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 { (exit 1); exit 1; }; } pwd)` # When building in place, set srcdir=. @@ -1763,9 +1525,9 @@ Configuration: Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] + [$ac_default_prefix] --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] + [PREFIX] By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify @@ -1775,25 +1537,25 @@ for instance \`--prefix=\$HOME'. For better control, use the options below. Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] - --infodir=DIR info documentation [DATAROOTDIR/info] - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] - --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] - --pdfdir=DIR pdf documentation [DOCDIR] - --psdir=DIR ps documentation [DOCDIR] + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] _ACEOF cat <<\_ACEOF @@ -1814,7 +1576,6 @@ if test -n "$ac_init_help"; then cat <<\_ACEOF Optional Features: - --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --disable-ldap Disables the use of LDAP backend via Netscape/Mozilla @@ -2396,17 +2157,15 @@ fi if test "$ac_init_help" = "recursive"; then # If there are subdirs, report their specific --help. for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d "$ac_dir" || - { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || - continue + test -d "$ac_dir" || continue ac_builddir=. case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -2442,7 +2201,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix echo && $SHELL "$ac_srcdir/configure" --help=recursive else - $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done @@ -2452,10 +2211,10 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.63 +generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -2466,7 +2225,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.63. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2502,7 +2261,7 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" + echo "PATH: $as_dir" done IFS=$as_save_IFS @@ -2537,7 +2296,7 @@ do | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) - ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; @@ -2589,12 +2348,11 @@ _ASBOX case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( *) $as_unset $ac_var ;; esac ;; esac @@ -2624,9 +2382,9 @@ _ASBOX do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - $as_echo "$ac_var='\''$ac_val'\''" + echo "$ac_var='\''$ac_val'\''" done | sort echo @@ -2641,9 +2399,9 @@ _ASBOX do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - $as_echo "$ac_var='\''$ac_val'\''" + echo "$ac_var='\''$ac_val'\''" done | sort echo fi @@ -2659,8 +2417,8 @@ _ASBOX echo fi test "$ac_signal" != 0 && - $as_echo "$as_me: caught signal $ac_signal" - $as_echo "$as_me: exit $exit_status" + echo "$as_me: caught signal $ac_signal" + echo "$as_me: exit $exit_status" } >&5 rm -f core *.core core.conftest.* && rm -f -r conftest* confdefs* conf$$* $ac_clean_files && @@ -2702,24 +2460,21 @@ _ACEOF # Let the site file select an alternate cache file if it wants to. -# Prefer an explicitly selected file to automatically selected ones. -ac_site_file1=NONE -ac_site_file2=NONE +# Prefer explicitly selected file to automatically selected ones. if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE + set x "$CONFIG_SITE" elif test "x$prefix" != xNONE; then - ac_site_file1=$prefix/share/config.site - ac_site_file2=$prefix/etc/config.site + set x "$prefix/share/config.site" "$prefix/etc/config.site" else - ac_site_file1=$ac_default_prefix/share/config.site - ac_site_file2=$ac_default_prefix/etc/config.site + set x "$ac_default_prefix/share/config.site" \ + "$ac_default_prefix/etc/config.site" fi -for ac_site_file in "$ac_site_file1" "$ac_site_file2" +shift +for ac_site_file do - test "x$ac_site_file" = xNONE && continue if test -r "$ac_site_file"; then - { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -$as_echo "$as_me: loading site script $ac_site_file" >&6;} + { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 +echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" fi @@ -2729,16 +2484,16 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 -$as_echo "$as_me: loading cache $cache_file" >&6;} + { echo "$as_me:$LINENO: loading cache $cache_file" >&5 +echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; *) . "./$cache_file";; esac fi else - { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 -$as_echo "$as_me: creating cache $cache_file" >&6;} + { echo "$as_me:$LINENO: creating cache $cache_file" >&5 +echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -2752,38 +2507,29 @@ for ac_var in $ac_precious_vars; do eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 +echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - # differences in whitespace do not lead to failure. - ac_old_val_w=`echo x $ac_old_val` - ac_new_val_w=`echo x $ac_new_val` - if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - ac_cache_corrupted=: - else - { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} - eval $ac_var=\$ac_old_val - fi - { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 -$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 -$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 +echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 +echo "$as_me: former value: $ac_old_val" >&2;} + { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 +echo "$as_me: current value: $ac_new_val" >&2;} + ac_cache_corrupted=: fi;; esac # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in @@ -2793,12 +2539,10 @@ $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi done if $ac_cache_corrupted; then - { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} + { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 +echo "$as_me: error: changes in the environment can compromise the build" >&2;} + { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 +echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi @@ -3854,37 +3598,42 @@ echo "* *" echo "********************************************************************" echo "" cat /dev/null > warn -{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 -$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } +if test "${ac_cv_path_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # Extract the first word of "grep ggrep" to use in msg output +if test -z "$GREP"; then +set dummy grep ggrep; ac_prog_name=$2 if test "${ac_cv_path_GREP+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -z "$GREP"; then ac_path_GREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +# Loop through the user's path and test for each of PROGNAME-LIST +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue -# Check for GNU ac_path_GREP and select it if it is found. + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in *GNU*) ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; *) ac_count=0 - $as_echo_n 0123456789 >"conftest.in" + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - $as_echo 'GREP' >> "conftest.nl" + echo 'GREP' >> "conftest.nl" "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break ac_count=`expr $ac_count + 1` @@ -3899,60 +3648,74 @@ case `"$ac_path_GREP" --version 2>&1` in rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - $ac_path_GREP_found && break 3 - done + + $ac_path_GREP_found && break 3 done done + +done IFS=$as_save_IFS - if test -z "$ac_cv_path_GREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + + +fi + +GREP="$ac_cv_path_GREP" +if test -z "$GREP"; then + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} { (exit 1); exit 1; }; } - fi +fi + else ac_cv_path_GREP=$GREP fi + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 -$as_echo "$ac_cv_path_GREP" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +echo "${ECHO_T}$ac_cv_path_GREP" >&6; } GREP="$ac_cv_path_GREP" -{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 -$as_echo_n "checking for egrep... " >&6; } +{ echo "$as_me:$LINENO: checking for egrep" >&5 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } if test "${ac_cv_path_EGREP+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 then ac_cv_path_EGREP="$GREP -E" else - if test -z "$EGREP"; then + # Extract the first word of "egrep" to use in msg output +if test -z "$EGREP"; then +set dummy egrep; ac_prog_name=$2 +if test "${ac_cv_path_EGREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else ac_path_EGREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +# Loop through the user's path and test for each of PROGNAME-LIST +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue -# Check for GNU ac_path_EGREP and select it if it is found. + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in *GNU*) ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; *) ac_count=0 - $as_echo_n 0123456789 >"conftest.in" + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - $as_echo 'EGREP' >> "conftest.nl" + echo 'EGREP' >> "conftest.nl" "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break ac_count=`expr $ac_count + 1` @@ -3967,24 +3730,33 @@ case `"$ac_path_EGREP" --version 2>&1` in rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - $ac_path_EGREP_found && break 3 - done + + $ac_path_EGREP_found && break 3 done done + +done IFS=$as_save_IFS - if test -z "$ac_cv_path_EGREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + + +fi + +EGREP="$ac_cv_path_EGREP" +if test -z "$EGREP"; then + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} { (exit 1); exit 1; }; } - fi +fi + else ac_cv_path_EGREP=$EGREP fi + fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 -$as_echo "$ac_cv_path_EGREP" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } EGREP="$ac_cv_path_EGREP" @@ -3992,10 +3764,10 @@ for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_AWK+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. @@ -4008,7 +3780,7 @@ do 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_AWK="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4019,11 +3791,11 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { $as_echo "$as_me:$LINENO: result: $AWK" >&5 -$as_echo "$AWK" >&6; } + { echo "$as_me:$LINENO: result: $AWK" >&5 +echo "${ECHO_T}$AWK" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -4032,10 +3804,10 @@ done # Extract the first word of "$AWK", so it can be a program name with args. set dummy $AWK; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_AWK+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $AWK in [\\/]* | ?:[\\/]*) @@ -4050,7 +3822,7 @@ do 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_path_AWK="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4062,17 +3834,17 @@ esac fi AWK=$ac_cv_path_AWK if test -n "$AWK"; then - { $as_echo "$as_me:$LINENO: result: $AWK" >&5 -$as_echo "$AWK" >&6; } + { echo "$as_me:$LINENO: result: $AWK" >&5 +echo "${ECHO_T}$AWK" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi if test -z "$AWK"; then - { { $as_echo "$as_me:$LINENO: error: install awk to run this script" >&5 -$as_echo "$as_me: error: install awk to run this script" >&2;} + { { echo "$as_me:$LINENO: error: install awk to run this script" >&5 +echo "$as_me: error: install awk to run this script" >&2;} { (exit 1); exit 1; }; } fi @@ -4080,10 +3852,10 @@ for ac_prog in sed do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_SED+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $SED in [\\/]* | ?:[\\/]*) @@ -4098,7 +3870,7 @@ do 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_path_SED="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4110,11 +3882,11 @@ esac fi SED=$ac_cv_path_SED if test -n "$SED"; then - { $as_echo "$as_me:$LINENO: result: $SED" >&5 -$as_echo "$SED" >&6; } + { echo "$as_me:$LINENO: result: $SED" >&5 +echo "${ECHO_T}$SED" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -4122,21 +3894,21 @@ fi done if test -z "$SED"; then - { { $as_echo "$as_me:$LINENO: error: install sed to run this script" >&5 -$as_echo "$as_me: error: install sed to run this script" >&2;} + { { echo "$as_me:$LINENO: error: install sed to run this script" >&5 +echo "$as_me: error: install sed to run this script" >&2;} { (exit 1); exit 1; }; } fi -{ $as_echo "$as_me:$LINENO: checking for solenv environment" >&5 -$as_echo_n "checking for solenv environment... " >&6; } +{ echo "$as_me:$LINENO: checking for solenv environment" >&5 +echo $ECHO_N "checking for solenv environment... $ECHO_C" >&6; } if test -z "$with_local_solenv"; then LOCAL_SOLENV="DEFAULT" - { $as_echo "$as_me:$LINENO: result: default" >&5 -$as_echo "default" >&6; } + { echo "$as_me:$LINENO: result: default" >&5 +echo "${ECHO_T}default" >&6; } else LOCAL_SOLENV=$with_local_solenv - { $as_echo "$as_me:$LINENO: result: $with_local_solenv" >&5 -$as_echo "$with_local_solenv" >&6; } + { echo "$as_me:$LINENO: result: $with_local_solenv" >&5 +echo "${ECHO_T}$with_local_solenv" >&6; } fi @@ -4154,8 +3926,8 @@ if test -e $_solenv/inc/minor.mk; then SOURCEVERSION="`grep SOURCEVERSION= $_solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`" else - { { $as_echo "$as_me:$LINENO: error: $_solenv/inc/minor.mk missing but needed for architecture/os detecion and proper environment script generation..." >&5 -$as_echo "$as_me: error: $_solenv/inc/minor.mk missing but needed for architecture/os detecion and proper environment script generation..." >&2;} + { { echo "$as_me:$LINENO: error: $_solenv/inc/minor.mk missing but needed for architecture/os detecion and proper environment script generation..." >&5 +echo "$as_me: error: $_solenv/inc/minor.mk missing but needed for architecture/os detecion and proper environment script generation..." >&2;} { (exit 1); exit 1; }; } fi @@ -4176,8 +3948,8 @@ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do fi done if test -z "$ac_aux_dir"; then - { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 +echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} { (exit 1); exit 1; }; } fi @@ -4192,34 +3964,34 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} + { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 +echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} { (exit 1); exit 1; }; } -{ $as_echo "$as_me:$LINENO: checking build system type" >&5 -$as_echo_n "checking build system type... " >&6; } +{ echo "$as_me:$LINENO: checking build system type" >&5 +echo $ECHO_N "checking build system type... $ECHO_C" >&6; } if test "${ac_cv_build+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_build_alias=$build_alias test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && - { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;} + { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 +echo "$as_me: error: cannot guess build type; you must specify one" >&2;} { (exit 1); exit 1; }; } ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} { (exit 1); exit 1; }; } fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -$as_echo "$ac_cv_build" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +echo "${ECHO_T}$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -$as_echo "$as_me: error: invalid value of canonical build" >&2;} +*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 +echo "$as_me: error: invalid value of canonical build" >&2;} { (exit 1); exit 1; }; };; esac build=$ac_cv_build @@ -4236,27 +4008,27 @@ IFS=$ac_save_IFS case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:$LINENO: checking host system type" >&5 -$as_echo_n "checking host system type... " >&6; } +{ echo "$as_me:$LINENO: checking host system type" >&5 +echo $ECHO_N "checking host system type... $ECHO_C" >&6; } if test "${ac_cv_host+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} { (exit 1); exit 1; }; } fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -$as_echo "$ac_cv_host" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +echo "${ECHO_T}$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -$as_echo "$as_me: error: invalid value of canonical host" >&2;} +*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 +echo "$as_me: error: invalid value of canonical host" >&2;} { (exit 1); exit 1; }; };; esac host=$ac_cv_host @@ -4273,27 +4045,27 @@ IFS=$ac_save_IFS case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:$LINENO: checking target system type" >&5 -$as_echo_n "checking target system type... " >&6; } +{ echo "$as_me:$LINENO: checking target system type" >&5 +echo $ECHO_N "checking target system type... $ECHO_C" >&6; } if test "${ac_cv_target+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "x$target_alias" = x; then ac_cv_target=$ac_cv_host else ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;} + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;} { (exit 1); exit 1; }; } fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_target" >&5 -$as_echo "$ac_cv_target" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5 +echo "${ECHO_T}$ac_cv_target" >&6; } case $ac_cv_target in *-*-*) ;; -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical target" >&5 -$as_echo "$as_me: error: invalid value of canonical target" >&2;} +*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5 +echo "$as_me: error: invalid value of canonical target" >&2;} { (exit 1); exit 1; }; };; esac target=$ac_cv_target @@ -4318,20 +4090,20 @@ test -n "$target_alias" && program_prefix=${target_alias}- if test "$build" != "$host" -o "$build" != "$target" \ -o "$host" != "$target"; then - { $as_echo "$as_me:$LINENO: WARNING: cross-compiling by any means is not supported (yet)!" >&5 -$as_echo "$as_me: WARNING: cross-compiling by any means is not supported (yet)!" >&2;} + { echo "$as_me:$LINENO: WARNING: cross-compiling by any means is not supported (yet)!" >&5 +echo "$as_me: WARNING: cross-compiling by any means is not supported (yet)!" >&2;} echo "cross-compiling by any means is not supported (yet)!" >> warn fi if echo "$build_os" | grep cygwin; then - { $as_echo "$as_me:$LINENO: checking Cygwin version" >&5 -$as_echo_n "checking Cygwin version... " >&6; } + { echo "$as_me:$LINENO: checking Cygwin version" >&5 +echo $ECHO_N "checking Cygwin version... $ECHO_C" >&6; } CygwinVer=`uname -r` - { $as_echo "$as_me:$LINENO: result: $CygwinVer" >&5 -$as_echo "$CygwinVer" >&6; } + { echo "$as_me:$LINENO: result: $CygwinVer" >&5 +echo "${ECHO_T}$CygwinVer" >&6; } if test "`echo $CygwinVer | $AWK -F . '{ print $1$2 }'`" -lt "15"; then - { { $as_echo "$as_me:$LINENO: error: You need at least Cygwin V1.5.x" >&5 -$as_echo "$as_me: error: You need at least Cygwin V1.5.x" >&2;} + { { echo "$as_me:$LINENO: error: You need at least Cygwin V1.5.x" >&5 +echo "$as_me: error: You need at least Cygwin V1.5.x" >&2;} { (exit 1); exit 1; }; } fi else @@ -4349,10 +4121,10 @@ case "$build_os" in _os=SunOS # Extract the first word of "gtar", so it can be a program name with args. set dummy gtar; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_GNUTAR+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $GNUTAR in [\\/]* | ?:[\\/]*) @@ -4368,7 +4140,7 @@ do 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_path_GNUTAR="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4380,41 +4152,41 @@ esac fi GNUTAR=$ac_cv_path_GNUTAR if test -n "$GNUTAR"; then - { $as_echo "$as_me:$LINENO: result: $GNUTAR" >&5 -$as_echo "$GNUTAR" >&6; } + { echo "$as_me:$LINENO: result: $GNUTAR" >&5 +echo "${ECHO_T}$GNUTAR" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi if test -z "$GNUTAR"; then - { { $as_echo "$as_me:$LINENO: error: gtar (gnu tar) not found but needed. Install it (SUN Freeware package)." >&5 -$as_echo "$as_me: error: gtar (gnu tar) not found but needed. Install it (SUN Freeware package)." >&2;} + { { echo "$as_me:$LINENO: error: gtar (gnu tar) not found but needed. Install it (SUN Freeware package)." >&5 +echo "$as_me: error: gtar (gnu tar) not found but needed. Install it (SUN Freeware package)." >&2;} { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:$LINENO: checking the Solaris operating system release" >&5 -$as_echo_n "checking the Solaris operating system release... " >&6; } + { echo "$as_me:$LINENO: checking the Solaris operating system release" >&5 +echo $ECHO_N "checking the Solaris operating system release... $ECHO_C" >&6; } _os_release=`echo $build_os | $SED -e s/solaris2\.//` if test "$_os_release" -lt "6"; then - { { $as_echo "$as_me:$LINENO: error: use solaris >= 6 to build OpenOffice.org" >&5 -$as_echo "$as_me: error: use solaris >= 6 to build OpenOffice.org" >&2;} + { { echo "$as_me:$LINENO: error: use solaris >= 6 to build OpenOffice.org" >&5 +echo "$as_me: error: use solaris >= 6 to build OpenOffice.org" >&2;} { (exit 1); exit 1; }; } else - { $as_echo "$as_me:$LINENO: result: ok ($_os_release)" >&5 -$as_echo "ok ($_os_release)" >&6; } + { echo "$as_me:$LINENO: result: ok ($_os_release)" >&5 +echo "${ECHO_T}ok ($_os_release)" >&6; } fi - { $as_echo "$as_me:$LINENO: checking the processor type" >&5 -$as_echo_n "checking the processor type... " >&6; } + { echo "$as_me:$LINENO: checking the processor type" >&5 +echo $ECHO_N "checking the processor type... $ECHO_C" >&6; } if test "$build_cpu" = "sparc" -o "$build_cpu" = "i386"; then - { $as_echo "$as_me:$LINENO: result: ok ($build_cpu)" >&5 -$as_echo "ok ($build_cpu)" >&6; } + { echo "$as_me:$LINENO: result: ok ($build_cpu)" >&5 +echo "${ECHO_T}ok ($build_cpu)" >&6; } else - { { $as_echo "$as_me:$LINENO: error: only sparc and i386 processors are supported" >&5 -$as_echo "$as_me: error: only sparc and i386 processors are supported" >&2;} + { { echo "$as_me:$LINENO: error: only sparc and i386 processors are supported" >&5 +echo "$as_me: error: only sparc and i386 processors are supported" >&2;} { (exit 1); exit 1; }; } fi ;; @@ -4448,8 +4220,8 @@ $as_echo "$as_me: error: only sparc and i386 processors are supported" >&2;} test_freetype=no _os=Darwin if test "$enable_systray" = "yes" && test "$enable_gtk" != "no"; then - { $as_echo "$as_me:$LINENO: WARNING: Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >&5 -$as_echo "$as_me: WARNING: Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >&2;} + { echo "$as_me:$LINENO: WARNING: Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >&5 +echo "$as_me: WARNING: Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >&2;} echo "Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >>warn enable_systray=no fi @@ -4469,17 +4241,17 @@ $as_echo "$as_me: WARNING: Disabling gtk-quickstarter - not supported on Mac. Us test_cups=yes test_randr=yes test_freetype=yes - { $as_echo "$as_me:$LINENO: checking the FreeBSD operating system release" >&5 -$as_echo_n "checking the FreeBSD operating system release... " >&6; } + { echo "$as_me:$LINENO: checking the FreeBSD operating system release" >&5 +echo $ECHO_N "checking the FreeBSD operating system release... $ECHO_C" >&6; } if test -n "$with_os_version"; then OSVERSION="$with_os_version" else OSVERSION=`/sbin/sysctl -n kern.osreldate` fi - { $as_echo "$as_me:$LINENO: result: found OSVERSION=$OSVERSION" >&5 -$as_echo "found OSVERSION=$OSVERSION" >&6; } - { $as_echo "$as_me:$LINENO: checking which thread library to use" >&5 -$as_echo_n "checking which thread library to use... " >&6; } + { echo "$as_me:$LINENO: result: found OSVERSION=$OSVERSION" >&5 +echo "${ECHO_T}found OSVERSION=$OSVERSION" >&6; } + { echo "$as_me:$LINENO: checking which thread library to use" >&5 +echo $ECHO_N "checking which thread library to use... $ECHO_C" >&6; } if test "$OSVERSION" -lt "500016"; then PTHREAD_CFLAGS="-D_THREAD_SAFE" PTHREAD_LIBS="-pthread" @@ -4490,8 +4262,8 @@ $as_echo_n "checking which thread library to use... " >&6; } PTHREAD_CFLAGS="" PTHREAD_LIBS="-pthread" fi - { $as_echo "$as_me:$LINENO: result: $PTHREAD_LIBS" >&5 -$as_echo "$PTHREAD_LIBS" >&6; } + { echo "$as_me:$LINENO: result: $PTHREAD_LIBS" >&5 +echo "${ECHO_T}$PTHREAD_LIBS" >&6; } _os=FreeBSD ;; osf) @@ -4525,8 +4297,8 @@ $as_echo "$PTHREAD_LIBS" >&6; } _os=AIX ;; *) - { { $as_echo "$as_me:$LINENO: error: $_os operating system is not suitable to build OpenOffice.org!" >&5 -$as_echo "$as_me: error: $_os operating system is not suitable to build OpenOffice.org!" >&2;} + { { echo "$as_me:$LINENO: error: $_os operating system is not suitable to build OpenOffice.org!" >&5 +echo "$as_me: error: $_os operating system is not suitable to build OpenOffice.org!" >&2;} { (exit 1); exit 1; }; } ;; esac @@ -4535,27 +4307,27 @@ esac -{ $as_echo "$as_me:$LINENO: checking whether to enable crashdump feature" >&5 -$as_echo_n "checking whether to enable crashdump feature... " >&6; } +{ echo "$as_me:$LINENO: checking whether to enable crashdump feature" >&5 +echo $ECHO_N "checking whether to enable crashdump feature... $ECHO_C" >&6; } if test "$enable_crashdump" = "yes" -o "$enable_crashdump" = "TRUE"; then ENABLE_CRASHDUMP="TRUE" - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } BUILD_TYPE="$BUILD_TYPE CRASHREP" else if test "$enable_crashdump" = "STATIC"; then ENABLE_CRASHDUMP="STATIC" - { $as_echo "$as_me:$LINENO: result: yes, STATIC" >&5 -$as_echo "yes, STATIC" >&6; } + { echo "$as_me:$LINENO: result: yes, STATIC" >&5 +echo "${ECHO_T}yes, STATIC" >&6; } BUILD_TYPE="$BUILD_TYPE CRASHREP" else if test "$enable_crashdump" = "" -o "$enable_crashdump" = "no"; then ENABLE_CRASHDUMP="" - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } else - { { $as_echo "$as_me:$LINENO: error: --enable-crashdump only accepts yes, no, TRUE or STATIC as parameter." >&5 -$as_echo "$as_me: error: --enable-crashdump only accepts yes, no, TRUE or STATIC as parameter." >&2;} + { { echo "$as_me:$LINENO: error: --enable-crashdump only accepts yes, no, TRUE or STATIC as parameter." >&5 +echo "$as_me: error: --enable-crashdump only accepts yes, no, TRUE or STATIC as parameter." >&2;} { (exit 1); exit 1; }; } fi fi @@ -4567,89 +4339,89 @@ if test "$_os" = "WINNT"; then fi if test "$_os" = "WINNT"; then - { $as_echo "$as_me:$LINENO: checking whether to use the standard non-optimizing compiler" >&5 -$as_echo_n "checking whether to use the standard non-optimizing compiler... " >&6; } + { echo "$as_me:$LINENO: checking whether to use the standard non-optimizing compiler" >&5 +echo $ECHO_N "checking whether to use the standard non-optimizing compiler... $ECHO_C" >&6; } if test "$enable_cl_standard" = "" -o "$enable_cl_standard" = "no"; then VC_STANDARD="" - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } else VC_STANDARD="TRUE" - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } fi fi -{ $as_echo "$as_me:$LINENO: checking whether to turn warnings to errors" >&5 -$as_echo_n "checking whether to turn warnings to errors... " >&6; } +{ echo "$as_me:$LINENO: checking whether to turn warnings to errors" >&5 +echo $ECHO_N "checking whether to turn warnings to errors... $ECHO_C" >&6; } if test -n "$enable_werror" && test "$enable_werror" != "no"; then ENABLE_WERROR="TRUE" - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - { $as_echo "$as_me:$LINENO: WARNING: Turning warnings to errors has no effect in modules or" >&5 -$as_echo "$as_me: WARNING: Turning warnings to errors has no effect in modules or" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: on platforms where it has been disabled explicitely" >&5 -$as_echo "$as_me: WARNING: on platforms where it has been disabled explicitely" >&2;} + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + { echo "$as_me:$LINENO: WARNING: Turning warnings to errors has no effect in modules or" >&5 +echo "$as_me: WARNING: Turning warnings to errors has no effect in modules or" >&2;} + { echo "$as_me:$LINENO: WARNING: on platforms where it has been disabled explicitely" >&5 +echo "$as_me: WARNING: on platforms where it has been disabled explicitely" >&2;} echo "Turning warnings to errors has no effect in modules or on platforms where it has been disabled explicitely" >> warn else ENABLE_WERROR="FALSE" - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -{ $as_echo "$as_me:$LINENO: checking whether to do a debug build" >&5 -$as_echo_n "checking whether to do a debug build... " >&6; } +{ echo "$as_me:$LINENO: checking whether to do a debug build" >&5 +echo $ECHO_N "checking whether to do a debug build... $ECHO_C" >&6; } if test -n "$enable_debug" && test "$enable_debug" != "no"; then ENABLE_DEBUG="TRUE" if test -z "$enable_symbols"; then enable_symbols="yes" fi - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else ENABLE_DEBUG="FALSE" - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -{ $as_echo "$as_me:$LINENO: checking whether to build with additional debug utilities" >&5 -$as_echo_n "checking whether to build with additional debug utilities... " >&6; } +{ echo "$as_me:$LINENO: checking whether to build with additional debug utilities" >&5 +echo $ECHO_N "checking whether to build with additional debug utilities... $ECHO_C" >&6; } if test -n "$enable_dbgutil" && test "$enable_dbgutil" != "no"; then PROEXT="" PRODUCT="" PROFULLSWITCH="" - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else PRODUCT="full" PROFULLSWITCH="product=full" PROEXT=".pro" - { $as_echo "$as_me:$LINENO: result: no, full product build" >&5 -$as_echo "no, full product build" >&6; } + { echo "$as_me:$LINENO: result: no, full product build" >&5 +echo "${ECHO_T}no, full product build" >&6; } fi -{ $as_echo "$as_me:$LINENO: checking whether to include symbols into final build" >&5 -$as_echo_n "checking whether to include symbols into final build... " >&6; } +{ echo "$as_me:$LINENO: checking whether to include symbols into final build" >&5 +echo $ECHO_N "checking whether to include symbols into final build... $ECHO_C" >&6; } if test -n "$enable_symbols" && test "$enable_symbols" != "no"; then if test "$enable_symbols" = "yes" -o "$enable_symbols" = "TRUE"; then ENABLE_SYMBOLS="TRUE" - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else if test "$enable_symbols" = "SMALL" -o "$enable_symbols" = "small"; then ENABLE_SYMBOLS="SMALL" - { $as_echo "$as_me:$LINENO: result: yes, small ones" >&5 -$as_echo "yes, small ones" >&6; } + { echo "$as_me:$LINENO: result: yes, small ones" >&5 +echo "${ECHO_T}yes, small ones" >&6; } else if test "$enable_symbols" != "no" ; then echo enable symbols is: $enable_symbols - { { $as_echo "$as_me:$LINENO: error: --enable-symbols only accepts yes, TRUE or SMALL as parameter." >&5 -$as_echo "$as_me: error: --enable-symbols only accepts yes, TRUE or SMALL as parameter." >&2;} + { { echo "$as_me:$LINENO: error: --enable-symbols only accepts yes, TRUE or SMALL as parameter." >&5 +echo "$as_me: error: --enable-symbols only accepts yes, TRUE or SMALL as parameter." >&2;} { (exit 1); exit 1; }; } else ENABLE_SYMBOLS= @@ -4658,21 +4430,21 @@ $as_echo "$as_me: error: --enable-symbols only accepts yes, TRUE or SMALL as par fi else ENABLE_SYMBOLS= - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -{ $as_echo "$as_me:$LINENO: checking whether to strip the solver or not." >&5 -$as_echo_n "checking whether to strip the solver or not.... " >&6; } +{ echo "$as_me:$LINENO: checking whether to strip the solver or not." >&5 +echo $ECHO_N "checking whether to strip the solver or not.... $ECHO_C" >&6; } if test -n "$enable_strip_solver"; then if test "$enable_strip_solver" = "yes"; then DISABLE_STRIP= else if test "$enable_strip_solver" = "no"; then DISABLE_STRIP="TRUE" else - { { $as_echo "$as_me:$LINENO: error: --disable-strip-solver only accepts yes or no as parameter." >&5 -$as_echo "$as_me: error: --disable-strip-solver only accepts yes or no as parameter." >&2;} + { { echo "$as_me:$LINENO: error: --disable-strip-solver only accepts yes or no as parameter." >&5 +echo "$as_me: error: --disable-strip-solver only accepts yes or no as parameter." >&2;} { (exit 1); exit 1; }; } fi fi @@ -4685,151 +4457,151 @@ else fi -{ $as_echo "$as_me:$LINENO: checking whether to enable native CUPS support" >&5 -$as_echo_n "checking whether to enable native CUPS support... " >&6; } +{ echo "$as_me:$LINENO: checking whether to enable native CUPS support" >&5 +echo $ECHO_N "checking whether to enable native CUPS support... $ECHO_C" >&6; } if test "$test_cups" = "yes" -a \( "$enable_cups" = "yes" -o "$enable_cups" = "TRUE" \) ; then ENABLE_CUPS="TRUE" - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else ENABLE_CUPS="" - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -{ $as_echo "$as_me:$LINENO: checking whether to enable fontconfig support" >&5 -$as_echo_n "checking whether to enable fontconfig support... " >&6; } +{ echo "$as_me:$LINENO: checking whether to enable fontconfig support" >&5 +echo $ECHO_N "checking whether to enable fontconfig support... $ECHO_C" >&6; } if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a \( "$enable_fontconfig" = "yes" -o "$enable_fontconfig" = "TRUE" \); then ENABLE_FONTCONFIG="TRUE" - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else ENABLE_FONTCONFIG="" - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -{ $as_echo "$as_me:$LINENO: checking whether to enable filters for legacy binary file formats (StarOffice 5.2)" >&5 -$as_echo_n "checking whether to enable filters for legacy binary file formats (StarOffice 5.2)... " >&6; } +{ echo "$as_me:$LINENO: checking whether to enable filters for legacy binary file formats (StarOffice 5.2)" >&5 +echo $ECHO_N "checking whether to enable filters for legacy binary file formats (StarOffice 5.2)... $ECHO_C" >&6; } if test "$enable_binfilter" = "no"; then WITH_BINFILTER="NO" - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } else WITH_BINFILTER="YES" BUILD_TYPE="$BUILD_TYPE BINFILTER" - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } fi if test "$_os" = "WINNT"; then - { $as_echo "$as_me:$LINENO: checking whether to use DirectX" >&5 -$as_echo_n "checking whether to use DirectX... " >&6; } + { echo "$as_me:$LINENO: checking whether to use DirectX" >&5 +echo $ECHO_N "checking whether to use DirectX... $ECHO_C" >&6; } if test "$enable_directx" = "yes" -o "$enable_directx" = "TRUE" -o "$enable_directx" = ""; then ENABLE_DIRECTX="TRUE" - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else ENABLE_DIRECTX="" - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - { $as_echo "$as_me:$LINENO: checking whether to use ActiveX" >&5 -$as_echo_n "checking whether to use ActiveX... " >&6; } + { echo "$as_me:$LINENO: checking whether to use ActiveX" >&5 +echo $ECHO_N "checking whether to use ActiveX... $ECHO_C" >&6; } if test "$enable_activex" = "yes" -o "$enable_activex" = "TRUE" -o "$enable_activex" = ""; then DISABLE_ACTIVEX="" - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else DISABLE_ACTIVEX="TRUE" - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - { $as_echo "$as_me:$LINENO: checking whether to use ATL" >&5 -$as_echo_n "checking whether to use ATL... " >&6; } + { echo "$as_me:$LINENO: checking whether to use ATL" >&5 +echo $ECHO_N "checking whether to use ATL... $ECHO_C" >&6; } if test "$enable_atl" = "yes" -o "$enable_atl" = "TRUE" -o "$enable_atl" = ""; then DISABLE_ATL="" - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else DISABLE_ATL="TRUE" - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi fi -{ $as_echo "$as_me:$LINENO: checking whether to use RPATH in shared libraries" >&5 -$as_echo_n "checking whether to use RPATH in shared libraries... " >&6; } +{ echo "$as_me:$LINENO: checking whether to use RPATH in shared libraries" >&5 +echo $ECHO_N "checking whether to use RPATH in shared libraries... $ECHO_C" >&6; } if test "$enable_rpath" = "no"; then ENABLE_RPATH="no" else ENABLE_RPATH="yes" fi -{ $as_echo "$as_me:$LINENO: result: $ENABLE_RPATH" >&5 -$as_echo "$ENABLE_RPATH" >&6; } +{ echo "$as_me:$LINENO: result: $ENABLE_RPATH" >&5 +echo "${ECHO_T}$ENABLE_RPATH" >&6; } -{ $as_echo "$as_me:$LINENO: checking whether to include MySpell dictionaries" >&5 -$as_echo_n "checking whether to include MySpell dictionaries... " >&6; } +{ echo "$as_me:$LINENO: checking whether to include MySpell dictionaries" >&5 +echo $ECHO_N "checking whether to include MySpell dictionaries... $ECHO_C" >&6; } if test -z "$with_myspell_dicts" || test "$with_myspell_dicts" = "yes"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } WITH_MYSPELL_DICTS=YES BUILD_TYPE="$BUILD_TYPE DICTIONARIES" else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } WITH_MYSPELL_DICTS=NO fi if test "$WITH_MYSPELL_DICTS" = "NO"; then - { $as_echo "$as_me:$LINENO: checking whether to use dicts from external paths" >&5 -$as_echo_n "checking whether to use dicts from external paths... " >&6; } + { echo "$as_me:$LINENO: checking whether to use dicts from external paths" >&5 +echo $ECHO_N "checking whether to use dicts from external paths... $ECHO_C" >&6; } if test -n "$with_system_dicts" -a "$with_system_dicts" = "yes"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } SYSTEM_DICTS=YES - { $as_echo "$as_me:$LINENO: checking for spelling dictionary directory" >&5 -$as_echo_n "checking for spelling dictionary directory... " >&6; } + { echo "$as_me:$LINENO: checking for spelling dictionary directory" >&5 +echo $ECHO_N "checking for spelling dictionary directory... $ECHO_C" >&6; } if test -n "$with_external_dict_dir"; then DICT_SYSTEM_DIR=file://$with_external_dict_dir else DICT_SYSTEM_DIR=file:///usr/share/hunspell fi - { $as_echo "$as_me:$LINENO: result: $DICT_SYSTEM_DIR" >&5 -$as_echo "$DICT_SYSTEM_DIR" >&6; } - { $as_echo "$as_me:$LINENO: checking for hyphenation patterns directory" >&5 -$as_echo_n "checking for hyphenation patterns directory... " >&6; } + { echo "$as_me:$LINENO: result: $DICT_SYSTEM_DIR" >&5 +echo "${ECHO_T}$DICT_SYSTEM_DIR" >&6; } + { echo "$as_me:$LINENO: checking for hyphenation patterns directory" >&5 +echo $ECHO_N "checking for hyphenation patterns directory... $ECHO_C" >&6; } if test -n "$with_external_hyph_dir"; then HYPH_SYSTEM_DIR=file://$with_external_hyph_dir else HYPH_SYSTEM_DIR=file:///usr/share/hyphen fi - { $as_echo "$as_me:$LINENO: result: $HYPH_SYSTEM_DIR" >&5 -$as_echo "$HYPH_SYSTEM_DIR" >&6; } - { $as_echo "$as_me:$LINENO: checking for thesaurus directory" >&5 -$as_echo_n "checking for thesaurus directory... " >&6; } + { echo "$as_me:$LINENO: result: $HYPH_SYSTEM_DIR" >&5 +echo "${ECHO_T}$HYPH_SYSTEM_DIR" >&6; } + { echo "$as_me:$LINENO: checking for thesaurus directory" >&5 +echo $ECHO_N "checking for thesaurus directory... $ECHO_C" >&6; } if test -n "$with_external_thes_dir"; then THES_SYSTEM_DIR=file://$with_external_thes_dir else THES_SYSTEM_DIR=file:///usr/share/mythes fi - { $as_echo "$as_me:$LINENO: result: $THES_SYSTEM_DIR" >&5 -$as_echo "$THES_SYSTEM_DIR" >&6; } + { echo "$as_me:$LINENO: result: $THES_SYSTEM_DIR" >&5 +echo "${ECHO_T}$THES_SYSTEM_DIR" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } SYSTEM_DICTS=NO fi fi @@ -4838,19 +4610,19 @@ fi -{ $as_echo "$as_me:$LINENO: checking which shell to use" >&5 -$as_echo_n "checking which shell to use... " >&6; } +{ echo "$as_me:$LINENO: checking which shell to use" >&5 +echo $ECHO_N "checking which shell to use... $ECHO_C" >&6; } if test $_os = "WINNT"; then if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "bash" -a "$with_use_shell" != "4nt"; then - { { $as_echo "$as_me:$LINENO: error: only \"tcsh\",\"bash\" or \"4nt\" are supported options" >&5 -$as_echo "$as_me: error: only \"tcsh\",\"bash\" or \"4nt\" are supported options" >&2;} + { { echo "$as_me:$LINENO: error: only \"tcsh\",\"bash\" or \"4nt\" are supported options" >&5 +echo "$as_me: error: only \"tcsh\",\"bash\" or \"4nt\" are supported options" >&2;} { (exit 1); exit 1; }; } fi if test -L $AWK -o -L `which awk` -o -L `which tar` -o -L `which gunzip` ; then - { { $as_echo "$as_me:$LINENO: error: $AWK, awk, tar or gunzip is a cygwin symlink! + { { echo "$as_me:$LINENO: error: $AWK, awk, tar or gunzip is a cygwin symlink! Native windows programs cannot use cygwin symlinks. Remove the symbolic link, and copy the program to the name of the link." >&5 -$as_echo "$as_me: error: $AWK, awk, tar or gunzip is a cygwin symlink! +echo "$as_me: error: $AWK, awk, tar or gunzip is a cygwin symlink! Native windows programs cannot use cygwin symlinks. Remove the symbolic link, and copy the program to the name of the link." >&2;} { (exit 1); exit 1; }; } @@ -4873,32 +4645,32 @@ link, and copy the program to the name of the link." >&2;} fi elif test $_os = "OS2"; then if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "4nt"; then - { { $as_echo "$as_me:$LINENO: error: only \"tcsh\" or \"4nt\" are supported options" >&5 -$as_echo "$as_me: error: only \"tcsh\" or \"4nt\" are supported options" >&2;} + { { echo "$as_me:$LINENO: error: only \"tcsh\" or \"4nt\" are supported options" >&5 +echo "$as_me: error: only \"tcsh\" or \"4nt\" are supported options" >&2;} { (exit 1); exit 1; }; } fi else if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "bash"; then - { { $as_echo "$as_me:$LINENO: error: only \"tcsh\" or \"bash\" are supported options" >&5 -$as_echo "$as_me: error: only \"tcsh\" or \"bash\" are supported options" >&2;} + { { echo "$as_me:$LINENO: error: only \"tcsh\" or \"bash\" are supported options" >&5 +echo "$as_me: error: only \"tcsh\" or \"bash\" are supported options" >&2;} { (exit 1); exit 1; }; } fi fi USE_SHELL="$with_use_shell" -{ $as_echo "$as_me:$LINENO: result: $USE_SHELL" >&5 -$as_echo "$USE_SHELL" >&6; } +{ echo "$as_me:$LINENO: result: $USE_SHELL" >&5 +echo "${ECHO_T}$USE_SHELL" >&6; } if test "$_os" = "WINNT" -a "$with_use_shell" != "4nt" ; then - { $as_echo "$as_me:$LINENO: checking for cygwin gcc/g++" >&5 -$as_echo_n "checking for cygwin gcc/g++... " >&6; } + { echo "$as_me:$LINENO: checking for cygwin gcc/g++" >&5 +echo $ECHO_N "checking for cygwin gcc/g++... $ECHO_C" >&6; } if which gcc > /dev/null && which g++ > /dev/null ; then - { $as_echo "$as_me:$LINENO: result: found" >&5 -$as_echo "found" >&6; } + { echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6; } else - { { $as_echo "$as_me:$LINENO: error: cygwin gcc and g++ are needed, please install them." >&5 -$as_echo "$as_me: error: cygwin gcc and g++ are needed, please install them." >&2;} + { { echo "$as_me:$LINENO: error: cygwin gcc and g++ are needed, please install them." >&5 +echo "$as_me: error: cygwin gcc and g++ are needed, please install them." >&2;} { (exit 1); exit 1; }; } fi fi @@ -4907,10 +4679,10 @@ fi if test "$with_use_shell" = "tcsh"; then # Extract the first word of "tcsh", so it can be a program name with args. set dummy tcsh; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_SHELLPATH+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $SHELLPATH in [\\/]* | ?:[\\/]*) @@ -4925,7 +4697,7 @@ do 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_path_SHELLPATH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4937,17 +4709,17 @@ esac fi SHELLPATH=$ac_cv_path_SHELLPATH if test -n "$SHELLPATH"; then - { $as_echo "$as_me:$LINENO: result: $SHELLPATH" >&5 -$as_echo "$SHELLPATH" >&6; } + { echo "$as_me:$LINENO: result: $SHELLPATH" >&5 +echo "${ECHO_T}$SHELLPATH" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi if test -z "$SHELLPATH"; then - { { $as_echo "$as_me:$LINENO: error: tcsh not found in \$PATH" >&5 -$as_echo "$as_me: error: tcsh not found in \$PATH" >&2;} + { { echo "$as_me:$LINENO: error: tcsh not found in \$PATH" >&5 +echo "$as_me: error: tcsh not found in \$PATH" >&2;} { (exit 1); exit 1; }; } else SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/tcsh$//p"` @@ -4955,10 +4727,10 @@ $as_echo "$as_me: error: tcsh not found in \$PATH" >&2;} elif test "$with_use_shell" = "bash"; then # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_SHELLPATH+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $SHELLPATH in [\\/]* | ?:[\\/]*) @@ -4973,7 +4745,7 @@ do 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_path_SHELLPATH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4985,37 +4757,37 @@ esac fi SHELLPATH=$ac_cv_path_SHELLPATH if test -n "$SHELLPATH"; then - { $as_echo "$as_me:$LINENO: result: $SHELLPATH" >&5 -$as_echo "$SHELLPATH" >&6; } + { echo "$as_me:$LINENO: result: $SHELLPATH" >&5 +echo "${ECHO_T}$SHELLPATH" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi if test -z "$SHELLPATH"; then - { { $as_echo "$as_me:$LINENO: error: bash not found in \$PATH" >&5 -$as_echo "$as_me: error: bash not found in \$PATH" >&2;} + { { echo "$as_me:$LINENO: error: bash not found in \$PATH" >&5 +echo "$as_me: error: bash not found in \$PATH" >&2;} { (exit 1); exit 1; }; } else SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/bash$//p"` fi else - { $as_echo "$as_me:$LINENO: WARNING: Windows/OS/2 4NT builds don't test for the shell" >&5 -$as_echo "$as_me: WARNING: Windows/OS/2 4NT builds don't test for the shell" >&2;} + { echo "$as_me:$LINENO: WARNING: Windows/OS/2 4NT builds don't test for the shell" >&5 +echo "$as_me: WARNING: Windows/OS/2 4NT builds don't test for the shell" >&2;} SHELLPATH="NO_SHELLPATH_NEEDED" fi -{ $as_echo "$as_me:$LINENO: checking gcc home" >&5 -$as_echo_n "checking gcc home... " >&6; } +{ echo "$as_me:$LINENO: checking gcc home" >&5 +echo $ECHO_N "checking gcc home... $ECHO_C" >&6; } if test -z "$with_gcc_home"; then GCC_HOME=`which gcc | $SED -e s,/bin/gcc,,` else GCC_HOME="$with_gcc_home" fi -{ $as_echo "$as_me:$LINENO: result: $GCC_HOME" >&5 -$as_echo "$GCC_HOME" >&6; } +{ echo "$as_me:$LINENO: result: $GCC_HOME" >&5 +echo "${ECHO_T}$GCC_HOME" >&6; } if test -n "$with_gcc_home"; then @@ -5033,10 +4805,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -5049,7 +4821,7 @@ do 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_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5060,11 +4832,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 -$as_echo "$CC" >&6; } + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -5073,10 +4845,10 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ 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_CC+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -5089,7 +4861,7 @@ do 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_CC="gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5100,11 +4872,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -5112,8 +4884,12 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ 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 CC=$ac_ct_CC @@ -5126,10 +4902,10 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -5142,7 +4918,7 @@ do 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_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5153,11 +4929,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 -$as_echo "$CC" >&6; } + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -5166,10 +4942,10 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -5187,7 +4963,7 @@ do continue fi ac_cv_prog_CC="cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5210,11 +4986,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 -$as_echo "$CC" >&6; } + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -5225,10 +5001,10 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -5241,7 +5017,7 @@ do 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_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5252,11 +5028,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 -$as_echo "$CC" >&6; } + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -5269,10 +5045,10 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ 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_CC+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -5285,7 +5061,7 @@ do 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_CC="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5296,11 +5072,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -5312,8 +5088,12 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ 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 CC=$ac_ct_CC @@ -5323,50 +5103,44 @@ fi fi -test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH See \`config.log' for more details." >&5 -$as_echo "$as_me: error: no acceptable C compiler found in \$PATH +echo "$as_me: error: no acceptable C compiler found in \$PATH See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } + { (exit 1); exit 1; }; } # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 -set X $ac_compile -ac_compiler=$2 +echo "$as_me:$LINENO: checking for C compiler version" >&5 +ac_compiler=`set X $ac_compile; echo $2` { (ac_try="$ac_compiler --version >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } { (ac_try="$ac_compiler -v >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } { (ac_try="$ac_compiler -V >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF @@ -5385,22 +5159,27 @@ main () } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" +ac_clean_files="$ac_clean_files a.out a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -$as_echo_n "checking for C compiler default output file name... " >&6; } -ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` - -# The possible output files: -ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" - +{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } +ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +# +# List of possible output files, starting from the most likely. +# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) +# only as a last resort. b.out is created by i960 compilers. +ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' +# +# The IRIX 6 linker writes into existing files which may not be +# executable, retaining their permissions. Remove them first so a +# subsequent execution test works. ac_rmfiles= for ac_file in $ac_files do case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; * ) ac_rmfiles="$ac_rmfiles $ac_file";; esac done @@ -5411,11 +5190,10 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' @@ -5426,7 +5204,7 @@ for ac_file in $ac_files '' do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; [ab].out ) # We found the default executable, but exeext='' is most @@ -5453,27 +5231,25 @@ else ac_file='' fi -{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } +{ echo "$as_me:$LINENO: result: $ac_file" >&5 +echo "${ECHO_T}$ac_file" >&6; } if test -z "$ac_file"; then - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables +{ { echo "$as_me:$LINENO: error: C compiler cannot create executables See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C compiler cannot create executables +echo "$as_me: error: C compiler cannot create executables See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } + { (exit 77); exit 77; }; } fi ac_exeext=$ac_cv_exeext # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } +{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then @@ -5482,53 +5258,49 @@ if test "$cross_compiling" != yes; then *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. + { { echo "$as_me:$LINENO: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'. See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot run C compiled programs. +echo "$as_me: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'. See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } + { (exit 1); exit 1; }; } fi fi fi -{ $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } +{ echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } -rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out +rm -f a.out a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } -{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } +{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 +echo "${ECHO_T}$cross_compiling" >&6; } -{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 -$as_echo_n "checking for suffix of executables... " >&6; } +{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will @@ -5537,33 +5309,31 @@ $as_echo "$ac_try_echo") >&5 for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` break;; * ) break;; esac done else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link + { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +echo "$as_me: error: cannot compute suffix of executables: cannot compile and link See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } + { (exit 1); exit 1; }; } fi rm -f conftest$ac_cv_exeext -{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -$as_echo "$ac_cv_exeext" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +echo "${ECHO_T}$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 -$as_echo_n "checking for suffix of object files... " >&6; } +{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } if test "${ac_cv_objext+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -5586,43 +5356,40 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac done else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile +echo "$as_me: error: cannot compute suffix of object files: cannot compile See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } + { (exit 1); exit 1; }; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -$as_echo "$ac_cv_objext" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +echo "${ECHO_T}$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } if test "${ac_cv_c_compiler_gnu+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -5648,21 +5415,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_compiler_gnu=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_compiler_gnu=no @@ -5672,19 +5438,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GCC=yes -else - GCC= -fi +{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } +GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } +{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } if test "${ac_cv_prog_cc_g+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes @@ -5711,21 +5473,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_cv_prog_cc_g=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 CFLAGS="" @@ -5750,21 +5511,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then : else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_c_werror_flag=$ac_save_c_werror_flag @@ -5790,21 +5550,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_cv_prog_cc_g=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -5819,8 +5578,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$ac_cv_prog_cc_g" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then @@ -5836,10 +5595,10 @@ else CFLAGS= fi fi -{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } if test "${ac_cv_prog_cc_c89+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_prog_cc_c89=no ac_save_CC=$CC @@ -5910,21 +5669,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_cv_prog_cc_c89=$ac_arg else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -5940,15 +5698,15 @@ fi # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) - { $as_echo "$as_me:$LINENO: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; + { echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6; } ;; xno) - { $as_echo "$as_me:$LINENO: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; + { echo "$as_me:$LINENO: result: unsupported" >&5 +echo "${ECHO_T}unsupported" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; + { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; esac @@ -5966,10 +5724,10 @@ if test "$COMPATH" = "." ; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_COMPATH+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $COMPATH in [\\/]* | ?:[\\/]*) @@ -5984,7 +5742,7 @@ do 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_path_COMPATH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5996,11 +5754,11 @@ esac fi COMPATH=$ac_cv_path_COMPATH if test -n "$COMPATH"; then - { $as_echo "$as_me:$LINENO: result: $COMPATH" >&5 -$as_echo "$COMPATH" >&6; } + { echo "$as_me:$LINENO: result: $COMPATH" >&5 +echo "${ECHO_T}$COMPATH" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -6012,46 +5770,46 @@ fi GCCVER=20995 if test \( "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes" \) -a "$GCC" = "yes"; then - { $as_echo "$as_me:$LINENO: checking the GNU gcc compiler version" >&5 -$as_echo_n "checking the GNU gcc compiler version... " >&6; } + { echo "$as_me:$LINENO: checking the GNU gcc compiler version" >&5 +echo $ECHO_N "checking the GNU gcc compiler version... $ECHO_C" >&6; } _gcc_version=`$CC -dumpversion` _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` _gcc_longver=`echo $_gcc_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'` GCCVER=`echo $_gcc_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'` if test "$_gcc_major" -lt "3"; then - { { $as_echo "$as_me:$LINENO: error: found version \"$_gcc_version\", use version 3+ of the gcc compiler" >&5 -$as_echo "$as_me: error: found version \"$_gcc_version\", use version 3+ of the gcc compiler" >&2;} + { { echo "$as_me:$LINENO: error: found version \"$_gcc_version\", use version 3+ of the gcc compiler" >&5 +echo "$as_me: error: found version \"$_gcc_version\", use version 3+ of the gcc compiler" >&2;} { (exit 1); exit 1; }; } else if test "$GCCVER" -eq "030203"; then if test "$ENABLE_SYMBOLS" = "SMALL"; then - { { $as_echo "$as_me:$LINENO: error: version \"$_gcc_version\" gives internal error with small." >&5 -$as_echo "$as_me: error: version \"$_gcc_version\" gives internal error with small." >&2;} + { { echo "$as_me:$LINENO: error: version \"$_gcc_version\" gives internal error with small." >&5 +echo "$as_me: error: version \"$_gcc_version\" gives internal error with small." >&2;} { (exit 1); exit 1; }; } fi fi fi - { $as_echo "$as_me:$LINENO: result: checked (gcc $_gcc_version)" >&5 -$as_echo "checked (gcc $_gcc_version)" >&6; } + { echo "$as_me:$LINENO: result: checked (gcc $_gcc_version)" >&5 +echo "${ECHO_T}checked (gcc $_gcc_version)" >&6; } if test "$_os" = "SunOS"; then - { $as_echo "$as_me:$LINENO: checking gcc linker" >&5 -$as_echo_n "checking gcc linker... " >&6; } + { echo "$as_me:$LINENO: checking gcc linker" >&5 +echo $ECHO_N "checking gcc linker... $ECHO_C" >&6; } if $CC -Wl,--version 2>&1 |head -n 1| grep -v GNU > /dev/null;then - { { $as_echo "$as_me:$LINENO: error: failed (not GNU ld). Use GNU ld instead of Sun ld on Solaris" >&5 -$as_echo "$as_me: error: failed (not GNU ld). Use GNU ld instead of Sun ld on Solaris" >&2;} + { { echo "$as_me:$LINENO: error: failed (not GNU ld). Use GNU ld instead of Sun ld on Solaris" >&5 +echo "$as_me: error: failed (not GNU ld). Use GNU ld instead of Sun ld on Solaris" >&2;} { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:$LINENO: result: ok (GNU ld)" >&5 -$as_echo "ok (GNU ld)" >&6; } + { echo "$as_me:$LINENO: result: ok (GNU ld)" >&5 +echo "${ECHO_T}ok (GNU ld)" >&6; } fi fi HAVE_LD_BSYMBOLIC_FUNCTIONS= if test "$GCC" = "yes"; then - { $as_echo "$as_me:$LINENO: checking for -Bsymbolic-functions linker support " >&5 -$as_echo_n "checking for -Bsymbolic-functions linker support ... " >&6; } + { echo "$as_me:$LINENO: checking for -Bsymbolic-functions linker support " >&5 +echo $ECHO_N "checking for -Bsymbolic-functions linker support ... $ECHO_C" >&6; } bsymbolic_functions_ldflags_save=$LDFLAGS LDFLAGS="$LDFLAGS -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo" @@ -6080,81 +5838,77 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then HAVE_LD_BSYMBOLIC_FUNCTIONS=TRUE else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test "z$HAVE_LD_BSYMBOLIC_FUNCTIONS" = "zTRUE"; then - { $as_echo "$as_me:$LINENO: result: found " >&5 -$as_echo "found " >&6; } + { echo "$as_me:$LINENO: result: found " >&5 +echo "${ECHO_T}found " >&6; } else - { $as_echo "$as_me:$LINENO: result: not found " >&5 -$as_echo "not found " >&6; } + { echo "$as_me:$LINENO: result: not found " >&5 +echo "${ECHO_T}not found " >&6; } fi LDFLAGS=$bsymbolic_functions_ldflags_save fi -{ $as_echo "$as_me:$LINENO: checking whether to enable pch feature" >&5 -$as_echo_n "checking whether to enable pch feature... " >&6; } +{ echo "$as_me:$LINENO: checking whether to enable pch feature" >&5 +echo $ECHO_N "checking whether to enable pch feature... $ECHO_C" >&6; } if test -n "$enable_pch" && test "$enable_pch" != "no"; then if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then ENABLE_PCH="TRUE" - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } elif test "$GCC" = "yes" -a "$GCCVER" -gt "030400"; then ENABLE_PCH="TRUE" - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else ENABLE_PCH="" - { $as_echo "$as_me:$LINENO: WARNING: Precompiled header not yet supported for your platform/compiler" >&5 -$as_echo "$as_me: WARNING: Precompiled header not yet supported for your platform/compiler" >&2;} + { echo "$as_me:$LINENO: WARNING: Precompiled header not yet supported for your platform/compiler" >&5 +echo "$as_me: WARNING: Precompiled header not yet supported for your platform/compiler" >&2;} fi else ENABLE_PCH="" - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -{ $as_echo "$as_me:$LINENO: checking whether to enable hid list feature" >&5 -$as_echo_n "checking whether to enable hid list feature... " >&6; } +{ echo "$as_me:$LINENO: checking whether to enable hid list feature" >&5 +echo $ECHO_N "checking whether to enable hid list feature... $ECHO_C" >&6; } if test -n "$enable_hids" && test "$enable_hids" != "no"; then NO_HIDS="" - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else NO_HIDS="TRUE" - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -{ $as_echo "$as_me:$LINENO: checking for GNU make" >&5 -$as_echo_n "checking for GNU make... " >&6; } +{ echo "$as_me:$LINENO: checking for GNU make" >&5 +echo $ECHO_N "checking for GNU make... $ECHO_C" >&6; } for a in "$MAKE" $GNUMAKE make gmake gnumake; do $a --version 2> /dev/null | grep GNU 2>&1 > /dev/null if test $? -eq 0; then @@ -6162,40 +5916,40 @@ for a in "$MAKE" $GNUMAKE make gmake gnumake; do break fi done -{ $as_echo "$as_me:$LINENO: result: $GNUMAKE" >&5 -$as_echo "$GNUMAKE" >&6; } +{ echo "$as_me:$LINENO: result: $GNUMAKE" >&5 +echo "${ECHO_T}$GNUMAKE" >&6; } if test -z "$GNUMAKE"; then - { { $as_echo "$as_me:$LINENO: error: not found. install GNU make." >&5 -$as_echo "$as_me: error: not found. install GNU make." >&2;} + { { echo "$as_me:$LINENO: error: not found. install GNU make." >&5 +echo "$as_me: error: not found. install GNU make." >&2;} { (exit 1); exit 1; }; } fi -{ $as_echo "$as_me:$LINENO: checking the GNU make version" >&5 -$as_echo_n "checking the GNU make version... " >&6; } +{ echo "$as_me:$LINENO: checking the GNU make version" >&5 +echo $ECHO_N "checking the GNU make version... $ECHO_C" >&6; } _make_version=`$GNUMAKE --version | grep GNU | $SED -e 's@^[^0-9]*@@' -e 's@ .*@@' -e 's@,.*@@'`; _make_longver=`echo $_make_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'` if test "$_make_longver" -ge "037901" ; then - { $as_echo "$as_me:$LINENO: result: $GNUMAKE $_make_version" >&5 -$as_echo "$GNUMAKE $_make_version" >&6; } + { echo "$as_me:$LINENO: result: $GNUMAKE $_make_version" >&5 +echo "${ECHO_T}$GNUMAKE $_make_version" >&6; } else if test "$_os" = "Darwin"; then if test "$_make_longver" -ge "037900" ; then - { $as_echo "$as_me:$LINENO: result: $GNUMAKE $_make_version" >&5 -$as_echo "$GNUMAKE $_make_version" >&6; } + { echo "$as_me:$LINENO: result: $GNUMAKE $_make_version" >&5 +echo "${ECHO_T}$GNUMAKE $_make_version" >&6; } else - { $as_echo "$as_me:$LINENO: WARNING: failed ($GNUMAKE $_make_version need 3.79.0+)" >&5 -$as_echo "$as_me: WARNING: failed ($GNUMAKE $_make_version need 3.79.0+)" >&2;} + { echo "$as_me:$LINENO: WARNING: failed ($GNUMAKE $_make_version need 3.79.0+)" >&5 +echo "$as_me: WARNING: failed ($GNUMAKE $_make_version need 3.79.0+)" >&2;} fi else - { { $as_echo "$as_me:$LINENO: error: failed ($GNUMAKE $_make_version need 3.79.1+)" >&5 -$as_echo "$as_me: error: failed ($GNUMAKE $_make_version need 3.79.1+)" >&2;} + { { echo "$as_me:$LINENO: error: failed ($GNUMAKE $_make_version need 3.79.1+)" >&5 +echo "$as_me: error: failed ($GNUMAKE $_make_version need 3.79.1+)" >&2;} { (exit 1); exit 1; }; } fi fi -{ $as_echo "$as_me:$LINENO: checking for GNU tar" >&5 -$as_echo_n "checking for GNU tar... " >&6; } +{ echo "$as_me:$LINENO: checking for GNU tar" >&5 +echo $ECHO_N "checking for GNU tar... $ECHO_C" >&6; } for a in $GNUTAR gtar gnutar tar; do $a --version 2> /dev/null | grep GNU 2>&1 > /dev/null if test $? -eq 0; then @@ -6203,11 +5957,11 @@ for a in $GNUTAR gtar gnutar tar; do break fi done -{ $as_echo "$as_me:$LINENO: result: $GNUTAR" >&5 -$as_echo "$GNUTAR" >&6; } +{ echo "$as_me:$LINENO: result: $GNUTAR" >&5 +echo "${ECHO_T}$GNUTAR" >&6; } if test -z "$GNUTAR"; then - { { $as_echo "$as_me:$LINENO: error: not found. install GNU tar." >&5 -$as_echo "$as_me: error: not found. install GNU tar." >&2;} + { { echo "$as_me:$LINENO: error: not found. install GNU tar." >&5 +echo "$as_me: error: not found. install GNU tar." >&2;} { (exit 1); exit 1; }; } fi @@ -6219,10 +5973,10 @@ if test "$_os" = "SunOS"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path__cc+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $_cc in [\\/]* | ?:[\\/]*) @@ -6237,7 +5991,7 @@ do 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_path__cc="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6249,11 +6003,11 @@ esac fi _cc=$ac_cv_path__cc if test -n "$_cc"; then - { $as_echo "$as_me:$LINENO: result: $_cc" >&5 -$as_echo "$_cc" >&6; } + { echo "$as_me:$LINENO: result: $_cc" >&5 +echo "${ECHO_T}$_cc" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -6261,32 +6015,32 @@ fi done COMPATH=`echo $_cc | $SED -n "s/\/cc//p"` - { $as_echo "$as_me:$LINENO: checking the SunStudio C/C++ compiler version" >&5 -$as_echo_n "checking the SunStudio C/C++ compiler version... " >&6; } + { echo "$as_me:$LINENO: checking the SunStudio C/C++ compiler version" >&5 +echo $ECHO_N "checking the SunStudio C/C++ compiler version... $ECHO_C" >&6; } _sunstudio_string=`$CC -V 2>&1 | grep '^cc' | sed -e 's/.* C //'` _sunstudio_version=`echo $_sunstudio_string | $AWK '{ print $1 }'` _sunstudio_major=`echo $_sunstudio_version | $AWK -F. '{ print $1 }'` if test "$_sunstudio_major" != "5"; then - { { $as_echo "$as_me:$LINENO: error: found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" >&5 -$as_echo "$as_me: error: found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" >&2;} + { { echo "$as_me:$LINENO: error: found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" >&5 +echo "$as_me: error: found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" >&2;} { (exit 1); exit 1; }; } else _sunstudio_minor=`echo $_sunstudio_version | $AWK -F. '{ if ($2 == 5) print "true"; else if ($2 == 7) print "true"; else if ($2 == 8) print "true"; else if ($2 == 9) print "true"; else print "false" }'` if test "$_sunstudio_minor" = "false"; then - { { $as_echo "$as_me:$LINENO: error: found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" >&5 -$as_echo "$as_me: error: found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" >&2;} + { { echo "$as_me:$LINENO: error: found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" >&5 +echo "$as_me: error: found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" >&2;} { (exit 1); exit 1; }; } else - { $as_echo "$as_me:$LINENO: result: checked" >&5 -$as_echo "checked" >&6; } + { echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6; } fi fi fi fi if test "$GCC" = "yes"; then - { $as_echo "$as_me:$LINENO: checking for --hash-style=both linker support " >&5 -$as_echo_n "checking for --hash-style=both linker support ... " >&6; } + { echo "$as_me:$LINENO: checking for --hash-style=both linker support " >&5 +echo $ECHO_N "checking for --hash-style=both linker support ... $ECHO_C" >&6; } hash_style_ldflags_save=$LDFLAGS LDFLAGS="$LDFLAGS -Wl,--hash-style=both" cat >conftest.$ac_ext <<_ACEOF @@ -6314,38 +6068,34 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then HAVE_LD_HASH_STYLE=TRUE else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 HAVE_LD_HASH_STYLE=FALSE fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test "z$HAVE_LD_HASH_STYLE" = "zTRUE"; then - { $as_echo "$as_me:$LINENO: result: found " >&5 -$as_echo "found " >&6; } + { echo "$as_me:$LINENO: result: found " >&5 +echo "${ECHO_T}found " >&6; } else - { $as_echo "$as_me:$LINENO: result: not found " >&5 -$as_echo "not found " >&6; } + { echo "$as_me:$LINENO: result: not found " >&5 +echo "${ECHO_T}not found " >&6; } fi LDFLAGS=$hash_style_ldflags_save fi @@ -6357,10 +6107,10 @@ if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path__cc+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $_cc in [\\/]* | ?:[\\/]*) @@ -6375,7 +6125,7 @@ do 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_path__cc="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6387,11 +6137,11 @@ esac fi _cc=$ac_cv_path__cc if test -n "$_cc"; then - { $as_echo "$as_me:$LINENO: result: $_cc" >&5 -$as_echo "$_cc" >&6; } + { echo "$as_me:$LINENO: result: $_cc" >&5 +echo "${ECHO_T}$_cc" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -6399,23 +6149,23 @@ fi done COMPATH=`echo $_cc | $SED -n "s/\/cc//p"` - { $as_echo "$as_me:$LINENO: checking the SGI MIPSpro C compiler version" >&5 -$as_echo_n "checking the SGI MIPSpro C compiler version... " >&6; } + { echo "$as_me:$LINENO: checking the SGI MIPSpro C compiler version" >&5 +echo $ECHO_N "checking the SGI MIPSpro C compiler version... $ECHO_C" >&6; } _mipspro_version=`$CC -version 2>&1 | $AWK '{ print $4 }'` _mipspro_major=`echo $_mipspro_version | $AWK -F. '{ print $1 }'` if test "$_mipspro_major" != "7"; then - { { $as_echo "$as_me:$LINENO: error: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&5 -$as_echo "$as_me: error: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&2;} + { { echo "$as_me:$LINENO: error: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&5 +echo "$as_me: error: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&2;} { (exit 1); exit 1; }; } else _mipspro_minor=`echo $_mipspro_version | $AWK -F. '{ if ($2 <= 1) print "false"; else print "true" }'` if test "$_mipspro_minor" = "false"; then - { { $as_echo "$as_me:$LINENO: error: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&5 -$as_echo "$as_me: error: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&2;} + { { echo "$as_me:$LINENO: error: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&5 +echo "$as_me: error: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&2;} { (exit 1); exit 1; }; } else - { $as_echo "$as_me:$LINENO: result: checked" >&5 -$as_echo "checked" >&6; } + { echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6; } fi fi fi @@ -6427,10 +6177,10 @@ if test "$_os" = "OSF1"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path__cc+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $_cc in [\\/]* | ?:[\\/]*) @@ -6445,7 +6195,7 @@ do 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_path__cc="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6457,11 +6207,11 @@ esac fi _cc=$ac_cv_path__cc if test -n "$_cc"; then - { $as_echo "$as_me:$LINENO: result: $_cc" >&5 -$as_echo "$_cc" >&6; } + { echo "$as_me:$LINENO: result: $_cc" >&5 +echo "${ECHO_T}$_cc" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -6469,19 +6219,19 @@ fi done COMPATH=`echo $_cc | $SED -n "s/\/cc//p"` - { $as_echo "$as_me:$LINENO: WARNING: ******* $_cc , $COMPATH" >&5 -$as_echo "$as_me: WARNING: ******* $_cc , $COMPATH" >&2;} - { $as_echo "$as_me:$LINENO: checking the Compaq C compiler version" >&5 -$as_echo_n "checking the Compaq C compiler version... " >&6; } + { echo "$as_me:$LINENO: WARNING: ******* $_cc , $COMPATH" >&5 +echo "$as_me: WARNING: ******* $_cc , $COMPATH" >&2;} + { echo "$as_me:$LINENO: checking the Compaq C compiler version" >&5 +echo $ECHO_N "checking the Compaq C compiler version... $ECHO_C" >&6; } _compaqc_version=`$CC -V 2>&1 | $AWK '{ print $3 }'` _compaqc_major=`echo $_compaqc_version | $AWK -F. '{ print $1 }'` if test "$_compaqc_major" != "T6"; then - { { $as_echo "$as_me:$LINENO: error: found version \"$_compaqc_version\", use version 6 of the Compaq C compiler" >&5 -$as_echo "$as_me: error: found version \"$_compaqc_version\", use version 6 of the Compaq C compiler" >&2;} + { { echo "$as_me:$LINENO: error: found version \"$_compaqc_version\", use version 6 of the Compaq C compiler" >&5 +echo "$as_me: error: found version \"$_compaqc_version\", use version 6 of the Compaq C compiler" >&2;} { (exit 1); exit 1; }; } else - { $as_echo "$as_me:$LINENO: result: checked" >&5 -$as_echo "checked" >&6; } + { echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6; } fi fi fi @@ -6489,10 +6239,10 @@ fi if test -z "$with_perl_home"; then # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PERL+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PERL in [\\/]* | ?:[\\/]*) @@ -6507,7 +6257,7 @@ do 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_path_PERL="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6519,11 +6269,11 @@ esac fi PERL=$ac_cv_path_PERL if test -n "$PERL"; then - { $as_echo "$as_me:$LINENO: result: $PERL" >&5 -$as_echo "$PERL" >&6; } + { echo "$as_me:$LINENO: result: $PERL" >&5 +echo "${ECHO_T}$PERL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -6535,46 +6285,46 @@ else if test -x "$_perl_path"; then PERL=$_perl_path else - { { $as_echo "$as_me:$LINENO: error: $_perl_path not found" >&5 -$as_echo "$as_me: error: $_perl_path not found" >&2;} + { { echo "$as_me:$LINENO: error: $_perl_path not found" >&5 +echo "$as_me: error: $_perl_path not found" >&2;} { (exit 1); exit 1; }; } fi fi if test "$PERL"; then - { $as_echo "$as_me:$LINENO: checking the Perl version" >&5 -$as_echo_n "checking the Perl version... " >&6; } + { echo "$as_me:$LINENO: checking the Perl version" >&5 +echo $ECHO_N "checking the Perl version... $ECHO_C" >&6; } ${PERL} -e "exit($]);" _perl_version=$? if test "$_perl_version" -lt 5; then - { { $as_echo "$as_me:$LINENO: error: found Perl version \"$_perl_version\", use version 5 of Perl" >&5 -$as_echo "$as_me: error: found Perl version \"$_perl_version\", use version 5 of Perl" >&2;} + { { echo "$as_me:$LINENO: error: found Perl version \"$_perl_version\", use version 5 of Perl" >&5 +echo "$as_me: error: found Perl version \"$_perl_version\", use version 5 of Perl" >&2;} { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:$LINENO: result: checked (perl $_perl_version)" >&5 -$as_echo "checked (perl $_perl_version)" >&6; } + { echo "$as_me:$LINENO: result: checked (perl $_perl_version)" >&5 +echo "${ECHO_T}checked (perl $_perl_version)" >&6; } else - { { $as_echo "$as_me:$LINENO: error: Perl not found, install version 5 of Perl" >&5 -$as_echo "$as_me: error: Perl not found, install version 5 of Perl" >&2;} + { { echo "$as_me:$LINENO: error: Perl not found, install version 5 of Perl" >&5 +echo "$as_me: error: Perl not found, install version 5 of Perl" >&2;} { (exit 1); exit 1; }; } fi -{ $as_echo "$as_me:$LINENO: checking for required Perl modules" >&5 -$as_echo_n "checking for required Perl modules... " >&6; } +{ echo "$as_me:$LINENO: checking for required Perl modules" >&5 +echo $ECHO_N "checking for required Perl modules... $ECHO_C" >&6; } if `$PERL -e 'use Archive::Zip;'`; then - { $as_echo "$as_me:$LINENO: result: all modules found" >&5 -$as_echo "all modules found" >&6; } + { echo "$as_me:$LINENO: result: all modules found" >&5 +echo "${ECHO_T}all modules found" >&6; } else - { { $as_echo "$as_me:$LINENO: error: Failed to find some modules" >&5 -$as_echo "$as_me: error: Failed to find some modules" >&2;} + { { echo "$as_me:$LINENO: error: Failed to find some modules" >&5 +echo "$as_me: error: Failed to find some modules" >&2;} { (exit 1); exit 1; }; } fi if test "$_os" = "WINNT"; then if test "$WITH_MINGWIN" != "yes"; then - { $as_echo "$as_me:$LINENO: checking for friendly registry keys" >&5 -$as_echo_n "checking for friendly registry keys... " >&6; } + { echo "$as_me:$LINENO: checking for friendly registry keys" >&5 +echo $ECHO_N "checking for friendly registry keys... $ECHO_C" >&6; } # VS.Net 2003, VS.Net 2005 if test -z "$with_cl_home"; then vctest=`./oowintool --msvc-productdir`; @@ -6584,8 +6334,8 @@ $as_echo_n "checking for friendly registry keys... " >&6; } else with_cl_home=`cygpath -u "$with_cl_home"` fi - { $as_echo "$as_me:$LINENO: result: done" >&5 -$as_echo "done" >&6; } + { echo "$as_me:$LINENO: result: done" >&5 +echo "${ECHO_T}done" >&6; } if test -n "$with_mspdb_path";then with_mspdb_path=`cygpath -u "$with_mspdb_path"` @@ -6606,10 +6356,10 @@ $as_echo "done" >&6; } if test -z "$MSPDB_PATH";then # Extract the first word of "mspdb80.dll", so it can be a program name with args. set dummy mspdb80.dll; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_MSPDB_PATH+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $MSPDB_PATH in [\\/]* | ?:[\\/]*) @@ -6624,7 +6374,7 @@ do 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_path_MSPDB_PATH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6636,20 +6386,20 @@ esac fi MSPDB_PATH=$ac_cv_path_MSPDB_PATH if test -n "$MSPDB_PATH"; then - { $as_echo "$as_me:$LINENO: result: $MSPDB_PATH" >&5 -$as_echo "$MSPDB_PATH" >&6; } + { echo "$as_me:$LINENO: result: $MSPDB_PATH" >&5 +echo "${ECHO_T}$MSPDB_PATH" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi # Extract the first word of "mspdb71.dll", so it can be a program name with args. set dummy mspdb71.dll; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_MSPDB_PATH+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $MSPDB_PATH in [\\/]* | ?:[\\/]*) @@ -6664,7 +6414,7 @@ do 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_path_MSPDB_PATH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6676,11 +6426,11 @@ esac fi MSPDB_PATH=$ac_cv_path_MSPDB_PATH if test -n "$MSPDB_PATH"; then - { $as_echo "$as_me:$LINENO: result: $MSPDB_PATH" >&5 -$as_echo "$MSPDB_PATH" >&6; } + { echo "$as_me:$LINENO: result: $MSPDB_PATH" >&5 +echo "${ECHO_T}$MSPDB_PATH" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -6688,25 +6438,25 @@ fi fi if test -z "$MSPDB_PATH"; then - { { $as_echo "$as_me:$LINENO: error: You need a mspdb71.dll/mspdb80.dll, make sure it's in the path or use --with-mspdb-path" >&5 -$as_echo "$as_me: error: You need a mspdb71.dll/mspdb80.dll, make sure it's in the path or use --with-mspdb-path" >&2;} + { { echo "$as_me:$LINENO: error: You need a mspdb71.dll/mspdb80.dll, make sure it's in the path or use --with-mspdb-path" >&5 +echo "$as_me: error: You need a mspdb71.dll/mspdb80.dll, make sure it's in the path or use --with-mspdb-path" >&2;} { (exit 1); exit 1; }; } fi MSPDB_PATH=`cygpath -d "$MSPDB_PATH"` MSPDB_PATH=`cygpath -u "$MSPDB_PATH"` PATH="$MSPDB_PATH:$PATH" - { $as_echo "$as_me:$LINENO: checking the Microsoft C/C++ Compiler" >&5 -$as_echo_n "checking the Microsoft C/C++ Compiler... " >&6; } + { echo "$as_me:$LINENO: checking the Microsoft C/C++ Compiler" >&5 +echo $ECHO_N "checking the Microsoft C/C++ Compiler... $ECHO_C" >&6; } if test -x "$with_cl_home/bin/cl.exe"; then CC="$with_cl_home/bin/cl.exe" else # Extract the first word of "cl.exe", so it can be a program name with args. set dummy cl.exe; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_CC+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $CC in [\\/]* | ?:[\\/]*) @@ -6721,7 +6471,7 @@ do 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_path_CC="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6733,11 +6483,11 @@ esac fi CC=$ac_cv_path_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 -$as_echo "$CC" >&6; } + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -6747,12 +6497,12 @@ fi CC=`cygpath -d "$CC"` CC=`cygpath -u "$CC"` # Remove /cl.exe from CC case insensitive - { $as_echo "$as_me:$LINENO: result: found ($CC)" >&5 -$as_echo "found ($CC)" >&6; } + { echo "$as_me:$LINENO: result: found ($CC)" >&5 +echo "${ECHO_T}found ($CC)" >&6; } COMPATH=`echo $CC | $SED 's@/[cC][lL]\.[eE][xX][eE]@@'` export INCLUDE=`cygpath -d "$COMPATH/../Include"` - { $as_echo "$as_me:$LINENO: checking the Version of Microsoft C/C++ Compiler" >&5 -$as_echo_n "checking the Version of Microsoft C/C++ Compiler... " >&6; } + { echo "$as_me:$LINENO: checking the Version of Microsoft C/C++ Compiler" >&5 +echo $ECHO_N "checking the Version of Microsoft C/C++ Compiler... $ECHO_C" >&6; } CCNUMVER=`$CC 2>&1 | $AWK "/Microsoft/ && /..\\...\\...../ { x = match( \\\$0, /..\\...\\...../ ) CCversion = substr( \\\$0, RSTART, RLENGTH) @@ -6761,47 +6511,47 @@ $as_echo_n "checking the Version of Microsoft C/C++ Compiler... " >&6; } printf (\"%04d\",vertoken[i] ) } }"` - { $as_echo "$as_me:$LINENO: result: found Compiler version $CCNUMVER." >&5 -$as_echo "found Compiler version $CCNUMVER." >&6; } + { echo "$as_me:$LINENO: result: found Compiler version $CCNUMVER." >&5 +echo "${ECHO_T}found Compiler version $CCNUMVER." >&6; } if test "$CCNUMVER" -ge "001500000000"; then COMEX=12 MSVSVER=2008 - { $as_echo "$as_me:$LINENO: result: found .NET 2008 / VS 9.0." >&5 -$as_echo "found .NET 2008 / VS 9.0." >&6; } + { echo "$as_me:$LINENO: result: found .NET 2008 / VS 9.0." >&5 +echo "${ECHO_T}found .NET 2008 / VS 9.0." >&6; } elif test "$CCNUMVER" -ge "001400000000"; then COMEX=11 MSVSVER=2005 - { $as_echo "$as_me:$LINENO: result: found .NET 2005." >&5 -$as_echo "found .NET 2005." >&6; } + { echo "$as_me:$LINENO: result: found .NET 2005." >&5 +echo "${ECHO_T}found .NET 2005." >&6; } elif test "$CCNUMVER" -ge "001300102240"; then COMEX=10 MSVSVER=2003 - { $as_echo "$as_me:$LINENO: result: found .NET 2003." >&5 -$as_echo "found .NET 2003." >&6; } + { echo "$as_me:$LINENO: result: found .NET 2003." >&5 +echo "${ECHO_T}found .NET 2003." >&6; } else - { { $as_echo "$as_me:$LINENO: error: Compiler too old. Use Microsoft C/C++ .NET 2003/2005 compiler." >&5 -$as_echo "$as_me: error: Compiler too old. Use Microsoft C/C++ .NET 2003/2005 compiler." >&2;} + { { echo "$as_me:$LINENO: error: Compiler too old. Use Microsoft C/C++ .NET 2003/2005 compiler." >&5 +echo "$as_me: error: Compiler too old. Use Microsoft C/C++ .NET 2003/2005 compiler." >&2;} { (exit 1); exit 1; }; } fi else - { { $as_echo "$as_me:$LINENO: error: Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe." >&5 -$as_echo "$as_me: error: Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe." >&2;} + { { echo "$as_me:$LINENO: error: Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe." >&5 +echo "$as_me: error: Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe." >&2;} { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:$LINENO: checking the Mingwin32 C++ Compiler" >&5 -$as_echo_n "checking the Mingwin32 C++ Compiler... " >&6; } + { echo "$as_me:$LINENO: checking the Mingwin32 C++ Compiler" >&5 +echo $ECHO_N "checking the Mingwin32 C++ Compiler... $ECHO_C" >&6; } if test `$CC -dumpmachine | $SED -e 's/^.*-//'` = "mingw32"; then - { $as_echo "$as_me:$LINENO: result: found." >&5 -$as_echo "found." >&6; } + { echo "$as_me:$LINENO: result: found." >&5 +echo "${ECHO_T}found." >&6; } if $CC -dumpspecs | grep -q "mno-cygwin"; then USE_MINGW="cygwin" else USE_MINGW="pure-mingw" fi else - { { $as_echo "$as_me:$LINENO: error: Mingwin32 C++ Compiler not found." >&5 -$as_echo "$as_me: error: Mingwin32 C++ Compiler not found." >&2;} + { { echo "$as_me:$LINENO: error: Mingwin32 C++ Compiler not found." >&5 +echo "$as_me: error: Mingwin32 C++ Compiler not found." >&2;} { (exit 1); exit 1; }; } fi fi @@ -6814,10 +6564,10 @@ if test "$_os" = "WINNT"; then if test "$WITH_MINGWIN" = "yes" || test "$COMEX" -ge "10"; then # Extract the first word of "midl.exe", so it can be a program name with args. set dummy midl.exe; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_MIDL_PATH+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $MIDL_PATH in [\\/]* | ?:[\\/]*) @@ -6832,7 +6582,7 @@ do 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_path_MIDL_PATH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6844,11 +6594,11 @@ esac fi MIDL_PATH=$ac_cv_path_MIDL_PATH if test -n "$MIDL_PATH"; then - { $as_echo "$as_me:$LINENO: result: $MIDL_PATH" >&5 -$as_echo "$MIDL_PATH" >&6; } + { echo "$as_me:$LINENO: result: $MIDL_PATH" >&5 +echo "${ECHO_T}$MIDL_PATH" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -6877,8 +6627,8 @@ fi fi fi if test ! -x "$MIDL_PATH/midl.exe"; then - { { $as_echo "$as_me:$LINENO: error: midl.exe not found. Make sure it's in the path or use --with-midl-path" >&5 -$as_echo "$as_me: error: midl.exe not found. Make sure it's in the path or use --with-midl-path" >&2;} + { { echo "$as_me:$LINENO: error: midl.exe not found. Make sure it's in the path or use --with-midl-path" >&5 +echo "$as_me: error: midl.exe not found. Make sure it's in the path or use --with-midl-path" >&2;} { (exit 1); exit 1; }; } fi # Convert to posix path with 8.3 filename restrictions ( No spaces ) @@ -6887,10 +6637,10 @@ $as_echo "$as_me: error: midl.exe not found. Make sure it's in the path or use - # Extract the first word of "csc.exe", so it can be a program name with args. set dummy csc.exe; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_CSC_PATH+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $CSC_PATH in [\\/]* | ?:[\\/]*) @@ -6905,7 +6655,7 @@ do 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_path_CSC_PATH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6917,11 +6667,11 @@ esac fi CSC_PATH=$ac_cv_path_CSC_PATH if test -n "$CSC_PATH"; then - { $as_echo "$as_me:$LINENO: result: $CSC_PATH" >&5 -$as_echo "$CSC_PATH" >&6; } + { echo "$as_me:$LINENO: result: $CSC_PATH" >&5 +echo "${ECHO_T}$CSC_PATH" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -6940,16 +6690,16 @@ fi fi fi if test ! -x "$CSC_PATH/csc.exe"; then - { { $as_echo "$as_me:$LINENO: error: csc.exe not found. Make sure it's in the path or use --with-csc-path" >&5 -$as_echo "$as_me: error: csc.exe not found. Make sure it's in the path or use --with-csc-path" >&2;} + { { echo "$as_me:$LINENO: error: csc.exe not found. Make sure it's in the path or use --with-csc-path" >&5 +echo "$as_me: error: csc.exe not found. Make sure it's in the path or use --with-csc-path" >&2;} { (exit 1); exit 1; }; } fi # Convert to posix path with 8.3 filename restrictions ( No spaces ) CSC_PATH=`cygpath -d "$CSC_PATH"` CSC_PATH=`cygpath -u "$CSC_PATH"` - { $as_echo "$as_me:$LINENO: checking .NET Framework" >&5 -$as_echo_n "checking .NET Framework... " >&6; } + { echo "$as_me:$LINENO: checking .NET Framework" >&5 +echo $ECHO_N "checking .NET Framework... $ECHO_C" >&6; } if test -n "$with_frame_home"; then with_frame_home=`cygpath -u "$with_frame_home"` fi @@ -6971,12 +6721,12 @@ $as_echo_n "checking .NET Framework... " >&6; } fi fi if test ! -f "$FRAME_HOME/lib/mscoree.lib"; then - { { $as_echo "$as_me:$LINENO: error: mscoree.lib (.NET Framework) not found. Make sure you use --with-frame-home" >&5 -$as_echo "$as_me: error: mscoree.lib (.NET Framework) not found. Make sure you use --with-frame-home" >&2;} + { { echo "$as_me:$LINENO: error: mscoree.lib (.NET Framework) not found. Make sure you use --with-frame-home" >&5 +echo "$as_me: error: mscoree.lib (.NET Framework) not found. Make sure you use --with-frame-home" >&2;} { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:$LINENO: result: found" >&5 -$as_echo "found" >&6; } + { echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6; } # Convert to posix path with 8.3 filename restrictions ( No spaces ) FRAME_HOME=`cygpath -d "$FRAME_HOME"` FRAME_HOME=`cygpath -u "$FRAME_HOME"` @@ -6992,15 +6742,15 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -$as_echo_n "checking how to run the C preprocessor... " >&6; } +{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then if test "${ac_cv_prog_CPP+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else # Double quotes because CPP needs to be expanded for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" @@ -7032,21 +6782,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then : else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. @@ -7070,14 +6819,13 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err @@ -7085,7 +6833,7 @@ $as_echo "$ac_try_echo") >&5 # Broken: success on invalid input. continue else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Passes both tests. @@ -7110,8 +6858,8 @@ fi else ac_cv_prog_CPP=$CPP fi -{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 -$as_echo "$CPP" >&6; } +{ echo "$as_me:$LINENO: result: $CPP" >&5 +echo "${ECHO_T}$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do @@ -7139,21 +6887,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then : else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. @@ -7177,14 +6924,13 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err @@ -7192,7 +6938,7 @@ $as_echo "$ac_try_echo") >&5 # Broken: success on invalid input. continue else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Passes both tests. @@ -7208,13 +6954,11 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check + { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } + { (exit 1); exit 1; }; } fi ac_ext=c @@ -7224,10 +6968,10 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } +{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } if test "${ac_cv_header_stdc+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -7254,21 +6998,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_cv_header_stdc=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_header_stdc=no @@ -7360,40 +7103,37 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' { (case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -rf conftest.dSYM rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then cat >>confdefs.h <<\_ACEOF @@ -7419,10 +7159,10 @@ if test -z "$CXX"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CXX+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CXX"; then ac_cv_prog_CXX="$CXX" # Let the user override the test. @@ -7435,7 +7175,7 @@ do 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_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7446,11 +7186,11 @@ fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - { $as_echo "$as_me:$LINENO: result: $CXX" >&5 -$as_echo "$CXX" >&6; } + { echo "$as_me:$LINENO: result: $CXX" >&5 +echo "${ECHO_T}$CXX" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -7463,10 +7203,10 @@ if test -z "$CXX"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ 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_CXX+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$ac_ct_CXX"; then ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. @@ -7479,7 +7219,7 @@ do 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_CXX="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7490,11 +7230,11 @@ fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -$as_echo "$ac_ct_CXX" >&6; } + { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +echo "${ECHO_T}$ac_ct_CXX" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -7506,8 +7246,12 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ 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 CXX=$ac_ct_CXX @@ -7517,47 +7261,43 @@ fi fi fi # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 -set X $ac_compile -ac_compiler=$2 +echo "$as_me:$LINENO: checking for C++ compiler version" >&5 +ac_compiler=`set X $ac_compile; echo $2` { (ac_try="$ac_compiler --version >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } { (ac_try="$ac_compiler -v >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } { (ac_try="$ac_compiler -V >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } +{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } if test "${ac_cv_cxx_compiler_gnu+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -7583,21 +7323,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_compiler_gnu=no @@ -7607,19 +7346,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GXX=yes -else - GXX= -fi +{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } +GXX=`test $ac_compiler_gnu = yes && echo yes` ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -$as_echo_n "checking whether $CXX accepts -g... " >&6; } +{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } if test "${ac_cv_prog_cxx_g+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_save_cxx_werror_flag=$ac_cxx_werror_flag ac_cxx_werror_flag=yes @@ -7646,21 +7381,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_prog_cxx_g=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 CXXFLAGS="" @@ -7685,21 +7419,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then : else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cxx_werror_flag=$ac_save_cxx_werror_flag @@ -7725,21 +7458,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_prog_cxx_g=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -7754,8 +7486,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cxx_werror_flag=$ac_save_cxx_werror_flag fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -$as_echo "$ac_cv_prog_cxx_g" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS=$ac_save_CXXFLAGS elif test $ac_cv_prog_cxx_g = yes; then @@ -7782,11 +7514,11 @@ ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -$as_echo_n "checking how to run the C++ preprocessor... " >&6; } +{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 +echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } if test -z "$CXXCPP"; then if test "${ac_cv_prog_CXXCPP+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else # Double quotes because CXXCPP needs to be expanded for CXXCPP in "$CXX -E" "/lib/cpp" @@ -7818,21 +7550,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err }; then : else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. @@ -7856,14 +7587,13 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err @@ -7871,7 +7601,7 @@ $as_echo "$ac_try_echo") >&5 # Broken: success on invalid input. continue else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Passes both tests. @@ -7896,8 +7626,8 @@ fi else ac_cv_prog_CXXCPP=$CXXCPP fi -{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5 -$as_echo "$CXXCPP" >&6; } +{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 +echo "${ECHO_T}$CXXCPP" >&6; } ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes do @@ -7925,21 +7655,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err }; then : else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. @@ -7963,14 +7692,13 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err @@ -7978,7 +7706,7 @@ $as_echo "$ac_try_echo") >&5 # Broken: success on invalid input. continue else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Passes both tests. @@ -7994,13 +7722,11 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check + { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check +echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } + { (exit 1); exit 1; }; } fi ac_ext=c @@ -8018,15 +7744,15 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -$as_echo_n "checking how to run the C preprocessor... " >&6; } +{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then if test "${ac_cv_prog_CPP+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else # Double quotes because CPP needs to be expanded for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" @@ -8058,21 +7784,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then : else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. @@ -8096,14 +7821,13 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err @@ -8111,7 +7835,7 @@ $as_echo "$ac_try_echo") >&5 # Broken: success on invalid input. continue else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Passes both tests. @@ -8136,8 +7860,8 @@ fi else ac_cv_prog_CPP=$CPP fi -{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 -$as_echo "$CPP" >&6; } +{ echo "$as_me:$LINENO: result: $CPP" >&5 +echo "${ECHO_T}$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do @@ -8165,21 +7889,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then : else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. @@ -8203,14 +7926,13 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err @@ -8218,7 +7940,7 @@ $as_echo "$ac_try_echo") >&5 # Broken: success on invalid input. continue else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Passes both tests. @@ -8234,13 +7956,11 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check + { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } + { (exit 1); exit 1; }; } fi ac_ext=c @@ -8265,11 +7985,11 @@ fi for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -8287,21 +8007,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then eval "$as_ac_Header=yes" else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_Header=no" @@ -8309,15 +8028,12 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF fi @@ -8325,14 +8041,68 @@ fi done +{ echo "$as_me:$LINENO: checking for long" >&5 +echo $ECHO_N "checking for long... $ECHO_C" >&6; } +if test "${ac_cv_type_long+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +typedef long ac__type_new_; +int +main () +{ +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +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_compile") 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_objext; then + ac_cv_type_long=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_long=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5 +echo "${ECHO_T}$ac_cv_type_long" >&6; } + # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ $as_echo "$as_me:$LINENO: checking size of long" >&5 -$as_echo_n "checking size of long... " >&6; } +{ echo "$as_me:$LINENO: checking size of long" >&5 +echo $ECHO_N "checking size of long... $ECHO_C" >&6; } if test "${ac_cv_sizeof_long+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. @@ -8343,10 +8113,11 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; test_array [0] = 0 ; @@ -8359,14 +8130,13 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err @@ -8380,10 +8150,11 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -8396,21 +8167,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_hi=$ac_mid; break else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_lo=`expr $ac_mid + 1` @@ -8424,7 +8194,7 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF @@ -8434,10 +8204,11 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (long))) < 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; test_array [0] = 0 ; @@ -8450,14 +8221,13 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err @@ -8471,10 +8241,11 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; test_array [0] = 0 ; @@ -8487,21 +8258,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_lo=$ac_mid; break else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_hi=`expr '(' $ac_mid ')' - 1` @@ -8515,7 +8285,7 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_lo= ac_hi= @@ -8535,10 +8305,11 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -8551,21 +8322,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_hi=$ac_mid else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_lo=`expr '(' $ac_mid ')' + 1` @@ -8576,13 +8346,11 @@ done case $ac_lo in ?*) ac_cv_sizeof_long=$ac_lo;; '') if test "$ac_cv_type_long" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long) + { { echo "$as_me:$LINENO: error: cannot compute sizeof (long) See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute sizeof (long) +echo "$as_me: error: cannot compute sizeof (long) See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } + { (exit 77); exit 77; }; } else ac_cv_sizeof_long=0 fi ;; @@ -8595,8 +8363,9 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -static long int longval () { return (long int) (sizeof (long)); } -static unsigned long int ulongval () { return (long int) (sizeof (long)); } + typedef long ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } #include #include int @@ -8606,254 +8375,101 @@ main () FILE *f = fopen ("conftest.val", "w"); if (! f) return 1; - if (((long int) (sizeof (long))) < 0) + if (((long int) (sizeof (ac__type_sizeof_))) < 0) { long int i = longval (); - if (i != ((long int) (sizeof (long)))) + if (i != ((long int) (sizeof (ac__type_sizeof_)))) return 1; - fprintf (f, "%ld", i); + fprintf (f, "%ld\n", i); } else { unsigned long int i = ulongval (); - if (i != ((long int) (sizeof (long)))) + if (i != ((long int) (sizeof (ac__type_sizeof_)))) return 1; - fprintf (f, "%lu", i); + fprintf (f, "%lu\n", i); } - /* Do not output a trailing newline, as this causes \r\n confusion - on some platforms. */ return ferror (f) || fclose (f) != 0; ; return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sizeof_long=`cat conftest.val` -else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -if test "$ac_cv_type_long" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long) -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute sizeof (long) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } - else - ac_cv_sizeof_long=0 - fi -fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -rm -f conftest.val -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 -$as_echo "$ac_cv_sizeof_long" >&6; } - - - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_LONG $ac_cv_sizeof_long -_ACEOF - - -SIZEOF_LONG=$ac_cv_sizeof_long - - - { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 -$as_echo_n "checking whether byte ordering is bigendian... " >&6; } -if test "${ac_cv_c_bigendian+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_c_bigendian=unknown - # See if we're dealing with a universal compiler. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifndef __APPLE_CC__ - not a universal capable compiler - #endif - typedef int dummy; - -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - - # Check for potential -arch flags. It is not universal unless - # there are some -arch flags. Note that *ppc* also matches - # ppc64. This check is also rather less than ideal. - case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in #( - *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;; - esac -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if test $ac_cv_c_bigendian = unknown; then - # See if sys/param.h defines the BYTE_ORDER macro. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - #include - -int -main () -{ -#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ - && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ - && LITTLE_ENDIAN) - bogus endian macros - #endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - # It does; now see whether it defined to BIG_ENDIAN or not. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - #include - -int -main () -{ -#if BYTE_ORDER != BIG_ENDIAN - not big endian - #endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_c_bigendian=yes + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (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_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_long=`cat conftest.val` else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_c_bigendian=no +( exit $ac_status ) +if test "$ac_cv_type_long" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (long) +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (long) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_long=0 + fi +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +rm -f conftest.val fi +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 +echo "${ECHO_T}$ac_cv_sizeof_long" >&6; } -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -fi +cat >>confdefs.h <<_ACEOF +#define SIZEOF_LONG $ac_cv_sizeof_long +_ACEOF -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - if test $ac_cv_c_bigendian = unknown; then - # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). - cat >conftest.$ac_ext <<_ACEOF + +SIZEOF_LONG=$ac_cv_sizeof_long + +{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 +echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; } +if test "${ac_cv_c_bigendian+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # See if sys/param.h defines the BYTE_ORDER macro. +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include +#include int main () { -#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) - bogus endian macros - #endif +#if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \ + && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN) + bogus endian macros +#endif ; return 0; @@ -8865,33 +8481,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then - # It does; now see whether it defined to _BIG_ENDIAN or not. - cat >conftest.$ac_ext <<_ACEOF + # It does; now see whether it defined to BIG_ENDIAN or not. +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include +#include int main () { -#ifndef _BIG_ENDIAN - not big endian - #endif +#if BYTE_ORDER != BIG_ENDIAN + not big endian +#endif ; return 0; @@ -8903,21 +8519,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_cv_c_bigendian=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_c_bigendian=no @@ -8925,44 +8540,29 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - if test $ac_cv_c_bigendian = unknown; then - # Compile a test program. - if test "$cross_compiling" = yes; then - # Try to guess by grepping values from an object file. - cat >conftest.$ac_ext <<_ACEOF + # It does not; compile a test program. +if test "$cross_compiling" = yes; then + # try to guess the endianness by grepping values into an object file + ac_cv_c_bigendian=unknown + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -short int ascii_mm[] = - { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; - short int ascii_ii[] = - { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; - int use_ascii (int i) { - return ascii_mm[i] + ascii_ii[i]; - } - short int ebcdic_ii[] = - { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; - short int ebcdic_mm[] = - { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; - int use_ebcdic (int i) { - return ebcdic_mm[i] + ebcdic_ii[i]; - } - extern int foo; - +short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; +short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; +void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } +short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; +short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; +void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; } int main () { -return use_ascii (foo) == use_ebcdic (foo); + _ascii (); _ebcdic (); ; return 0; } @@ -8973,31 +8573,30 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then - if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then - ac_cv_c_bigendian=yes - fi - if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then - if test "$ac_cv_c_bigendian" = unknown; then - ac_cv_c_bigendian=no - else - # finding both strings is unlikely to happen, but who knows? - ac_cv_c_bigendian=unknown - fi - fi + if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then + ac_cv_c_bigendian=yes +fi +if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then + if test "$ac_cv_c_bigendian" = unknown; then + ac_cv_c_bigendian=no + else + # finding both strings is unlikely to happen, but who knows? + ac_cv_c_bigendian=unknown + fi +fi else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -9016,14 +8615,14 @@ int main () { - /* Are we little or big endian? From Harbison&Steele. */ - union - { - long int l; - char c[sizeof (long int)]; - } u; - u.l = 1; - return u.c[sizeof (long int) - 1] == 1; + /* Are we little or big endian? From Harbison&Steele. */ + union + { + long int l; + char c[sizeof (long int)]; + } u; + u.l = 1; + return u.c[sizeof (long int) - 1] == 1; ; return 0; @@ -9035,62 +8634,55 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' { (case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_bigendian=no else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_c_bigendian=yes fi -rm -rf conftest.dSYM rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 -$as_echo "$ac_cv_c_bigendian" >&6; } - case $ac_cv_c_bigendian in #( - yes) - cat >>confdefs.h <<\_ACEOF -#define WORDS_BIGENDIAN 1 -_ACEOF -;; #( - no) - ;; #( - universal) + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 +echo "${ECHO_T}$ac_cv_c_bigendian" >&6; } +case $ac_cv_c_bigendian in + yes) cat >>confdefs.h <<\_ACEOF -#define AC_APPLE_UNIVERSAL_BUILD 1 +#define WORDS_BIGENDIAN 1 _ACEOF - - ;; #( - *) - { { $as_echo "$as_me:$LINENO: error: unknown endianness - presetting ac_cv_c_bigendian=no (or yes) will help" >&5 -$as_echo "$as_me: error: unknown endianness - presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} + ;; + no) + ;; + *) + { { echo "$as_me:$LINENO: error: unknown endianness +presetting ac_cv_c_bigendian=no (or yes) will help" >&5 +echo "$as_me: error: unknown endianness +presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} { (exit 1); exit 1; }; } ;; - esac +esac WORDS_BIGENDIAN=$ac_cv_c_bigendian @@ -9102,10 +8694,10 @@ fi if test "$enable_largefile" != no; then - { $as_echo "$as_me:$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; } + { echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5 +echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6; } if test "${ac_cv_sys_largefile_CC+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_sys_largefile_CC=no if test "$GCC" != yes; then @@ -9142,21 +8734,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then break else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -9170,21 +8761,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_cv_sys_largefile_CC=' -n32'; break else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -9197,16 +8787,16 @@ rm -f core conftest.err conftest.$ac_objext rm -f conftest.$ac_ext fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5 -$as_echo "$ac_cv_sys_largefile_CC" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5 +echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6; } if test "$ac_cv_sys_largefile_CC" != no; then CC=$CC$ac_cv_sys_largefile_CC fi - { $as_echo "$as_me:$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; } + { echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6; } if test "${ac_cv_sys_file_offset_bits+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else while :; do cat >conftest.$ac_ext <<_ACEOF @@ -9238,21 +8828,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_cv_sys_file_offset_bits=no; break else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -9289,21 +8878,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_cv_sys_file_offset_bits=64; break else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -9314,8 +8902,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext break done fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5 -$as_echo "$ac_cv_sys_file_offset_bits" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5 +echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6; } case $ac_cv_sys_file_offset_bits in #( no | unknown) ;; *) @@ -9324,12 +8912,12 @@ cat >>confdefs.h <<_ACEOF _ACEOF ;; esac -rm -rf conftest* +rm -f conftest* if test $ac_cv_sys_file_offset_bits = unknown; then - { $as_echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5 -$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } + { echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5 +echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6; } if test "${ac_cv_sys_large_files+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else while :; do cat >conftest.$ac_ext <<_ACEOF @@ -9361,21 +8949,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_cv_sys_large_files=no; break else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -9412,21 +8999,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_cv_sys_large_files=1; break else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -9437,8 +9023,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext break done fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5 -$as_echo "$ac_cv_sys_large_files" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5 +echo "${ECHO_T}$ac_cv_sys_large_files" >&6; } case $ac_cv_sys_large_files in #( no | unknown) ;; *) @@ -9447,7 +9033,7 @@ cat >>confdefs.h <<_ACEOF _ACEOF ;; esac -rm -rf conftest* +rm -f conftest* fi fi @@ -9459,44 +9045,44 @@ if test -n "$ac_cv_sys_large_files" && test "$ac_cv_sys_large_files" != "no"; th fi -{ $as_echo "$as_me:$LINENO: checking whether to disable vba feature" >&5 -$as_echo_n "checking whether to disable vba feature... " >&6; } +{ echo "$as_me:$LINENO: checking whether to disable vba feature" >&5 +echo $ECHO_N "checking whether to disable vba feature... $ECHO_C" >&6; } if test -n "$enable_vba" && test "$enable_vba" = "no"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } ENABLE_VBA=NO else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } ENABLE_VBA=YES fi if test "$ENABLE_VBA" = "YES"; then - { $as_echo "$as_me:$LINENO: checking how to package the vba compatibility api" >&5 -$as_echo_n "checking how to package the vba compatibility api... " >&6; } + { echo "$as_me:$LINENO: checking how to package the vba compatibility api" >&5 +echo $ECHO_N "checking how to package the vba compatibility api... $ECHO_C" >&6; } if test -n "$with_vba_package_format"; then if test "$with_vba_package_format" = "extn"; then VBA_EXTENSION=YES - { $as_echo "$as_me:$LINENO: result: uno extension" >&5 -$as_echo "uno extension" >&6; } - { $as_echo "$as_me:$LINENO: WARNING: --with-vba-package-format=extn can cause problems" >&5 -$as_echo "$as_me: WARNING: --with-vba-package-format=extn can cause problems" >&2;} + { echo "$as_me:$LINENO: result: uno extension" >&5 +echo "${ECHO_T}uno extension" >&6; } + { echo "$as_me:$LINENO: WARNING: --with-vba-package-format=extn can cause problems" >&5 +echo "$as_me: WARNING: --with-vba-package-format=extn can cause problems" >&2;} else if test "$with_vba_package_format" = "builtin"; then VBA_EXTENSION=NO - { $as_echo "$as_me:$LINENO: result: build into installset" >&5 -$as_echo "build into installset" >&6; } + { echo "$as_me:$LINENO: result: build into installset" >&5 +echo "${ECHO_T}build into installset" >&6; } else - { { $as_echo "$as_me:$LINENO: error: unknown packaging method" >&5 -$as_echo "$as_me: error: unknown packaging method" >&2;} + { { echo "$as_me:$LINENO: error: unknown packaging method" >&5 +echo "$as_me: error: unknown packaging method" >&2;} { (exit 1); exit 1; }; } fi fi else VBA_EXTENSION=NO - { $as_echo "$as_me:$LINENO: result: defaulting to build into installset" >&5 -$as_echo "defaulting to build into installset" >&6; } + { echo "$as_me:$LINENO: result: defaulting to build into installset" >&5 +echo "${ECHO_T}defaulting to build into installset" >&6; } fi else VBA_EXTENSION=NO @@ -9507,17 +9093,17 @@ fi if test "$test_cups" = "yes" -a "$ENABLE_CUPS" = "TRUE" ; then if test "${ac_cv_header_cups_cups_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for cups/cups.h" >&5 -$as_echo_n "checking for cups/cups.h... " >&6; } + { echo "$as_me:$LINENO: checking for cups/cups.h" >&5 +echo $ECHO_N "checking for cups/cups.h... $ECHO_C" >&6; } if test "${ac_cv_header_cups_cups_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5 -$as_echo "$ac_cv_header_cups_cups_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5 +echo "${ECHO_T}$ac_cv_header_cups_cups_h" >&6; } else # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking cups/cups.h usability" >&5 -$as_echo_n "checking cups/cups.h usability... " >&6; } +{ echo "$as_me:$LINENO: checking cups/cups.h usability" >&5 +echo $ECHO_N "checking cups/cups.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -9533,33 +9119,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_header_compiler=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ $as_echo "$as_me:$LINENO: checking cups/cups.h presence" >&5 -$as_echo_n "checking cups/cups.h presence... " >&6; } +{ echo "$as_me:$LINENO: checking cups/cups.h presence" >&5 +echo $ECHO_N "checking cups/cups.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -9573,71 +9158,70 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: cups/cups.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: cups/cups.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: cups/cups.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: cups/cups.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: cups/cups.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: cups/cups.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: cups/cups.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: cups/cups.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: cups/cups.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: cups/cups.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: cups/cups.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: cups/cups.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: cups/cups.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: cups/cups.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&2;} ;; esac -{ $as_echo "$as_me:$LINENO: checking for cups/cups.h" >&5 -$as_echo_n "checking for cups/cups.h... " >&6; } +{ echo "$as_me:$LINENO: checking for cups/cups.h" >&5 +echo $ECHO_N "checking for cups/cups.h... $ECHO_C" >&6; } if test "${ac_cv_header_cups_cups_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_cups_cups_h=$ac_header_preproc fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5 -$as_echo "$ac_cv_header_cups_cups_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5 +echo "${ECHO_T}$ac_cv_header_cups_cups_h" >&6; } fi -if test "x$ac_cv_header_cups_cups_h" = x""yes; then +if test $ac_cv_header_cups_cups_h = yes; then : else - { { $as_echo "$as_me:$LINENO: error: cups/cups.h could not be found. libcupsys2-dev or cups???-devel missing?" >&5 -$as_echo "$as_me: error: cups/cups.h could not be found. libcupsys2-dev or cups???-devel missing?" >&2;} + { { echo "$as_me:$LINENO: error: cups/cups.h could not be found. libcupsys2-dev or cups???-devel missing?" >&5 +echo "$as_me: error: cups/cups.h could not be found. libcupsys2-dev or cups???-devel missing?" >&2;} { (exit 1); exit 1; }; } fi @@ -9645,24 +9229,24 @@ fi fi if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "GNU"; then - { $as_echo "$as_me:$LINENO: checking whether to enable pam support" >&5 -$as_echo_n "checking whether to enable pam support... " >&6; } + { echo "$as_me:$LINENO: checking whether to enable pam support" >&5 +echo $ECHO_N "checking whether to enable pam support... $ECHO_C" >&6; } if test -z "$enable_pam" || test "$enable_pam" != "no"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } PAM=YES if test "${ac_cv_header_security_pam_appl_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5 -$as_echo_n "checking for security/pam_appl.h... " >&6; } + { echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5 +echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6; } if test "${ac_cv_header_security_pam_appl_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5 -$as_echo "$ac_cv_header_security_pam_appl_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5 +echo "${ECHO_T}$ac_cv_header_security_pam_appl_h" >&6; } else # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking security/pam_appl.h usability" >&5 -$as_echo_n "checking security/pam_appl.h usability... " >&6; } +{ echo "$as_me:$LINENO: checking security/pam_appl.h usability" >&5 +echo $ECHO_N "checking security/pam_appl.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -9678,33 +9262,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_header_compiler=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ $as_echo "$as_me:$LINENO: checking security/pam_appl.h presence" >&5 -$as_echo_n "checking security/pam_appl.h presence... " >&6; } +{ echo "$as_me:$LINENO: checking security/pam_appl.h presence" >&5 +echo $ECHO_N "checking security/pam_appl.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -9718,86 +9301,85 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: security/pam_appl.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: security/pam_appl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: security/pam_appl.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: security/pam_appl.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: security/pam_appl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: security/pam_appl.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: security/pam_appl.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: security/pam_appl.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: security/pam_appl.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: security/pam_appl.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: security/pam_appl.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: security/pam_appl.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: security/pam_appl.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: security/pam_appl.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: security/pam_appl.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: security/pam_appl.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: security/pam_appl.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: security/pam_appl.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: security/pam_appl.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: security/pam_appl.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: security/pam_appl.h: in the future, the compiler will take precedence" >&2;} ;; esac -{ $as_echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5 -$as_echo_n "checking for security/pam_appl.h... " >&6; } +{ echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5 +echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6; } if test "${ac_cv_header_security_pam_appl_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_security_pam_appl_h=$ac_header_preproc fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5 -$as_echo "$ac_cv_header_security_pam_appl_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5 +echo "${ECHO_T}$ac_cv_header_security_pam_appl_h" >&6; } fi -if test "x$ac_cv_header_security_pam_appl_h" = x""yes; then +if test $ac_cv_header_security_pam_appl_h = yes; then : else - { { $as_echo "$as_me:$LINENO: error: pam_appl.h could not be found. libpam-dev or pam-devel missing?" >&5 -$as_echo "$as_me: error: pam_appl.h could not be found. libpam-dev or pam-devel missing?" >&2;} + { { echo "$as_me:$LINENO: error: pam_appl.h could not be found. libpam-dev or pam-devel missing?" >&5 +echo "$as_me: error: pam_appl.h could not be found. libpam-dev or pam-devel missing?" >&2;} { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:$LINENO: checking whether to link to libpam" >&5 -$as_echo_n "checking whether to link to libpam... " >&6; } + { echo "$as_me:$LINENO: checking whether to link to libpam" >&5 +echo $ECHO_N "checking whether to link to libpam... $ECHO_C" >&6; } if test -n "$enable_pam_link" -a "$enable_pam_link" != "no"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } PAM_LINK=YES -{ $as_echo "$as_me:$LINENO: checking for pam_start in -lpam" >&5 -$as_echo_n "checking for pam_start in -lpam... " >&6; } +{ echo "$as_me:$LINENO: checking for pam_start in -lpam" >&5 +echo $ECHO_N "checking for pam_start in -lpam... $ECHO_C" >&6; } if test "${ac_cv_lib_pam_pam_start+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lpam $LIBS" @@ -9829,37 +9411,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_pam_pam_start=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_pam_pam_start=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$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" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_pam_pam_start" >&5 +echo "${ECHO_T}$ac_cv_lib_pam_pam_start" >&6; } +if test $ac_cv_lib_pam_pam_start = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBPAM 1 _ACEOF @@ -9867,19 +9445,19 @@ _ACEOF LIBS="-lpam $LIBS" else - { { $as_echo "$as_me:$LINENO: error: libpam not found or functional" >&5 -$as_echo "$as_me: error: libpam not found or functional" >&2;} + { { echo "$as_me:$LINENO: error: libpam not found or functional" >&5 +echo "$as_me: error: libpam not found or functional" >&2;} { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:$LINENO: result: no, dynamically open it" >&5 -$as_echo "no, dynamically open it" >&6; } + { echo "$as_me:$LINENO: result: no, dynamically open it" >&5 +echo "${ECHO_T}no, dynamically open it" >&6; } PAM_LINK=NO fi else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } PAM=NO PAM_LINK=NO @@ -9890,11 +9468,11 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - { $as_echo "$as_me:$LINENO: checking how many arguments getspnam_r() takes" >&5 -$as_echo_n "checking how many arguments getspnam_r() takes... " >&6; } + { echo "$as_me:$LINENO: checking how many arguments getspnam_r() takes" >&5 +echo $ECHO_N "checking how many arguments getspnam_r() takes... $ECHO_C" >&6; } if test "${ac_cv_func_which_getspnam_r+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9938,21 +9516,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_cv_func_which_getspnam_r=no else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -9995,21 +9572,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_cv_func_which_getspnam_r=five else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -10054,21 +9630,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_cv_func_which_getspnam_r=four else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -10085,29 +9660,29 @@ fi case "$ac_cv_func_which_getspnam_r" in five) - { $as_echo "$as_me:$LINENO: result: five" >&5 -$as_echo "five" >&6; } + { echo "$as_me:$LINENO: result: five" >&5 +echo "${ECHO_T}five" >&6; } NEW_SHADOW_API=YES ;; four) - { $as_echo "$as_me:$LINENO: result: four" >&5 -$as_echo "four" >&6; } + { echo "$as_me:$LINENO: result: four" >&5 +echo "${ECHO_T}four" >&6; } ;; no) - { $as_echo "$as_me:$LINENO: result: cannot find function declaration in shadow.h" >&5 -$as_echo "cannot find function declaration in shadow.h" >&6; } + { echo "$as_me:$LINENO: result: cannot find function declaration in shadow.h" >&5 +echo "${ECHO_T}cannot find function declaration in shadow.h" >&6; } ;; unknown) - { $as_echo "$as_me:$LINENO: result: can't tell" >&5 -$as_echo "can't tell" >&6; } + { echo "$as_me:$LINENO: result: can't tell" >&5 +echo "${ECHO_T}can't tell" >&6; } ;; *) - { { $as_echo "$as_me:$LINENO: error: internal error" >&5 -$as_echo "$as_me: error: internal error" >&2;} + { { echo "$as_me:$LINENO: error: internal error" >&5 +echo "$as_me: error: internal error" >&2;} { (exit 1); exit 1; }; } ;; esac @@ -10127,17 +9702,17 @@ fi if test "$_os" = "Linux"; then - { $as_echo "$as_me:$LINENO: checking whether to link to libcrypt" >&5 -$as_echo_n "checking whether to link to libcrypt... " >&6; } + { echo "$as_me:$LINENO: checking whether to link to libcrypt" >&5 +echo $ECHO_N "checking whether to link to libcrypt... $ECHO_C" >&6; } if test -n "$enable_crypt_link" -a "$enable_crypt_link" != "no"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } CRYPT_LINK=YES -{ $as_echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5 -$as_echo_n "checking for crypt in -lcrypt... " >&6; } +{ echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5 +echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6; } if test "${ac_cv_lib_crypt_crypt+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lcrypt $LIBS" @@ -10169,37 +9744,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_crypt_crypt=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_crypt_crypt=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5 -$as_echo "$ac_cv_lib_crypt_crypt" >&6; } -if test "x$ac_cv_lib_crypt_crypt" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5 +echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6; } +if test $ac_cv_lib_crypt_crypt = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBCRYPT 1 _ACEOF @@ -10207,14 +9778,14 @@ _ACEOF LIBS="-lcrypt $LIBS" else - { { $as_echo "$as_me:$LINENO: error: libcrypt not found or functional" >&5 -$as_echo "$as_me: error: libcrypt not found or functional" >&2;} + { { echo "$as_me:$LINENO: error: libcrypt not found or functional" >&5 +echo "$as_me: error: libcrypt not found or functional" >&2;} { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:$LINENO: result: no, dynamically open it" >&5 -$as_echo "no, dynamically open it" >&6; } + { echo "$as_me:$LINENO: result: no, dynamically open it" >&5 +echo "${ECHO_T}no, dynamically open it" >&6; } CRYPT_LINK=NO fi fi @@ -10247,10 +9818,10 @@ if test -z "$CXX"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CXX+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CXX"; then ac_cv_prog_CXX="$CXX" # Let the user override the test. @@ -10263,7 +9834,7 @@ do 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_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -10274,11 +9845,11 @@ fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - { $as_echo "$as_me:$LINENO: result: $CXX" >&5 -$as_echo "$CXX" >&6; } + { echo "$as_me:$LINENO: result: $CXX" >&5 +echo "${ECHO_T}$CXX" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -10291,10 +9862,10 @@ if test -z "$CXX"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ 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_CXX+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$ac_ct_CXX"; then ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. @@ -10307,7 +9878,7 @@ do 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_CXX="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -10318,11 +9889,11 @@ fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -$as_echo "$ac_ct_CXX" >&6; } + { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +echo "${ECHO_T}$ac_ct_CXX" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -10334,8 +9905,12 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ 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 CXX=$ac_ct_CXX @@ -10345,47 +9920,43 @@ fi fi fi # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 -set X $ac_compile -ac_compiler=$2 +echo "$as_me:$LINENO: checking for C++ compiler version" >&5 +ac_compiler=`set X $ac_compile; echo $2` { (ac_try="$ac_compiler --version >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } { (ac_try="$ac_compiler -v >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } { (ac_try="$ac_compiler -V >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } +{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } if test "${ac_cv_cxx_compiler_gnu+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -10411,21 +9982,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_compiler_gnu=no @@ -10435,19 +10005,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GXX=yes -else - GXX= -fi +{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } +GXX=`test $ac_compiler_gnu = yes && echo yes` ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -$as_echo_n "checking whether $CXX accepts -g... " >&6; } +{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } if test "${ac_cv_prog_cxx_g+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_save_cxx_werror_flag=$ac_cxx_werror_flag ac_cxx_werror_flag=yes @@ -10474,21 +10040,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_prog_cxx_g=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 CXXFLAGS="" @@ -10513,21 +10078,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then : else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cxx_werror_flag=$ac_save_cxx_werror_flag @@ -10553,21 +10117,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_prog_cxx_g=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -10582,8 +10145,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cxx_werror_flag=$ac_save_cxx_werror_flag fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -$as_echo "$ac_cv_prog_cxx_g" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS=$ac_save_CXXFLAGS elif test $ac_cv_prog_cxx_g = yes; then @@ -10608,28 +10171,26 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi if test "$GXX" = "yes"; then - { $as_echo "$as_me:$LINENO: checking the GNU C++ compiler version" >&5 -$as_echo_n "checking the GNU C++ compiler version... " >&6; } + { echo "$as_me:$LINENO: checking the GNU C++ compiler version" >&5 +echo $ECHO_N "checking the GNU C++ compiler version... $ECHO_C" >&6; } _gpp_version=`$CXX -dumpversion` _gpp_major=`echo $_gpp_version | $AWK -F. '{ print \$1 }'` _gpp_minor=`echo $_gpp_version | $AWK -F. '{ print \$2 }'` - { $as_echo "$as_me:$LINENO: result: checked (g++ $_gpp_version)" >&5 -$as_echo "checked (g++ $_gpp_version)" >&6; } + { echo "$as_me:$LINENO: result: checked (g++ $_gpp_version)" >&5 +echo "${ECHO_T}checked (g++ $_gpp_version)" >&6; } if test "$_gpp_major" = "3"; then if test "$_gpp_minor" = "4"; then - { $as_echo "$as_me:$LINENO: checking whether $CXX has the enum bug" >&5 -$as_echo_n "checking whether $CXX has the enum bug... " >&6; } + { echo "$as_me:$LINENO: checking whether $CXX has the enum bug" >&5 +echo $ECHO_N "checking whether $CXX has the enum bug... $ECHO_C" >&6; } if test "$cross_compiling" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot run test program while cross compiling +echo "$as_me: error: cannot run test program while cross compiling See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } + { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -10666,35 +10227,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' { (case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { { $as_echo "$as_me:$LINENO: error: your version of the GNU C++ compile has a bug which prevents OpenOffice.org from being compiled correctly - please check http://gcc.gnu.org/ml/gcc-patches/2004-07/msg00968.html for details." >&5 -$as_echo "$as_me: error: your version of the GNU C++ compile has a bug which prevents OpenOffice.org from being compiled correctly - please check http://gcc.gnu.org/ml/gcc-patches/2004-07/msg00968.html for details." >&2;} + { { echo "$as_me:$LINENO: error: your version of the GNU C++ compile has a bug which prevents OpenOffice.org from being compiled correctly - please check http://gcc.gnu.org/ml/gcc-patches/2004-07/msg00968.html for details." >&5 +echo "$as_me: error: your version of the GNU C++ compile has a bug which prevents OpenOffice.org from being compiled correctly - please check http://gcc.gnu.org/ml/gcc-patches/2004-07/msg00968.html for details." >&2;} { (exit 1); exit 1; }; } else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } +{ echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -rm -rf conftest.dSYM rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi @@ -10706,8 +10264,8 @@ fi # Removed the special FreeBSD treatment. The problem was that with_gxx_include_path # often contains an i386 which is expanded as a macro. Solved in stlport. if test "$GXX" = "yes"; then - { $as_echo "$as_me:$LINENO: checking for g++ include path" >&5 -$as_echo_n "checking for g++ include path... " >&6; } + { echo "$as_me:$LINENO: checking for g++ include path" >&5 +echo $ECHO_N "checking for g++ include path... $ECHO_C" >&6; } if test -z "$with_gxx_include_path"; then with_gxx_include_path=`echo "#include " | $CXX -E -xc++ - | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1` if test "$with_gxx_include_path" = "/usr/libexec/(null)/include"; then @@ -10717,22 +10275,26 @@ $as_echo_n "checking for g++ include path... " >&6; } with_gxx_include_path=`cygpath -d "$with_gxx_include_path"` with_gxx_include_path=`cygpath -u "$with_gxx_include_path"` fi + if echo $with_gxx_include_path | grep -q linux; then + # workaround for Mandriva + with_gxx_include_path=`cd $with_gxx_include_path && pwd` + fi fi fi if test -z "$with_gxx_include_path"; then with_gxx_include_path="NO_GXX_INCLUDE" - { $as_echo "$as_me:$LINENO: result: no g++ includes" >&5 -$as_echo "no g++ includes" >&6; } + { echo "$as_me:$LINENO: result: no g++ includes" >&5 +echo "${ECHO_T}no g++ includes" >&6; } else - { $as_echo "$as_me:$LINENO: result: $with_gxx_include_path" >&5 -$as_echo "$with_gxx_include_path" >&6; } + { echo "$as_me:$LINENO: result: $with_gxx_include_path" >&5 +echo "${ECHO_T}$with_gxx_include_path" >&6; } fi GXX_INCLUDE_PATH="$with_gxx_include_path" if test "$WITH_MINGWIN" = "yes"; then - { $as_echo "$as_me:$LINENO: checking for mingwin runtime include path" >&5 -$as_echo_n "checking for mingwin runtime include path... " >&6; } + { echo "$as_me:$LINENO: checking for mingwin runtime include path" >&5 +echo $ECHO_N "checking for mingwin runtime include path... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF #include #include @@ -10750,11 +10312,11 @@ _ACEOF fi if test -z "$_mingw_lib_include_path"; then _mingw_lib_include_path="NO_LIB_INCLUDE" - { $as_echo "$as_me:$LINENO: result: no mingwin runtime includes" >&5 -$as_echo "no mingwin runtime includes" >&6; } + { echo "$as_me:$LINENO: result: no mingwin runtime includes" >&5 +echo "${ECHO_T}no mingwin runtime includes" >&6; } else - { $as_echo "$as_me:$LINENO: result: $_mingw_lib_include_path" >&5 -$as_echo "$_mingw_lib_include_path" >&6; } + { echo "$as_me:$LINENO: result: $_mingw_lib_include_path" >&5 +echo "${ECHO_T}$_mingw_lib_include_path" >&6; } fi MINGW_LIB_INCLUDE_PATH="$_mingw_lib_include_path" @@ -10762,66 +10324,66 @@ fi if test "$_os" = "SunOS"; then if test "$CC" = "cc"; then - { $as_echo "$as_me:$LINENO: checking SunStudio C++ Compiler" >&5 -$as_echo_n "checking SunStudio C++ Compiler... " >&6; } + { echo "$as_me:$LINENO: checking SunStudio C++ Compiler" >&5 +echo $ECHO_N "checking SunStudio C++ Compiler... $ECHO_C" >&6; } if test "$CXX" != "CC"; then - { $as_echo "$as_me:$LINENO: WARNING: SunStudio C++ was not found" >&5 -$as_echo "$as_me: WARNING: SunStudio C++ was not found" >&2;} + { echo "$as_me:$LINENO: WARNING: SunStudio C++ was not found" >&5 +echo "$as_me: WARNING: SunStudio C++ was not found" >&2;} echo "SunStudio C++ was not found" >> warn else - { $as_echo "$as_me:$LINENO: result: checked" >&5 -$as_echo "checked" >&6; } + { echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6; } fi fi fi if test "$_os" = "Darwin"; then if test "$CC" = "cc"; then - { $as_echo "$as_me:$LINENO: checking Macosx c++ Compiler" >&5 -$as_echo_n "checking Macosx c++ Compiler... " >&6; } + { echo "$as_me:$LINENO: checking Macosx c++ Compiler" >&5 +echo $ECHO_N "checking Macosx c++ Compiler... $ECHO_C" >&6; } if test "$CXX" != "c++"; then - { $as_echo "$as_me:$LINENO: WARNING: Macosx C++ was not found" >&5 -$as_echo "$as_me: WARNING: Macosx C++ was not found" >&2;} + { echo "$as_me:$LINENO: WARNING: Macosx C++ was not found" >&5 +echo "$as_me: WARNING: Macosx C++ was not found" >&2;} echo "Macosx C++ was not found" >> warn else - { $as_echo "$as_me:$LINENO: result: checked" >&5 -$as_echo "checked" >&6; } + { echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6; } fi fi fi if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then if test "$CC" = "cc"; then - { $as_echo "$as_me:$LINENO: checking SGI MIPSpro C++ Compiler" >&5 -$as_echo_n "checking SGI MIPSpro C++ Compiler... " >&6; } + { echo "$as_me:$LINENO: checking SGI MIPSpro C++ Compiler" >&5 +echo $ECHO_N "checking SGI MIPSpro C++ Compiler... $ECHO_C" >&6; } if test "$CXX" != "CC"; then - { $as_echo "$as_me:$LINENO: WARNING: SGI MIPSpro C++ was not found" >&5 -$as_echo "$as_me: WARNING: SGI MIPSpro C++ was not found" >&2;} + { echo "$as_me:$LINENO: WARNING: SGI MIPSpro C++ was not found" >&5 +echo "$as_me: WARNING: SGI MIPSpro C++ was not found" >&2;} echo "SGI MIPSpro C++ was not found" >> warn else - { $as_echo "$as_me:$LINENO: result: checked" >&5 -$as_echo "checked" >&6; } + { echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6; } fi fi fi if test "$_os" = "OSF1"; then - { $as_echo "$as_me:$LINENO: checking Compaq C++ compiler version" >&5 -$as_echo_n "checking Compaq C++ compiler version... " >&6; } + { echo "$as_me:$LINENO: checking Compaq C++ compiler version" >&5 +echo $ECHO_N "checking Compaq C++ compiler version... $ECHO_C" >&6; } _compaqcxx_version=`$CXX -V 2>&1 | $AWK '{ print $3 }'` _compaqcxx_major=`echo $_compaqcxx_version | $AWK -F. '{ print $1 }'` if test "$_compaqcxx_major" != "V6"; then - { $as_echo "$as_me:$LINENO: WARNING: found version \"$_compaqc_version\", use version 6 of the Compaq C++ compiler" >&5 -$as_echo "$as_me: WARNING: found version \"$_compaqc_version\", use version 6 of the Compaq C++ compiler" >&2;} + { echo "$as_me:$LINENO: WARNING: found version \"$_compaqc_version\", use version 6 of the Compaq C++ compiler" >&5 +echo "$as_me: WARNING: found version \"$_compaqc_version\", use version 6 of the Compaq C++ compiler" >&2;} echo "found version $_compaqc_version, use version 6 of the Compaq C++ compiler" >> warn else - { $as_echo "$as_me:$LINENO: result: checked" >&5 -$as_echo "checked" >&6; } + { echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6; } fi fi if test "$_os" = "SunOS"; then _temp=`showrev -p | $AWK -F" " '{ print $2 }'` if test "$_os_release" = "7"; then - { $as_echo "$as_me:$LINENO: checking for patch 106327-06 or greater" >&5 -$as_echo_n "checking for patch 106327-06 or greater... " >&6; } + { echo "$as_me:$LINENO: checking for patch 106327-06 or greater" >&5 +echo $ECHO_N "checking for patch 106327-06 or greater... $ECHO_C" >&6; } _patch=`echo $_temp | $AWK '/106327-06/ { print "found" }'` _patch="false" for i in $_temp @@ -10835,15 +10397,15 @@ $as_echo_n "checking for patch 106327-06 or greater... " >&6; } fi done if test "$_patch" = "found"; then - { $as_echo "$as_me:$LINENO: result: found" >&5 -$as_echo "found" >&6; } + { echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6; } else - { $as_echo "$as_me:$LINENO: WARNING: patch 106327-06 not found, please install compiler patch 106327-06 or greater" >&5 -$as_echo "$as_me: WARNING: patch 106327-06 not found, please install compiler patch 106327-06 or greater" >&2;} + { echo "$as_me:$LINENO: WARNING: patch 106327-06 not found, please install compiler patch 106327-06 or greater" >&5 +echo "$as_me: WARNING: patch 106327-06 not found, please install compiler patch 106327-06 or greater" >&2;} echo "patch 106327-06 not found, please install compiler patch 106327-06 or greater" >> warn fi - { $as_echo "$as_me:$LINENO: checking for patch 106950-11 or greater" >&5 -$as_echo_n "checking for patch 106950-11 or greater... " >&6; } + { echo "$as_me:$LINENO: checking for patch 106950-11 or greater" >&5 +echo $ECHO_N "checking for patch 106950-11 or greater... $ECHO_C" >&6; } _patch=`echo $_temp | $AWK '/106950-11/ { print "found" }'` _patch="false" for i in $_temp @@ -10857,17 +10419,17 @@ $as_echo_n "checking for patch 106950-11 or greater... " >&6; } fi done if test "$_patch" = "found"; then - { $as_echo "$as_me:$LINENO: result: found" >&5 -$as_echo "found" >&6; } + { echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6; } else - { $as_echo "$as_me:$LINENO: WARNING: patch 106950-11 not found, please install linker patch 106950-11 or greater" >&5 -$as_echo "$as_me: WARNING: patch 106950-11 not found, please install linker patch 106950-11 or greater" >&2;} + { echo "$as_me:$LINENO: WARNING: patch 106950-11 not found, please install linker patch 106950-11 or greater" >&5 +echo "$as_me: WARNING: patch 106950-11 not found, please install linker patch 106950-11 or greater" >&2;} echo "patch 106950-11 not found, please install linker patch 106950-11 or greater" >> warn fi else if test "$_os_release" = "6"; then - { $as_echo "$as_me:$LINENO: checking for patch 105591-09 or greater" >&5 -$as_echo_n "checking for patch 105591-09 or greater... " >&6; } + { echo "$as_me:$LINENO: checking for patch 105591-09 or greater" >&5 +echo $ECHO_N "checking for patch 105591-09 or greater... $ECHO_C" >&6; } _patch=`echo $_temp | $AWK '/105591-09/ { print "found" }'` _patch="false" for i in $_temp @@ -10881,15 +10443,15 @@ $as_echo_n "checking for patch 105591-09 or greater... " >&6; } fi done if test "$_patch" = "found"; then - { $as_echo "$as_me:$LINENO: result: found" >&5 -$as_echo "found" >&6; } + { echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6; } else - { $as_echo "$as_me:$LINENO: WARNING: patch 105591-09 not found, please install compiler patch 105591-09 or greater" >&5 -$as_echo "$as_me: WARNING: patch 105591-09 not found, please install compiler patch 105591-09 or greater" >&2;} + { echo "$as_me:$LINENO: WARNING: patch 105591-09 not found, please install compiler patch 105591-09 or greater" >&5 +echo "$as_me: WARNING: patch 105591-09 not found, please install compiler patch 105591-09 or greater" >&2;} echo "patch 105591-09 not found, please install compiler patch 105591-09 or greater" >> warn fi - { $as_echo "$as_me:$LINENO: checking for patch 107733-08 or greater" >&5 -$as_echo_n "checking for patch 107733-08 or greater... " >&6; } + { echo "$as_me:$LINENO: checking for patch 107733-08 or greater" >&5 +echo $ECHO_N "checking for patch 107733-08 or greater... $ECHO_C" >&6; } _patch=`echo $_temp | $AWK '/107733-08/ { print "found" }'` _patch="false" for i in $_temp @@ -10903,11 +10465,11 @@ $as_echo_n "checking for patch 107733-08 or greater... " >&6; } fi done if test "$_patch" = "found"; then - { $as_echo "$as_me:$LINENO: result: found" >&5 -$as_echo "found" >&6; } + { echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6; } else - { $as_echo "$as_me:$LINENO: WARNING: patch 107733-06 not found, please install linker patch 107733-08 or greater" >&5 -$as_echo "$as_me: WARNING: patch 107733-06 not found, please install linker patch 107733-08 or greater" >&2;} + { echo "$as_me:$LINENO: WARNING: patch 107733-06 not found, please install linker patch 107733-08 or greater" >&5 +echo "$as_me: WARNING: patch 107733-06 not found, please install linker patch 107733-08 or greater" >&2;} echo "patch 107733-06 not found, please install linker patch 107733-08 or greater" >> warn fi fi @@ -10916,25 +10478,25 @@ fi if test -n "$enable_sgistl" && "$enable_sgistl" != "no"; then if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then - { $as_echo "$as_me:$LINENO: checking for SGI STL" >&5 -$as_echo_n "checking for SGI STL... " >&6; } + { echo "$as_me:$LINENO: checking for SGI STL" >&5 +echo $ECHO_N "checking for SGI STL... $ECHO_C" >&6; } if test -d /usr/include/CC ; then - { $as_echo "$as_me:$LINENO: result: yes." >&5 -$as_echo "yes." >&6; } + { echo "$as_me:$LINENO: result: yes." >&5 +echo "${ECHO_T}yes." >&6; } else - { $as_echo "$as_me:$LINENO: result: not found." >&5 -$as_echo "not found." >&6; } + { echo "$as_me:$LINENO: result: not found." >&5 +echo "${ECHO_T}not found." >&6; } fi else - { { $as_echo "$as_me:$LINENO: error: Option --enable-sgistl is only valid for IRIX" >&5 -$as_echo "$as_me: error: Option --enable-sgistl is only valid for IRIX" >&2;} + { { echo "$as_me:$LINENO: error: Option --enable-sgistl is only valid for IRIX" >&5 +echo "$as_me: error: Option --enable-sgistl is only valid for IRIX" >&2;} { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:$LINENO: checking what the default STL should be" >&5 -$as_echo_n "checking what the default STL should be... " >&6; } + { echo "$as_me:$LINENO: checking what the default STL should be" >&5 +echo $ECHO_N "checking what the default STL should be... $ECHO_C" >&6; } DEFAULT_TO_STLPORT="no" if test "$_os" = "Linux"; then case "$build_cpu" in @@ -10955,35 +10517,35 @@ $as_echo_n "checking what the default STL should be... " >&6; } DEFAULT_TO_STLPORT="yes" fi if test "$DEFAULT_TO_STLPORT" = "yes"; then - { $as_echo "$as_me:$LINENO: result: stlport" >&5 -$as_echo "stlport" >&6; } + { echo "$as_me:$LINENO: result: stlport" >&5 +echo "${ECHO_T}stlport" >&6; } else - { $as_echo "$as_me:$LINENO: result: system" >&5 -$as_echo "system" >&6; } + { echo "$as_me:$LINENO: result: system" >&5 +echo "${ECHO_T}system" >&6; } fi if test "$WITH_STLPORT" = "auto"; then WITH_STLPORT=$DEFAULT_TO_STLPORT fi - { $as_echo "$as_me:$LINENO: checking for STL providing headers" >&5 -$as_echo_n "checking for STL providing headers... " >&6; } + { echo "$as_me:$LINENO: checking for STL providing headers" >&5 +echo $ECHO_N "checking for STL providing headers... $ECHO_C" >&6; } STLPORT4="" USE_SYSTEM_STL="" if test "$WITH_STLPORT" = "yes"; then - { $as_echo "$as_me:$LINENO: result: using internal stlport." >&5 -$as_echo "using internal stlport." >&6; } + { echo "$as_me:$LINENO: result: using internal stlport." >&5 +echo "${ECHO_T}using internal stlport." >&6; } if test "$DEFAULT_TO_STLPORT" != "yes"; then - { $as_echo "$as_me:$LINENO: WARNING: using stlport. Warning, breaks your ABI compatability!" >&5 -$as_echo "$as_me: WARNING: using stlport. Warning, breaks your ABI compatability!" >&2;} + { echo "$as_me:$LINENO: WARNING: using stlport. Warning, breaks your ABI compatability!" >&5 +echo "$as_me: WARNING: using stlport. Warning, breaks your ABI compatability!" >&2;} echo "using stlport. Warning, breaks your ABI compatability!" >>warn fi elif test "$WITH_STLPORT" = "no"; then - { $as_echo "$as_me:$LINENO: result: using system STL" >&5 -$as_echo "using system STL" >&6; } + { echo "$as_me:$LINENO: result: using system STL" >&5 +echo "${ECHO_T}using system STL" >&6; } USE_SYSTEM_STL="YES" if test "$DEFAULT_TO_STLPORT" != "no"; then - { $as_echo "$as_me:$LINENO: WARNING: using system STL. Warning, breaks your ABI compatability!" >&5 -$as_echo "$as_me: WARNING: using system STL. Warning, breaks your ABI compatability!" >&2;} + { echo "$as_me:$LINENO: WARNING: using system STL. Warning, breaks your ABI compatability!" >&5 +echo "$as_me: WARNING: using system STL. Warning, breaks your ABI compatability!" >&2;} echo "using system STL. Warning, breaks your ABI compatability!" >>warn fi else @@ -11002,105 +10564,104 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then - { $as_echo "$as_me:$LINENO: result: checked." >&5 -$as_echo "checked." >&6; } + { echo "$as_me:$LINENO: result: checked." >&5 +echo "${ECHO_T}checked." >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { { $as_echo "$as_me:$LINENO: error: STLport headers not found." >&5 -$as_echo "$as_me: error: STLport headers not found." >&2;} + { { echo "$as_me:$LINENO: error: STLport headers not found." >&5 +echo "$as_me: error: STLport headers not found." >&2;} { (exit 1); exit 1; }; } fi rm -f conftest.err conftest.$ac_ext else if test -f "$STLPORT4/stlport/hash_map"; then - { $as_echo "$as_me:$LINENO: result: checked." >&5 -$as_echo "checked." >&6; } + { echo "$as_me:$LINENO: result: checked." >&5 +echo "${ECHO_T}checked." >&6; } else - { { $as_echo "$as_me:$LINENO: error: STLport headers not found." >&5 -$as_echo "$as_me: error: STLport headers not found." >&2;} + { { echo "$as_me:$LINENO: error: STLport headers not found." >&5 +echo "$as_me: error: STLport headers not found." >&2;} { (exit 1); exit 1; }; } fi fi if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then - { $as_echo "$as_me:$LINENO: checking for STLport libraries" >&5 -$as_echo_n "checking for STLport libraries... " >&6; } + { echo "$as_me:$LINENO: checking for STLport libraries" >&5 +echo $ECHO_N "checking for STLport libraries... $ECHO_C" >&6; } if test "$_os" = "SunOS"; then if test -f "$STLPORT4/lib/libstlport_sunpro.so"; then - { $as_echo "$as_me:$LINENO: result: checked" >&5 -$as_echo "checked" >&6; } + { echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6; } elif test -f "$STLPORT4/lib/libstlport.so"; then - { $as_echo "$as_me:$LINENO: result: checked" >&5 -$as_echo "checked" >&6; } + { echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6; } STLPORT_VER=500 else - { { $as_echo "$as_me:$LINENO: error: STLport libraries not found" >&5 -$as_echo "$as_me: error: STLport libraries not found" >&2;} + { { echo "$as_me:$LINENO: error: STLport libraries not found" >&5 +echo "$as_me: error: STLport libraries not found" >&2;} { (exit 1); exit 1; }; } fi elif test "$_os" = "Darwin"; then if test -f "$STLPORT4/lib/libstlport_gcc.dylib"; then - { $as_echo "$as_me:$LINENO: result: checked" >&5 -$as_echo "checked" >&6; } + { echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6; } elif test -f "$STLPORT4/lib/libstlport.dylib"; then - { $as_echo "$as_me:$LINENO: result: checked" >&5 -$as_echo "checked" >&6; } + { echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6; } STLPORT_VER=500 else - { { $as_echo "$as_me:$LINENO: error: STLport libraries not found" >&5 -$as_echo "$as_me: error: STLport libraries not found" >&2;} + { { echo "$as_me:$LINENO: error: STLport libraries not found" >&5 +echo "$as_me: error: STLport libraries not found" >&2;} { (exit 1); exit 1; }; } fi elif test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then if test -f "$STLPORT4/lib/libstlport_mipspro_41.so"; then - { $as_echo "$as_me:$LINENO: result: checked" >&5 -$as_echo "checked" >&6; } + { echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6; } else if test -f "$STLPORT4/lib/libstlport_gcc.so"; then - { $as_echo "$as_me:$LINENO: result: checked" >&5 -$as_echo "checked" >&6; } + { echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6; } elif test -f "$STLPORT4/lib/libstlport.so"; then - { $as_echo "$as_me:$LINENO: result: checked" >&5 -$as_echo "checked" >&6; } + { echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6; } STLPORT_VER=500 else - { { $as_echo "$as_me:$LINENO: error: STLport libraries not found" >&5 -$as_echo "$as_me: error: STLport libraries not found" >&2;} + { { echo "$as_me:$LINENO: error: STLport libraries not found" >&5 +echo "$as_me: error: STLport libraries not found" >&2;} { (exit 1); exit 1; }; } fi fi else if test -f "$STLPORT4/lib/libstlport_gcc.so"; then - { $as_echo "$as_me:$LINENO: result: checked" >&5 -$as_echo "checked" >&6; } + { echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6; } elif test -f "$STLPORT4/lib/libstlport.so"; then - { $as_echo "$as_me:$LINENO: result: checked" >&5 -$as_echo "checked" >&6; } + { echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6; } STLPORT_VER=500 else - { { $as_echo "$as_me:$LINENO: error: STLport libraries not found" >&5 -$as_echo "$as_me: error: STLport libraries not found" >&2;} + { { echo "$as_me:$LINENO: error: STLport libraries not found" >&5 +echo "$as_me: error: STLport libraries not found" >&2;} { (exit 1); exit 1; }; } fi fi fi if test "$DEFAULT_TO_STLPORT" != "yes"; then - { $as_echo "$as_me:$LINENO: WARNING: using stlport. Warning, breaks your ABI compatability!" >&5 -$as_echo "$as_me: WARNING: using stlport. Warning, breaks your ABI compatability!" >&2;} + { echo "$as_me:$LINENO: WARNING: using stlport. Warning, breaks your ABI compatability!" >&5 +echo "$as_me: WARNING: using stlport. Warning, breaks your ABI compatability!" >&2;} echo "using stlport. Warning, breaks your ABI compatability!" >>warn fi fi @@ -11117,8 +10678,8 @@ fi if test "$GCC" = "yes"; then - { $as_echo "$as_me:$LINENO: checking whether $CC supports -fvisibility=hidden" >&5 -$as_echo_n "checking whether $CC supports -fvisibility=hidden... " >&6; } + { echo "$as_me:$LINENO: checking whether $CC supports -fvisibility=hidden" >&5 +echo $ECHO_N "checking whether $CC supports -fvisibility=hidden... $ECHO_C" >&6; } save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -fvisibility=hidden" cat >conftest.$ac_ext <<_ACEOF @@ -11142,45 +10703,41 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then HAVE_GCC_VISIBILITY_FEATURE=TRUE else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$save_CFLAGS if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi fi if test "$USE_SYSTEM_STL" = "YES"; then - { $as_echo "$as_me:$LINENO: checking if hash_map will be in __gnu_cxx namespace" >&5 -$as_echo_n "checking if hash_map will be in __gnu_cxx namespace... " >&6; } + { echo "$as_me:$LINENO: checking if hash_map will be in __gnu_cxx namespace" >&5 +echo $ECHO_N "checking if hash_map will be in __gnu_cxx namespace... $ECHO_C" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -11212,21 +10769,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_cxx_have_ext_hash_map=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_cxx_have_ext_hash_map=no @@ -11235,17 +10791,17 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test "$ac_cv_cxx_have_ext_hash_map" = "no"; then - { { $as_echo "$as_me:$LINENO: error: Can't find hash_map. Try with --with-stlport" >&5 -$as_echo "$as_me: error: Can't find hash_map. Try with --with-stlport" >&2;} + { { echo "$as_me:$LINENO: error: Can't find hash_map. Try with --with-stlport" >&5 +echo "$as_me: error: Can't find hash_map. Try with --with-stlport" >&2;} { (exit 1); exit 1; }; } else - { $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_have_ext_hash_map" >&5 -$as_echo "$ac_cv_cxx_have_ext_hash_map" >&6; } + { echo "$as_me:$LINENO: result: $ac_cv_cxx_have_ext_hash_map" >&5 +echo "${ECHO_T}$ac_cv_cxx_have_ext_hash_map" >&6; } fi if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then - { $as_echo "$as_me:$LINENO: checking if STL headers are visibility safe" >&5 -$as_echo_n "checking if STL headers are visibility safe... " >&6; } + { echo "$as_me:$LINENO: checking if STL headers are visibility safe" >&5 +echo $ECHO_N "checking if STL headers are visibility safe... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -11264,11 +10820,11 @@ else fi rm -f conftest* - { $as_echo "$as_me:$LINENO: result: $stlvisok" >&5 -$as_echo "$stlvisok" >&6; } + { echo "$as_me:$LINENO: result: $stlvisok" >&5 +echo "${ECHO_T}$stlvisok" >&6; } if test "$stlvisok" = "no"; then - { $as_echo "$as_me:$LINENO: WARNING: Your gcc STL headers are not visibility safe. Disabling visibility" >&5 -$as_echo "$as_me: WARNING: Your gcc STL headers are not visibility safe. Disabling visibility" >&2;} + { echo "$as_me:$LINENO: WARNING: Your gcc STL headers are not visibility safe. Disabling visibility" >&5 +echo "$as_me: WARNING: Your gcc STL headers are not visibility safe. Disabling visibility" >&2;} echo "Your gcc STL headers are not visibility safe. Disabling visibility" >> warn unset HAVE_GCC_VISIBILITY_FEATURE fi @@ -11278,8 +10834,8 @@ $as_echo "$as_me: WARNING: Your gcc STL headers are not visibility safe. Disabli sharedlink_ldflags_save=$LDFLAGS LDFLAGS="$LDFLAGS -fvisibility-inlines-hidden -fpic -shared" - { $as_echo "$as_me:$LINENO: checking if gcc is -fvisibility-inlines-hidden safe with STL headers" >&5 -$as_echo_n "checking if gcc is -fvisibility-inlines-hidden safe with STL headers... " >&6; } + { echo "$as_me:$LINENO: checking if gcc is -fvisibility-inlines-hidden safe with STL headers" >&5 +echo $ECHO_N "checking if gcc is -fvisibility-inlines-hidden safe with STL headers... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -11303,38 +10859,34 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then $EGREP -q unresolvable conftest.err; if test $? -eq 0; then gccvisok=no; else gccvisok=yes; fi else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 gccvisok=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext - { $as_echo "$as_me:$LINENO: result: $gccvisok" >&5 -$as_echo "$gccvisok" >&6; } + { echo "$as_me:$LINENO: result: $gccvisok" >&5 +echo "${ECHO_T}$gccvisok" >&6; } if test "$gccvisok" = "no"; then - { $as_echo "$as_me:$LINENO: WARNING: Your gcc is not -fvisibility-inlines-hidden safe. Disabling visibility" >&5 -$as_echo "$as_me: WARNING: Your gcc is not -fvisibility-inlines-hidden safe. Disabling visibility" >&2;} + { echo "$as_me:$LINENO: WARNING: Your gcc is not -fvisibility-inlines-hidden safe. Disabling visibility" >&5 +echo "$as_me: WARNING: Your gcc is not -fvisibility-inlines-hidden safe. Disabling visibility" >&2;} echo "Your gcc is not -fvisibility-inlines-hidden safe. Disabling visibility" >> warn unset HAVE_GCC_VISIBILITY_FEATURE fi @@ -11343,8 +10895,8 @@ $as_echo "$as_me: WARNING: Your gcc is not -fvisibility-inlines-hidden safe. Dis fi if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then - { $as_echo "$as_me:$LINENO: checking if gcc has a visibility bug with class-level attributes (GCC bug 26905)" >&5 -$as_echo_n "checking if gcc has a visibility bug with class-level attributes (GCC bug 26905)... " >&6; } + { echo "$as_me:$LINENO: checking if gcc has a visibility bug with class-level attributes (GCC bug 26905)" >&5 +echo $ECHO_N "checking if gcc has a visibility bug with class-level attributes (GCC bug 26905)... $ECHO_C" >&6; } cat >visibility.cxx <<_ACEOF #pragma GCC visibility push(hidden) struct __attribute__ ((visibility ("default"))) TestStruct { @@ -11365,11 +10917,11 @@ _ACEOF fi rm -f visibility.s - { $as_echo "$as_me:$LINENO: result: $gccvisbroken" >&5 -$as_echo "$gccvisbroken" >&6; } + { echo "$as_me:$LINENO: result: $gccvisbroken" >&5 +echo "${ECHO_T}$gccvisbroken" >&6; } if test "$gccvisbroken" = "yes"; then - { $as_echo "$as_me:$LINENO: WARNING: Your gcc is not -fvisibility=hidden safe. Disabling visibility" >&5 -$as_echo "$as_me: WARNING: Your gcc is not -fvisibility=hidden safe. Disabling visibility" >&2;} + { echo "$as_me:$LINENO: WARNING: Your gcc is not -fvisibility=hidden safe. Disabling visibility" >&5 +echo "$as_me: WARNING: Your gcc is not -fvisibility=hidden safe. Disabling visibility" >&2;} echo "Your gcc is not -fvisibility=hidden safe. Disabling visibility" >> warn unset HAVE_GCC_VISIBILITY_FEATURE fi @@ -11385,11 +10937,11 @@ fi -{ $as_echo "$as_me:$LINENO: checking which memory allocator to use" >&5 -$as_echo_n "checking which memory allocator to use... " >&6; } +{ echo "$as_me:$LINENO: checking which memory allocator to use" >&5 +echo $ECHO_N "checking which memory allocator to use... $ECHO_C" >&6; } if test "$with_alloc" = "system"; then - { $as_echo "$as_me:$LINENO: result: system" >&5 -$as_echo "system" >&6; } + { echo "$as_me:$LINENO: result: system" >&5 +echo "${ECHO_T}system" >&6; } ALLOC="SYS_ALLOC"; @@ -11397,11 +10949,11 @@ $as_echo "system" >&6; } for ac_func in malloc realloc calloc free do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -11454,42 +11006,35 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_var=no" fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF fi @@ -11497,18 +11042,18 @@ done fi if test "$with_alloc" = "tcmalloc"; then - { $as_echo "$as_me:$LINENO: result: tcmalloc" >&5 -$as_echo "tcmalloc" >&6; } + { echo "$as_me:$LINENO: result: tcmalloc" >&5 +echo "${ECHO_T}tcmalloc" >&6; } if ! echo $build_cpu | grep -E 'i[3456]86' 2>/dev/null >/dev/null; then - { { $as_echo "$as_me:$LINENO: error: tcmalloc only available/usable on ix86" >&5 -$as_echo "$as_me: error: tcmalloc only available/usable on ix86" >&2;} + { { echo "$as_me:$LINENO: error: tcmalloc only available/usable on ix86" >&5 +echo "$as_me: error: tcmalloc only available/usable on ix86" >&2;} { (exit 1); exit 1; }; } fi -{ $as_echo "$as_me:$LINENO: checking for malloc in -ltcmalloc" >&5 -$as_echo_n "checking for malloc in -ltcmalloc... " >&6; } +{ echo "$as_me:$LINENO: checking for malloc in -ltcmalloc" >&5 +echo $ECHO_N "checking for malloc in -ltcmalloc... $ECHO_C" >&6; } if test "${ac_cv_lib_tcmalloc_malloc+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ltcmalloc $LIBS" @@ -11540,37 +11085,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_tcmalloc_malloc=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_tcmalloc_malloc=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_tcmalloc_malloc" >&5 -$as_echo "$ac_cv_lib_tcmalloc_malloc" >&6; } -if test "x$ac_cv_lib_tcmalloc_malloc" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_tcmalloc_malloc" >&5 +echo "${ECHO_T}$ac_cv_lib_tcmalloc_malloc" >&6; } +if test $ac_cv_lib_tcmalloc_malloc = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBTCMALLOC 1 _ACEOF @@ -11578,46 +11119,46 @@ _ACEOF LIBS="-ltcmalloc $LIBS" else - { { $as_echo "$as_me:$LINENO: error: tcmalloc not found or functional. Install the Google Profiling Tools" >&5 -$as_echo "$as_me: error: tcmalloc not found or functional. Install the Google Profiling Tools" >&2;} + { { echo "$as_me:$LINENO: error: tcmalloc not found or functional. Install the Google Profiling Tools" >&5 +echo "$as_me: error: tcmalloc not found or functional. Install the Google Profiling Tools" >&2;} { (exit 1); exit 1; }; } fi ALLOC="TCMALLOC"; fi if test "$with_alloc" = "internal" -o -z "$with_alloc"; then - { $as_echo "$as_me:$LINENO: result: internal" >&5 -$as_echo "internal" >&6; } + { echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6; } fi -{ $as_echo "$as_me:$LINENO: checking whether to add custom build version" >&5 -$as_echo_n "checking whether to add custom build version... " >&6; } +{ echo "$as_me:$LINENO: checking whether to add custom build version" >&5 +echo $ECHO_N "checking whether to add custom build version... $ECHO_C" >&6; } if test "z$with_build_version" != "z"; then BUILD_VER_STRING=$with_build_version - { $as_echo "$as_me:$LINENO: result: yes, $BUILD_VER_STRING" >&5 -$as_echo "yes, $BUILD_VER_STRING" >&6; } + { echo "$as_me:$LINENO: result: yes, $BUILD_VER_STRING" >&5 +echo "${ECHO_T}yes, $BUILD_VER_STRING" >&6; } else BUILD_VER_STRING= - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -{ $as_echo "$as_me:$LINENO: checking whether to build with Java support" >&5 -$as_echo_n "checking whether to build with Java support... " >&6; } +{ echo "$as_me:$LINENO: checking whether to build with Java support" >&5 +echo $ECHO_N "checking whether to build with Java support... $ECHO_C" >&6; } if test "$WITH_JAVA" != "no"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } SOLAR_JAVA="TRUE" else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } SOLAR_JAVA="" - { $as_echo "$as_me:$LINENO: WARNING: building without java will mean some features will not be available" >&5 -$as_echo "$as_me: WARNING: building without java will mean some features will not be available" >&2;} + { echo "$as_me:$LINENO: WARNING: building without java will mean some features will not be available" >&5 +echo "$as_me: WARNING: building without java will mean some features will not be available" >&2;} echo "building without java will mean some features will not be available" >>warn fi @@ -11644,10 +11185,10 @@ if test "$SOLAR_JAVA" != ""; then if test -z "$with_jdk_home"; then # Extract the first word of "$WITH_JAVA", so it can be a program name with args. set dummy $WITH_JAVA; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_JAVAINTERPRETER+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $JAVAINTERPRETER in [\\/]* | ?:[\\/]*) @@ -11662,7 +11203,7 @@ do 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_path_JAVAINTERPRETER="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -11674,11 +11215,11 @@ esac fi JAVAINTERPRETER=$ac_cv_path_JAVAINTERPRETER if test -n "$JAVAINTERPRETER"; then - { $as_echo "$as_me:$LINENO: result: $JAVAINTERPRETER" >&5 -$as_echo "$JAVAINTERPRETER" >&6; } + { echo "$as_me:$LINENO: result: $JAVAINTERPRETER" >&5 +echo "${ECHO_T}$JAVAINTERPRETER" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -11687,8 +11228,8 @@ fi if test -x "$_java_path"; then JAVAINTERPRETER=$_java_path else - { { $as_echo "$as_me:$LINENO: error: $_java_path not found set with_jdk_home" >&5 -$as_echo "$as_me: error: $_java_path not found set with_jdk_home" >&2;} + { { echo "$as_me:$LINENO: error: $_java_path not found set with_jdk_home" >&5 +echo "$as_me: error: $_java_path not found set with_jdk_home" >&2;} { (exit 1); exit 1; }; } fi fi @@ -11703,12 +11244,12 @@ fi if test "$SOLAR_JAVA" != ""; then _gij_longver=0 - { $as_echo "$as_me:$LINENO: checking the installed JDK" >&5 -$as_echo_n "checking the installed JDK... " >&6; } + { echo "$as_me:$LINENO: checking the installed JDK" >&5 +echo $ECHO_N "checking the installed JDK... $ECHO_C" >&6; } if test -n "$JAVAINTERPRETER"; then if test `$JAVAINTERPRETER -version 2>&1 | grep -c "Kaffe"` -gt 0; then - { { $as_echo "$as_me:$LINENO: error: No valid check available. Please check the block for your desired java in configure.in" >&5 -$as_echo "$as_me: error: No valid check available. Please check the block for your desired java in configure.in" >&2;} + { { echo "$as_me:$LINENO: error: No valid check available. Please check the block for your desired java in configure.in" >&5 +echo "$as_me: error: No valid check available. Please check the block for your desired java in configure.in" >&2;} { (exit 1); exit 1; }; } # dnl Kaffe specific tests # KAFFE_VER=`$JAVAINTERPRETER -version 2>&1 | $EGREP " Version:" | $SED -r "s/.* Version: ([[0-9\.]]*).*/\1/"` @@ -11729,14 +11270,14 @@ $as_echo "$as_me: error: No valid check available. Please check the block for yo # JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*java,,p"` elif test `$JAVAINTERPRETER --version 2>&1 | grep -c "GNU libgcj"` -gt 0; then JDK=gcj - { $as_echo "$as_me:$LINENO: result: checked (gcj)" >&5 -$as_echo "checked (gcj)" >&6; } + { echo "$as_me:$LINENO: result: checked (gcj)" >&5 +echo "${ECHO_T}checked (gcj)" >&6; } _gij_version=`$JAVAINTERPRETER --version | grep GNU | $SED -e 's@^[^0-9]*@@' -e 's@ .*@@' -e 's@,.*@@'`; _gij_longver=`echo $_gij_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'` elif test `$JAVAINTERPRETER -version 2>&1 | awk '{ print }' | grep -c "BEA"` -gt 0; then - { { $as_echo "$as_me:$LINENO: error: No valid check available. Please check the block for your desired java in configure.in" >&5 -$as_echo "$as_me: error: No valid check available. Please check the block for your desired java in configure.in" >&2;} + { { echo "$as_me:$LINENO: error: No valid check available. Please check the block for your desired java in configure.in" >&5 +echo "$as_me: error: No valid check available. Please check the block for your desired java in configure.in" >&2;} { (exit 1); exit 1; }; } # JDK=bea # @@ -11767,18 +11308,18 @@ $as_echo "$as_me: error: No valid check available. Please check the block for yo _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'` if test "$_jdk_ver" -lt 10600; then - { { $as_echo "$as_me:$LINENO: error: IBM JDK is too old, you need at least 1.6" >&5 -$as_echo "$as_me: error: IBM JDK is too old, you need at least 1.6" >&2;} + { { echo "$as_me:$LINENO: error: IBM JDK is too old, you need at least 1.6" >&5 +echo "$as_me: error: IBM JDK is too old, you need at least 1.6" >&2;} { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:$LINENO: result: checked (IBM JDK $_jdk)" >&5 -$as_echo "checked (IBM JDK $_jdk)" >&6; } + { echo "$as_me:$LINENO: result: checked (IBM JDK $_jdk)" >&5 +echo "${ECHO_T}checked (IBM JDK $_jdk)" >&6; } if test "$with_jdk_home" = ""; then - { { $as_echo "$as_me:$LINENO: error: In order to successfully build OpenOffice.org using the IBM JDK, + { { echo "$as_me:$LINENO: error: In order to successfully build OpenOffice.org using the IBM JDK, you must use the \"--with-jdk-home\" configure option explicitly" >&5 -$as_echo "$as_me: error: In order to successfully build OpenOffice.org using the IBM JDK, +echo "$as_me: error: In order to successfully build OpenOffice.org using the IBM JDK, you must use the \"--with-jdk-home\" configure option explicitly" >&2;} { (exit 1); exit 1; }; } fi @@ -11792,12 +11333,12 @@ you must use the \"--with-jdk-home\" configure option explicitly" >&2;} _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'` if test "$_jdk_ver" -lt 10500; then - { { $as_echo "$as_me:$LINENO: error: JDK is too old, you need at least 1.5" >&5 -$as_echo "$as_me: error: JDK is too old, you need at least 1.5" >&2;} + { { echo "$as_me:$LINENO: error: JDK is too old, you need at least 1.5" >&5 +echo "$as_me: error: JDK is too old, you need at least 1.5" >&2;} { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:$LINENO: result: checked (JDK $_jdk)" >&5 -$as_echo "checked (JDK $_jdk)" >&6; } + { echo "$as_me:$LINENO: result: checked (JDK $_jdk)" >&5 +echo "${ECHO_T}checked (JDK $_jdk)" >&6; } JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*java,,p"` if test "$_os" = "WINNT"; then JAVA_HOME=`echo $JAVA_HOME | $SED "s,\.[eE][xX][eE]$,,"` @@ -11807,8 +11348,8 @@ $as_echo "checked (JDK $_jdk)" >&6; } fi fi else - { { $as_echo "$as_me:$LINENO: error: JAVA not found. You need at least jdk-1.5, or gcj-4" >&5 -$as_echo "$as_me: error: JAVA not found. You need at least jdk-1.5, or gcj-4" >&2;} + { { echo "$as_me:$LINENO: error: JAVA not found. You need at least jdk-1.5, or gcj-4" >&5 +echo "$as_me: error: JAVA not found. You need at least jdk-1.5, or gcj-4" >&2;} { (exit 1); exit 1; }; } fi else @@ -11829,10 +11370,10 @@ if test "$SOLAR_JAVA" != ""; then if test -z "$with_jdk_home"; then # Extract the first word of "$javacompiler", so it can be a program name with args. set dummy $javacompiler; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_JAVACOMPILER+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $JAVACOMPILER in [\\/]* | ?:[\\/]*) @@ -11847,7 +11388,7 @@ do 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_path_JAVACOMPILER="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -11859,11 +11400,11 @@ esac fi JAVACOMPILER=$ac_cv_path_JAVACOMPILER if test -n "$JAVACOMPILER"; then - { $as_echo "$as_me:$LINENO: result: $JAVACOMPILER" >&5 -$as_echo "$JAVACOMPILER" >&6; } + { echo "$as_me:$LINENO: result: $JAVACOMPILER" >&5 +echo "${ECHO_T}$JAVACOMPILER" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -11874,8 +11415,8 @@ fi fi fi if test -z "$JAVACOMPILER"; then - { { $as_echo "$as_me:$LINENO: error: $javacompiler not found set with_jdk_home" >&5 -$as_echo "$as_me: error: $javacompiler not found set with_jdk_home" >&2;} + { { echo "$as_me:$LINENO: error: $javacompiler not found set with_jdk_home" >&5 +echo "$as_me: error: $javacompiler not found set with_jdk_home" >&2;} { (exit 1); exit 1; }; } fi if test "$_os" = "WINNT"; then @@ -11892,11 +11433,11 @@ $as_echo "$as_me: error: $javacompiler not found set with_jdk_home" >&2;} fi if test `$JAVACOMPILER -version 2>&1 | grep -c "Eclipse Java Compiler"` -gt 0; then - { $as_echo "$as_me:$LINENO: checking re-checking JDK" >&5 -$as_echo_n "checking re-checking JDK... " >&6; } + { echo "$as_me:$LINENO: checking re-checking JDK" >&5 +echo $ECHO_N "checking re-checking JDK... $ECHO_C" >&6; } JDK=gcj - { $as_echo "$as_me:$LINENO: result: checked (ecj)" >&5 -$as_echo "checked (ecj)" >&6; } + { echo "$as_me:$LINENO: result: checked (ecj)" >&5 +echo "${ECHO_T}checked (ecj)" >&6; } #TODO: what's to do here? some switch to do 1.5 compiling? JAVAFLAGS="-source 1.5 -target 1.5" _gij_longver="50000" @@ -11915,10 +11456,10 @@ if test "$SOLAR_JAVA" != ""; then if test -z "$with_jdk_home"; then # Extract the first word of "javadoc", so it can be a program name with args. set dummy javadoc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_JAVADOC+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $JAVADOC in [\\/]* | ?:[\\/]*) @@ -11933,7 +11474,7 @@ do 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_path_JAVADOC="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -11945,11 +11486,11 @@ esac fi JAVADOC=$ac_cv_path_JAVADOC if test -n "$JAVADOC"; then - { $as_echo "$as_me:$LINENO: result: $JAVADOC" >&5 -$as_echo "$JAVADOC" >&6; } + { echo "$as_me:$LINENO: result: $JAVADOC" >&5 +echo "${ECHO_T}$JAVADOC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -11965,10 +11506,10 @@ fi else # Extract the first word of "javadoc", so it can be a program name with args. set dummy javadoc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_JAVADOC+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $JAVADOC in [\\/]* | ?:[\\/]*) @@ -11983,7 +11524,7 @@ do 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_path_JAVADOC="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -11995,19 +11536,19 @@ esac fi JAVADOC=$ac_cv_path_JAVADOC if test -n "$JAVADOC"; then - { $as_echo "$as_me:$LINENO: result: $JAVADOC" >&5 -$as_echo "$JAVADOC" >&6; } + { echo "$as_me:$LINENO: result: $JAVADOC" >&5 +echo "${ECHO_T}$JAVADOC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi fi fi if test -z "$JAVADOC"; then - { { $as_echo "$as_me:$LINENO: error: $_javadoc_path not found set with_jdk_home" >&5 -$as_echo "$as_me: error: $_javadoc_path not found set with_jdk_home" >&2;} + { { echo "$as_me:$LINENO: error: $_javadoc_path not found set with_jdk_home" >&5 +echo "$as_me: error: $_javadoc_path not found set with_jdk_home" >&2;} { (exit 1); exit 1; }; } fi if test "$_os" = "WINNT"; then @@ -12040,36 +11581,36 @@ class findhome } } _ACEOF - { $as_echo "$as_me:$LINENO: checking if javac works" >&5 -$as_echo_n "checking if javac works... " >&6; } + { echo "$as_me:$LINENO: checking if javac works" >&5 +echo $ECHO_N "checking if javac works... $ECHO_C" >&6; } javac_cmd="$JAVACOMPILER findhome.java 1>&2" { (eval echo "$as_me:$LINENO: \"$javac_cmd\"") >&5 (eval $javac_cmd) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } if test $? = 0 && test -f ./findhome.class ; then - { $as_echo "$as_me:$LINENO: result: javac works" >&5 -$as_echo "javac works" >&6; } + { echo "$as_me:$LINENO: result: javac works" >&5 +echo "${ECHO_T}javac works" >&6; } else echo "configure: javac test failed" >&5 cat findhome.java >&5 - { { $as_echo "$as_me:$LINENO: error: javac does not work - java projects will not build!" >&5 -$as_echo "$as_me: error: javac does not work - java projects will not build!" >&2;} + { { echo "$as_me:$LINENO: error: javac does not work - java projects will not build!" >&5 +echo "$as_me: error: javac does not work - java projects will not build!" >&2;} { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:$LINENO: checking if gij knows its java.home" >&5 -$as_echo_n "checking if gij knows its java.home... " >&6; } + { echo "$as_me:$LINENO: checking if gij knows its java.home" >&5 +echo $ECHO_N "checking if gij knows its java.home... $ECHO_C" >&6; } JAVA_HOME=`$JAVAINTERPRETER findhome` if test $? = 0 && test "$JAVA_HOME" != "" ; then - { $as_echo "$as_me:$LINENO: result: $JAVA_HOME" >&5 -$as_echo "$JAVA_HOME" >&6; } + { echo "$as_me:$LINENO: result: $JAVA_HOME" >&5 +echo "${ECHO_T}$JAVA_HOME" >&6; } else echo "configure: java test failed" >&5 cat findhome.java >&5 - { { $as_echo "$as_me:$LINENO: error: gij does not know its java.home - use --with-jdk-home" >&5 -$as_echo "$as_me: error: gij does not know its java.home - use --with-jdk-home" >&2;} + { { echo "$as_me:$LINENO: error: gij does not know its java.home - use --with-jdk-home" >&5 +echo "$as_me: error: gij does not know its java.home - use --with-jdk-home" >&2;} { (exit 1); exit 1; }; } fi else @@ -12092,10 +11633,10 @@ $as_echo "$as_me: error: gij does not know its java.home - use --with-jdk-home" JAVA_HOME=$(readlink $JAVACOMPILER) else # else warn - { $as_echo "$as_me:$LINENO: WARNING: JAVA_HOME is set to /usr - this is very likely to be incorrect" >&5 -$as_echo "$as_me: WARNING: JAVA_HOME is set to /usr - this is very likely to be incorrect" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" >&5 -$as_echo "$as_me: WARNING: if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" >&2;} + { echo "$as_me:$LINENO: WARNING: JAVA_HOME is set to /usr - this is very likely to be incorrect" >&5 +echo "$as_me: WARNING: JAVA_HOME is set to /usr - this is very likely to be incorrect" >&2;} + { echo "$as_me:$LINENO: WARNING: if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" >&5 +echo "$as_me: WARNING: if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" >&2;} echo "JAVA_HOME is set to /usr - this is very likely to be incorrect" >> warn echo "if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" >> warn fi @@ -12117,12 +11658,12 @@ $as_echo "$as_me: WARNING: if this is the case, please inform the correct JAVA_H JAVA_HOME_OK="NO" fi if test "$JAVA_HOME_OK" = "NO"; then - { $as_echo "$as_me:$LINENO: WARNING: JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >&5 -$as_echo "$as_me: WARNING: JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: attempted to find JAVA_HOME automatically, but apparently it failed" >&5 -$as_echo "$as_me: WARNING: attempted to find JAVA_HOME automatically, but apparently it failed" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >&5 -$as_echo "$as_me: WARNING: in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >&2;} + { echo "$as_me:$LINENO: WARNING: JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >&5 +echo "$as_me: WARNING: JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >&2;} + { echo "$as_me:$LINENO: WARNING: attempted to find JAVA_HOME automatically, but apparently it failed" >&5 +echo "$as_me: WARNING: attempted to find JAVA_HOME automatically, but apparently it failed" >&2;} + { echo "$as_me:$LINENO: WARNING: in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >&5 +echo "$as_me: WARNING: in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >&2;} echo "JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >> warn echo "attempted to find JAVA_HOME automatically, but apparently it failed" >> warn echo "in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >> warn @@ -12135,8 +11676,8 @@ fi AWTLIB= if test "$SOLAR_JAVA" != ""; then - { $as_echo "$as_me:$LINENO: checking for jawt lib name" >&5 -$as_echo_n "checking for jawt lib name... " >&6; } + { echo "$as_me:$LINENO: checking for jawt lib name" >&5 +echo $ECHO_N "checking for jawt lib name... $ECHO_C" >&6; } if test "$JDK" = "gcj"; then save_CFLAGS=$CFLAGS save_LDFLAGS=$LDFLAGS @@ -12144,17 +11685,17 @@ $as_echo_n "checking for jawt lib name... " >&6; } LDFLAGS="$LDFLAGS -L$JAVA_HOME/lib -lgcj" exec 6>/dev/null # no output if test "${ac_cv_header_jni_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for jni.h" >&5 -$as_echo_n "checking for jni.h... " >&6; } + { echo "$as_me:$LINENO: checking for jni.h" >&5 +echo $ECHO_N "checking for jni.h... $ECHO_C" >&6; } if test "${ac_cv_header_jni_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5 -$as_echo "$ac_cv_header_jni_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5 +echo "${ECHO_T}$ac_cv_header_jni_h" >&6; } else # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking jni.h usability" >&5 -$as_echo_n "checking jni.h usability... " >&6; } +{ echo "$as_me:$LINENO: checking jni.h usability" >&5 +echo $ECHO_N "checking jni.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -12170,33 +11711,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_header_compiler=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ $as_echo "$as_me:$LINENO: checking jni.h presence" >&5 -$as_echo_n "checking jni.h presence... " >&6; } +{ echo "$as_me:$LINENO: checking jni.h presence" >&5 +echo $ECHO_N "checking jni.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -12210,79 +11750,78 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: jni.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: jni.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: jni.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: jni.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: jni.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: jni.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: jni.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: jni.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: jni.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: jni.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: jni.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: jni.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: jni.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: jni.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: jni.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: jni.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: jni.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: jni.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: jni.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: jni.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: jni.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: jni.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: jni.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: jni.h: in the future, the compiler will take precedence" >&2;} ;; esac -{ $as_echo "$as_me:$LINENO: checking for jni.h" >&5 -$as_echo_n "checking for jni.h... " >&6; } +{ echo "$as_me:$LINENO: checking for jni.h" >&5 +echo $ECHO_N "checking for jni.h... $ECHO_C" >&6; } if test "${ac_cv_header_jni_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_jni_h=$ac_header_preproc fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5 -$as_echo "$ac_cv_header_jni_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5 +echo "${ECHO_T}$ac_cv_header_jni_h" >&6; } fi -if test "x$ac_cv_header_jni_h" = x""yes; then +if test $ac_cv_header_jni_h = yes; then : else - { { $as_echo "$as_me:$LINENO: error: jni.h could not be found. Mismatch between gcc and libgcj or libgcj-devel missing?" >&5 -$as_echo "$as_me: error: jni.h could not be found. Mismatch between gcc and libgcj or libgcj-devel missing?" >&2;} + { { echo "$as_me:$LINENO: error: jni.h could not be found. Mismatch between gcc and libgcj or libgcj-devel missing?" >&5 +echo "$as_me: error: jni.h could not be found. Mismatch between gcc and libgcj or libgcj-devel missing?" >&2;} { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:$LINENO: checking for JAWT_GetAWT in -lgcjawt" >&5 -$as_echo_n "checking for JAWT_GetAWT in -lgcjawt... " >&6; } + { echo "$as_me:$LINENO: checking for JAWT_GetAWT in -lgcjawt" >&5 +echo $ECHO_N "checking for JAWT_GetAWT in -lgcjawt... $ECHO_C" >&6; } if test "${ac_cv_lib_gcjawt_JAWT_GetAWT+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lgcjawt $LIBS" @@ -12314,37 +11853,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_gcjawt_JAWT_GetAWT=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_gcjawt_JAWT_GetAWT=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$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" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_gcjawt_JAWT_GetAWT" >&5 +echo "${ECHO_T}$ac_cv_lib_gcjawt_JAWT_GetAWT" >&6; } +if test $ac_cv_lib_gcjawt_JAWT_GetAWT = yes; then AWTLIB="-lgcjawt -lgcj" fi @@ -12364,17 +11899,17 @@ fi export LD_LIBRARY_PATH exec 6>/dev/null # no output if test "${ac_cv_header_jni_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for jni.h" >&5 -$as_echo_n "checking for jni.h... " >&6; } + { echo "$as_me:$LINENO: checking for jni.h" >&5 +echo $ECHO_N "checking for jni.h... $ECHO_C" >&6; } if test "${ac_cv_header_jni_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5 -$as_echo "$ac_cv_header_jni_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5 +echo "${ECHO_T}$ac_cv_header_jni_h" >&6; } else # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking jni.h usability" >&5 -$as_echo_n "checking jni.h usability... " >&6; } +{ echo "$as_me:$LINENO: checking jni.h usability" >&5 +echo $ECHO_N "checking jni.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -12390,33 +11925,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_header_compiler=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ $as_echo "$as_me:$LINENO: checking jni.h presence" >&5 -$as_echo_n "checking jni.h presence... " >&6; } +{ echo "$as_me:$LINENO: checking jni.h presence" >&5 +echo $ECHO_N "checking jni.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -12430,79 +11964,78 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: jni.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: jni.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: jni.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: jni.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: jni.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: jni.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: jni.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: jni.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: jni.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: jni.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: jni.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: jni.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: jni.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: jni.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: jni.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: jni.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: jni.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: jni.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: jni.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: jni.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: jni.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: jni.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: jni.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: jni.h: in the future, the compiler will take precedence" >&2;} ;; esac -{ $as_echo "$as_me:$LINENO: checking for jni.h" >&5 -$as_echo_n "checking for jni.h... " >&6; } +{ echo "$as_me:$LINENO: checking for jni.h" >&5 +echo $ECHO_N "checking for jni.h... $ECHO_C" >&6; } if test "${ac_cv_header_jni_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_jni_h=$ac_header_preproc fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5 -$as_echo "$ac_cv_header_jni_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5 +echo "${ECHO_T}$ac_cv_header_jni_h" >&6; } fi -if test "x$ac_cv_header_jni_h" = x""yes; then +if test $ac_cv_header_jni_h = yes; then : else - { { $as_echo "$as_me:$LINENO: error: jni.h could not be found." >&5 -$as_echo "$as_me: error: jni.h could not be found." >&2;} + { { echo "$as_me:$LINENO: error: jni.h could not be found." >&5 +echo "$as_me: error: jni.h could not be found." >&2;} { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:$LINENO: checking for JAWT_GetAWT in -ljawt" >&5 -$as_echo_n "checking for JAWT_GetAWT in -ljawt... " >&6; } + { echo "$as_me:$LINENO: checking for JAWT_GetAWT in -ljawt" >&5 +echo $ECHO_N "checking for JAWT_GetAWT in -ljawt... $ECHO_C" >&6; } if test "${ac_cv_lib_jawt_JAWT_GetAWT+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ljawt $LIBS" @@ -12534,46 +12067,42 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_jawt_JAWT_GetAWT=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_jawt_JAWT_GetAWT=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$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" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_jawt_JAWT_GetAWT" >&5 +echo "${ECHO_T}$ac_cv_lib_jawt_JAWT_GetAWT" >&6; } +if test $ac_cv_lib_jawt_JAWT_GetAWT = yes; then AWTLIB="-ljawt" fi if test -z "$AWTLIB"; then LDFLAGS="$LDFLAGS -L$JAVA_HOME/jre/bin/xawt -ljawt" - { $as_echo "$as_me:$LINENO: checking for JAWT_GetAWT in -lmawt" >&5 -$as_echo_n "checking for JAWT_GetAWT in -lmawt... " >&6; } + { echo "$as_me:$LINENO: checking for JAWT_GetAWT in -lmawt" >&5 +echo $ECHO_N "checking for JAWT_GetAWT in -lmawt... $ECHO_C" >&6; } if test "${ac_cv_lib_mawt_JAWT_GetAWT+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lmawt $LIBS" @@ -12605,37 +12134,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_mawt_JAWT_GetAWT=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_mawt_JAWT_GetAWT=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$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" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_mawt_JAWT_GetAWT" >&5 +echo "${ECHO_T}$ac_cv_lib_mawt_JAWT_GetAWT" >&6; } +if test $ac_cv_lib_mawt_JAWT_GetAWT = yes; then AWTLIB="-L$JAVA_HOME/jre/bin/xawt -ljawt -lmawt" fi @@ -12648,24 +12173,24 @@ fi if test -z "$AWTLIB"; then AWTLIB=-ljawt fi - { $as_echo "$as_me:$LINENO: result: $AWTLIB" >&5 -$as_echo "$AWTLIB" >&6; } + { echo "$as_me:$LINENO: result: $AWTLIB" >&5 +echo "${ECHO_T}$AWTLIB" >&6; } fi if test "$SOLAR_JAVA" != ""; then - { $as_echo "$as_me:$LINENO: checking whether to enable gcj aot compilation" >&5 -$as_echo_n "checking whether to enable gcj aot compilation... " >&6; } + { echo "$as_me:$LINENO: checking whether to enable gcj aot compilation" >&5 +echo $ECHO_N "checking whether to enable gcj aot compilation... $ECHO_C" >&6; } if test -n "$enable_gcjaot" && test "$enable_gcjaot" != "no"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } if test `echo $WITH_JAVA | grep -c "gij"` -eq 0; then gcjaot="gcj" else gcjaot=`echo $WITH_JAVA | $SED -e "s/gij/gcj/g"` fi - { $as_echo "$as_me:$LINENO: result: $gcjaot" >&5 -$as_echo "$gcjaot" >&6; } + { echo "$as_me:$LINENO: result: $gcjaot" >&5 +echo "${ECHO_T}$gcjaot" >&6; } if test -n "$with_jdk_home"; then _javac_path="$with_jdk_home/bin/$gcjaot" if test -x "$_javac_path"; then @@ -12675,10 +12200,10 @@ $as_echo "$gcjaot" >&6; } if test -z "$JAVAAOTCOMPILER"; then # Extract the first word of "$gcjaot", so it can be a program name with args. set dummy $gcjaot; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_JAVAAOTCOMPILER+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $JAVAAOTCOMPILER in [\\/]* | ?:[\\/]*) @@ -12693,7 +12218,7 @@ do 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_path_JAVAAOTCOMPILER="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12705,22 +12230,22 @@ esac fi JAVAAOTCOMPILER=$ac_cv_path_JAVAAOTCOMPILER if test -n "$JAVAAOTCOMPILER"; then - { $as_echo "$as_me:$LINENO: result: $JAVAAOTCOMPILER" >&5 -$as_echo "$JAVAAOTCOMPILER" >&6; } + { echo "$as_me:$LINENO: result: $JAVAAOTCOMPILER" >&5 +echo "${ECHO_T}$JAVAAOTCOMPILER" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi fi if test -z "$JAVAAOTCOMPILER"; then - { $as_echo "$as_me:$LINENO: WARNING: $gcjaot not found, set with_jdk_home" >&5 -$as_echo "$as_me: WARNING: $gcjaot not found, set with_jdk_home" >&2;} + { echo "$as_me:$LINENO: WARNING: $gcjaot not found, set with_jdk_home" >&5 +echo "$as_me: WARNING: $gcjaot not found, set with_jdk_home" >&2;} fi else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi fi @@ -12736,10 +12261,10 @@ fi # Extract the first word of "dmake", so it can be a program name with args. set dummy dmake; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_DMAKE+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $DMAKE in [\\/]* | ?:[\\/]*) @@ -12754,7 +12279,7 @@ do 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_path_DMAKE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12767,11 +12292,11 @@ esac fi DMAKE=$ac_cv_path_DMAKE if test -n "$DMAKE"; then - { $as_echo "$as_me:$LINENO: result: $DMAKE" >&5 -$as_echo "$DMAKE" >&6; } + { echo "$as_me:$LINENO: result: $DMAKE" >&5 +echo "${ECHO_T}$DMAKE" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -12779,8 +12304,8 @@ if test "$DMAKE" = "no"; then BUILD_DMAKE=YES echo "dmake will be built on ./bootstrap" else - { $as_echo "$as_me:$LINENO: checking whether the found dmake is the right dmake" >&5 -$as_echo_n "checking whether the found dmake is the right dmake... " >&6; } + { echo "$as_me:$LINENO: checking whether the found dmake is the right dmake" >&5 +echo $ECHO_N "checking whether the found dmake is the right dmake... $ECHO_C" >&6; } # we need to find out whether that dmake we found is "our" dmake # or the dmake from Sun's SunStudio Compiler which is something # different @@ -12789,48 +12314,48 @@ $as_echo_n "checking whether the found dmake is the right dmake... " >&6; } $DMAKE -V 2>/dev/null | grep 'dmake .* Version .*' >/dev/null if test $? -eq 0; then BUILD_DMAKE=NO - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - { $as_echo "$as_me:$LINENO: checking the dmake version" >&5 -$as_echo_n "checking the dmake version... " >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + { echo "$as_me:$LINENO: checking the dmake version" >&5 +echo $ECHO_N "checking the dmake version... $ECHO_C" >&6; } DMAKE_VERSION=`$DMAKE -V | $AWK '$3 == "Version" {print $4}'` if test "`echo $DMAKE_VERSION | cut -d'.' -f1`" -gt "4"; then - { $as_echo "$as_me:$LINENO: result: OK, >= 4.11" >&5 -$as_echo "OK, >= 4.11" >&6; } + { echo "$as_me:$LINENO: result: OK, >= 4.11" >&5 +echo "${ECHO_T}OK, >= 4.11" >&6; } elif test "`echo $DMAKE_VERSION | cut -d'.' -f1`" = "4" && \ test "`echo $DMAKE_VERSION | cut -d'.' -f2`" -ge "11"; then - { $as_echo "$as_me:$LINENO: result: OK, >= 4.11" >&5 -$as_echo "OK, >= 4.11" >&6; } + { echo "$as_me:$LINENO: result: OK, >= 4.11" >&5 +echo "${ECHO_T}OK, >= 4.11" >&6; } else - { $as_echo "$as_me:$LINENO: result: too old. >= 4.11 is needed" >&5 -$as_echo "too old. >= 4.11 is needed" >&6; } + { echo "$as_me:$LINENO: result: too old. >= 4.11 is needed" >&5 +echo "${ECHO_T}too old. >= 4.11 is needed" >&6; } echo "A newer dmake will be built on ./bootstrap" BUILD_DMAKE=YES fi else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } echo "dmake will be built on ./bootstrap" BUILD_DMAKE=YES fi fi -{ $as_echo "$as_me:$LINENO: checking whether to enable EPM for packing" >&5 -$as_echo_n "checking whether to enable EPM for packing... " >&6; } +{ echo "$as_me:$LINENO: checking whether to enable EPM for packing" >&5 +echo $ECHO_N "checking whether to enable EPM for packing... $ECHO_C" >&6; } if test "$_os" != "WINNT" -a \( "z$enable_epm" = "z" -o "$enable_epm" != "no" \) ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } if test "$_os" != "WINNT"; then if test -n "$with_epm"; then EPM=$with_epm else # Extract the first word of "epm", so it can be a program name with args. set dummy epm; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_EPM+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $EPM in [\\/]* | ?:[\\/]*) @@ -12845,7 +12370,7 @@ do 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_path_EPM="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12858,11 +12383,11 @@ esac fi EPM=$ac_cv_path_EPM if test -n "$EPM"; then - { $as_echo "$as_me:$LINENO: result: $EPM" >&5 -$as_echo "$EPM" >&6; } + { echo "$as_me:$LINENO: result: $EPM" >&5 +echo "${ECHO_T}$EPM" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -12873,44 +12398,44 @@ fi BUILD_TYPE="$BUILD_TYPE EPM" else # Gentoo has some epm which is something different... - { $as_echo "$as_me:$LINENO: checking whether the found epm is the right epm" >&5 -$as_echo_n "checking whether the found epm is the right epm... " >&6; } + { echo "$as_me:$LINENO: checking whether the found epm is the right epm" >&5 +echo $ECHO_N "checking whether the found epm is the right epm... $ECHO_C" >&6; } if $EPM | grep "ESP Package Manager" >/dev/null 2>/dev/null; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - { { $as_echo "$as_me:$LINENO: error: no. Install ESP Package Manager (www.easysw.com/epm) and/or specify the path to the right epm" >&5 -$as_echo "$as_me: error: no. Install ESP Package Manager (www.easysw.com/epm) and/or specify the path to the right epm" >&2;} + { { echo "$as_me:$LINENO: error: no. Install ESP Package Manager (www.easysw.com/epm) and/or specify the path to the right epm" >&5 +echo "$as_me: error: no. Install ESP Package Manager (www.easysw.com/epm) and/or specify the path to the right epm" >&2;} { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:$LINENO: checking epm version" >&5 -$as_echo_n "checking epm version... " >&6; } + { echo "$as_me:$LINENO: checking epm version" >&5 +echo $ECHO_N "checking epm version... $ECHO_C" >&6; } EPM_VERSION=`$EPM | grep 'ESP Package Manager' | cut -d' ' -f4 | $SED -e s/v//` if test "`echo $EPM_VERSION | cut -d'.' -f1`" -gt "3" || \ test "`echo $EPM_VERSION | cut -d'.' -f1`" -eq "3" -a "`echo $EPM_VERSION | cut -d'.' -f2`" -ge "7"; then - { $as_echo "$as_me:$LINENO: result: OK, >= 3.7" >&5 -$as_echo "OK, >= 3.7" >&6; } + { echo "$as_me:$LINENO: result: OK, >= 3.7" >&5 +echo "${ECHO_T}OK, >= 3.7" >&6; } BUILD_EPM=NO if test "$_os" = "Darwin"; then - { $as_echo "$as_me:$LINENO: checking which PackageMaker EPM thinks to use" >&5 -$as_echo_n "checking which PackageMaker EPM thinks to use... " >&6; } + { echo "$as_me:$LINENO: checking which PackageMaker EPM thinks to use" >&5 +echo $ECHO_N "checking which PackageMaker EPM thinks to use... $ECHO_C" >&6; } _pm=`strings $EPM | grep PackageMaker | cut -d" " -f1` if test "$_pm" = "/Developer/Applications/PackageMaker.app/Contents/MacOS/PackageMaker"; then - { { $as_echo "$as_me:$LINENO: error: $_pm; PackageMaker expected in wrong path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" >&5 -$as_echo "$as_me: error: $_pm; PackageMaker expected in wrong path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" >&2;} + { { echo "$as_me:$LINENO: error: $_pm; PackageMaker expected in wrong path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" >&5 +echo "$as_me: error: $_pm; PackageMaker expected in wrong path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" >&2;} { (exit 1); exit 1; }; } elif test "$_pm" = "/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker"; then - { $as_echo "$as_me:$LINENO: result: $_pm, ok" >&5 -$as_echo "$_pm, ok" >&6; } + { echo "$as_me:$LINENO: result: $_pm, ok" >&5 +echo "${ECHO_T}$_pm, ok" >&6; } else # we never should get here, but go safe - { { $as_echo "$as_me:$LINENO: error: $_pm; PackageMaker expected in unknown path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" >&5 -$as_echo "$as_me: error: $_pm; PackageMaker expected in unknown path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" >&2;} + { { echo "$as_me:$LINENO: error: $_pm; PackageMaker expected in unknown path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" >&5 +echo "$as_me: error: $_pm; PackageMaker expected in unknown path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" >&2;} { (exit 1); exit 1; }; } fi fi else - { $as_echo "$as_me:$LINENO: result: too old. epm >= 3.7 is required." >&5 -$as_echo "too old. epm >= 3.7 is required." >&6; } + { echo "$as_me:$LINENO: result: too old. epm >= 3.7 is required." >&5 +echo "${ECHO_T}too old. epm >= 3.7 is required." >&6; } echo "EPM will be built." BUILD_EPM=YES BUILD_TYPE="$BUILD_TYPE EPM" @@ -12919,8 +12444,8 @@ $as_echo "too old. epm >= 3.7 is required." >&6; } fi # test which package format to use - { $as_echo "$as_me:$LINENO: checking which package format to use" >&5 -$as_echo_n "checking which package format to use... " >&6; } + { echo "$as_me:$LINENO: checking which package format to use" >&5 +echo $ECHO_N "checking which package format to use... $ECHO_C" >&6; } # epm supports the following formats: # aix - AIX software distribution # bsd - FreeBSD, NetBSD, or OpenBSD software distribution @@ -12968,8 +12493,8 @@ $as_echo_n "checking which package format to use... " >&6; } # we never should get here since we check the arciecture/os at the beginning, # but go sure... *) - { { $as_echo "$as_me:$LINENO: error: unknown system" >&5 -$as_echo "$as_me: error: unknown system" >&2;} + { { echo "$as_me:$LINENO: error: unknown system" >&5 +echo "$as_me: error: unknown system" >&2;} { (exit 1); exit 1; }; } esac if test -n "$with_package_format"; then @@ -12978,7 +12503,7 @@ $as_echo "$as_me: error: unknown system" >&2;} aix | bsd | deb | inst | tardist | osx | pkg | rpm | setld | native | portable) ;; *) - { { $as_echo "$as_me:$LINENO: error: unsupported format $i. Supported by EPM are: + { { echo "$as_me:$LINENO: error: unsupported format $i. Supported by EPM are: aix - AIX software distribution bsd - FreeBSD, NetBSD, or OpenBSD software distribution depot or swinstall - HP-UX software distribution @@ -12991,7 +12516,7 @@ setld - Tru64 (setld) software distribution native - \"Native\" software distribution for the platform portable - Portable software distribution " >&5 -$as_echo "$as_me: error: unsupported format $i. Supported by EPM are: +echo "$as_me: error: unsupported format $i. Supported by EPM are: aix - AIX software distribution bsd - FreeBSD, NetBSD, or OpenBSD software distribution depot or swinstall - HP-UX software distribution @@ -13010,11 +12535,11 @@ portable - Portable software distribution done PKGFORMAT="$with_package_format" fi - { $as_echo "$as_me:$LINENO: result: $PKGFORMAT" >&5 -$as_echo "$PKGFORMAT" >&6; } + { echo "$as_me:$LINENO: result: $PKGFORMAT" >&5 +echo "${ECHO_T}$PKGFORMAT" >&6; } if echo "$PKGFORMAT" | $EGREP rpm 2>&1 >/dev/null; then - { $as_echo "$as_me:$LINENO: checking for rpm" >&5 -$as_echo_n "checking for rpm... " >&6; } + { echo "$as_me:$LINENO: checking for rpm" >&5 +echo $ECHO_N "checking for rpm... $ECHO_C" >&6; } for a in "$RPM" rpmbuild rpm; do $a --usage >/dev/null 2> /dev/null if test $? -eq 0; then @@ -13029,22 +12554,22 @@ $as_echo_n "checking for rpm... " >&6; } fi done if test -z "$RPM" ; then - { { $as_echo "$as_me:$LINENO: error: not found" >&5 -$as_echo "$as_me: error: not found" >&2;} + { { echo "$as_me:$LINENO: error: not found" >&5 +echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } else RPM_PATH=`which $RPM` - { $as_echo "$as_me:$LINENO: result: $RPM_PATH" >&5 -$as_echo "$RPM_PATH" >&6; } + { echo "$as_me:$LINENO: result: $RPM_PATH" >&5 +echo "${ECHO_T}$RPM_PATH" >&6; } fi fi if echo "$PKGFORMAT" | $EGREP deb 2>&1 >/dev/null; then # Extract the first word of "dpkg", so it can be a program name with args. set dummy dpkg; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_DPKG+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $DPKG in [\\/]* | ?:[\\/]*) @@ -13059,7 +12584,7 @@ do 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_path_DPKG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -13072,35 +12597,35 @@ esac fi DPKG=$ac_cv_path_DPKG if test -n "$DPKG"; then - { $as_echo "$as_me:$LINENO: result: $DPKG" >&5 -$as_echo "$DPKG" >&6; } + { echo "$as_me:$LINENO: result: $DPKG" >&5 +echo "${ECHO_T}$DPKG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi if test "$DPKG" = "no"; then - { { $as_echo "$as_me:$LINENO: error: dpkg needed for deb creation. Install dpkg." >&5 -$as_echo "$as_me: error: dpkg needed for deb creation. Install dpkg." >&2;} + { { echo "$as_me:$LINENO: error: dpkg needed for deb creation. Install dpkg." >&5 +echo "$as_me: error: dpkg needed for deb creation. Install dpkg." >&2;} { (exit 1); exit 1; }; } fi fi if echo "PKGFORMAT" | $EGREP osx 2>&1 >/dev/null; then if test "$_os" = "Darwin"; then - { $as_echo "$as_me:$LINENO: checking for PackageMaker availability" >&5 -$as_echo_n "checking for PackageMaker availability... " >&6; } + { echo "$as_me:$LINENO: checking for PackageMaker availability" >&5 +echo $ECHO_N "checking for PackageMaker availability... $ECHO_C" >&6; } if ! test -x /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker; then - { { $as_echo "$as_me:$LINENO: error: not installed. Please install Apples Dev Tools" >&5 -$as_echo "$as_me: error: not installed. Please install Apples Dev Tools" >&2;} + { { echo "$as_me:$LINENO: error: not installed. Please install Apples Dev Tools" >&5 +echo "$as_me: error: not installed. Please install Apples Dev Tools" >&2;} { (exit 1); exit 1; }; } else - { $as_echo "$as_me:$LINENO: result: ok" >&5 -$as_echo "ok" >&6; } + { echo "$as_me:$LINENO: result: ok" >&5 +echo "${ECHO_T}ok" >&6; } fi else - { { $as_echo "$as_me:$LINENO: error: PackageMaker needed to build OSX packages and you are not on OSX..." >&5 -$as_echo "$as_me: error: PackageMaker needed to build OSX packages and you are not on OSX..." >&2;} + { { echo "$as_me:$LINENO: error: PackageMaker needed to build OSX packages and you are not on OSX..." >&5 +echo "$as_me: error: PackageMaker needed to build OSX packages and you are not on OSX..." >&2;} { (exit 1); exit 1; }; } fi fi @@ -13108,30 +12633,30 @@ $as_echo "$as_me: error: PackageMaker needed to build OSX packages and you are n echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then if test "$EPM" != "no" && test "$EPM" != "internal"; then if test "`echo $EPM_VERSION | cut -d'.' -f1`" -lt "4"; then - { $as_echo "$as_me:$LINENO: checking whether epm is patched for OOos needs" >&5 -$as_echo_n "checking whether epm is patched for OOos needs... " >&6; } + { echo "$as_me:$LINENO: checking whether epm is patched for OOos needs" >&5 +echo $ECHO_N "checking whether epm is patched for OOos needs... $ECHO_C" >&6; } if grep "Patched for OpenOffice.org" $EPM >/dev/null 2>/dev/null; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } if echo "$PKGFORMAT" | grep -q rpm; then _pt="rpm" - { $as_echo "$as_me:$LINENO: WARNING: the rpms will need to be installed with --nodeps" >&5 -$as_echo "$as_me: WARNING: the rpms will need to be installed with --nodeps" >&2;} + { echo "$as_me:$LINENO: WARNING: the rpms will need to be installed with --nodeps" >&5 +echo "$as_me: WARNING: the rpms will need to be installed with --nodeps" >&2;} echo "the rpms will need to be installed with --nodeps" >> warn else _pt="pkg" fi - { $as_echo "$as_me:$LINENO: WARNING: the ${_pt}s will not be relocateable" >&5 -$as_echo "$as_me: WARNING: the ${_pt}s will not be relocateable" >&2;} + { echo "$as_me:$LINENO: WARNING: the ${_pt}s will not be relocateable" >&5 +echo "$as_me: WARNING: the ${_pt}s will not be relocateable" >&2;} echo "the ${_pt}s will not be relocateable" >> warn - { $as_echo "$as_me:$LINENO: WARNING: if you want to make sure installation without --nodeps and + { echo "$as_me:$LINENO: WARNING: if you want to make sure installation without --nodeps and relocation will work, you need to patch your epm with the patch in epm/epm-3.7.patch or build with --with-epm=internal which will build a suitable epm" >&5 -$as_echo "$as_me: WARNING: if you want to make sure installation without --nodeps and +echo "$as_me: WARNING: if you want to make sure installation without --nodeps and relocation will work, you need to patch your epm with the patch in epm/epm-3.7.patch or build with --with-epm=internal which will build a suitable epm" >&2;} @@ -13142,10 +12667,10 @@ $as_echo "$as_me: WARNING: if you want to make sure installation without --nodep if echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then # Extract the first word of "pkgmk", so it can be a program name with args. set dummy pkgmk; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKGMK+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKGMK in [\\/]* | ?:[\\/]*) @@ -13160,7 +12685,7 @@ do 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_path_PKGMK="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -13173,17 +12698,17 @@ esac fi PKGMK=$ac_cv_path_PKGMK if test -n "$PKGMK"; then - { $as_echo "$as_me:$LINENO: result: $PKGMK" >&5 -$as_echo "$PKGMK" >&6; } + { echo "$as_me:$LINENO: result: $PKGMK" >&5 +echo "${ECHO_T}$PKGMK" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi if test "$PKGMK" = "no"; then - { { $as_echo "$as_me:$LINENO: error: pkgmk needed for Solaris pkg creation. Install it." >&5 -$as_echo "$as_me: error: pkgmk needed for Solaris pkg creation. Install it." >&2;} + { { echo "$as_me:$LINENO: error: pkgmk needed for Solaris pkg creation. Install it." >&5 +echo "$as_me: error: pkgmk needed for Solaris pkg creation. Install it." >&2;} { (exit 1); exit 1; }; } fi fi @@ -13193,18 +12718,18 @@ $as_echo "$as_me: error: pkgmk needed for Solaris pkg creation. Install it." >&2 else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } EPM=NO fi # Extract the first word of "gperf", so it can be a program name with args. set dummy gperf; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_GPERF+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $GPERF in [\\/]* | ?:[\\/]*) @@ -13219,7 +12744,7 @@ do 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_path_GPERF="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -13231,64 +12756,64 @@ esac fi GPERF=$ac_cv_path_GPERF if test -n "$GPERF"; then - { $as_echo "$as_me:$LINENO: result: $GPERF" >&5 -$as_echo "$GPERF" >&6; } + { echo "$as_me:$LINENO: result: $GPERF" >&5 +echo "${ECHO_T}$GPERF" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi if test -z "$GPERF"; then - { { $as_echo "$as_me:$LINENO: error: gperf not found but needed. Install it." >&5 -$as_echo "$as_me: error: gperf not found but needed. Install it." >&2;} + { { echo "$as_me:$LINENO: error: gperf not found but needed. Install it." >&5 +echo "$as_me: error: gperf not found but needed. Install it." >&2;} { (exit 1); exit 1; }; } fi -{ $as_echo "$as_me:$LINENO: checking gperf version" >&5 -$as_echo_n "checking gperf version... " >&6; } +{ echo "$as_me:$LINENO: checking gperf version" >&5 +echo $ECHO_N "checking gperf version... $ECHO_C" >&6; } if test "`$GPERF --version | $EGREP ^GNU\ gperf | $AWK '{ print $3 }' | cut -d. -f1`" -ge "3"; then - { $as_echo "$as_me:$LINENO: result: OK" >&5 -$as_echo "OK" >&6; } + { echo "$as_me:$LINENO: result: OK" >&5 +echo "${ECHO_T}OK" >&6; } else - { { $as_echo "$as_me:$LINENO: error: too old, you need at least 3.0.0" >&5 -$as_echo "$as_me: error: too old, you need at least 3.0.0" >&2;} + { { echo "$as_me:$LINENO: error: too old, you need at least 3.0.0" >&5 +echo "$as_me: error: too old, you need at least 3.0.0" >&2;} { (exit 1); exit 1; }; } fi -{ $as_echo "$as_me:$LINENO: checking whether to build the ODK" >&5 -$as_echo_n "checking whether to build the ODK... " >&6; } +{ echo "$as_me:$LINENO: checking whether to build the ODK" >&5 +echo $ECHO_N "checking whether to build the ODK... $ECHO_C" >&6; } if test "z$enable_odk" = "z" -o "$enable_odk" != "no"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } if test "$WITH_JAVA" != "no"; then - { $as_echo "$as_me:$LINENO: checking for external/unowinreg/unowinreg.dll" >&5 -$as_echo_n "checking for external/unowinreg/unowinreg.dll... " >&6; } + { echo "$as_me:$LINENO: checking for external/unowinreg/unowinreg.dll" >&5 +echo $ECHO_N "checking for external/unowinreg/unowinreg.dll... $ECHO_C" >&6; } if ! test -f "./external/unowinreg/unowinreg.dll"; then HAVE_UNOWINREG_DLL=no else HAVE_UNOWINREG_DLL=yes fi if test "$HAVE_UNOWINREG_DLL" = "yes"; then - { $as_echo "$as_me:$LINENO: result: found" >&5 -$as_echo "found" >&6; } + { echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6; } BUILD_UNOWINREG=NO else if test "$_os" = "WINNT"; then - { $as_echo "$as_me:$LINENO: result: not found, will be built" >&5 -$as_echo "not found, will be built" >&6; } + { echo "$as_me:$LINENO: result: not found, will be built" >&5 +echo "${ECHO_T}not found, will be built" >&6; } else - { $as_echo "$as_me:$LINENO: WARNING: not found, will be cross-built using mingw32" >&5 -$as_echo "$as_me: WARNING: not found, will be cross-built using mingw32" >&2;} + { echo "$as_me:$LINENO: WARNING: not found, will be cross-built using mingw32" >&5 +echo "$as_me: WARNING: not found, will be cross-built using mingw32" >&2;} fi BUILD_UNOWINREG=YES fi if test "$_os" != "WINNT" && test "$BUILD_UNOWINREG" = "YES"; then if test -z "$WITH_MINGWIN" || test "$WITH_MINGWIN" = "0"; then - { { $as_echo "$as_me:$LINENO: error: for rebuilding unowinreg.dll you need the mingw32 C++ compiler. + { { echo "$as_me:$LINENO: error: for rebuilding unowinreg.dll you need the mingw32 C++ compiler. Specify mingw32 g++ executable name with --with-mingwin. Or use prebuilt one from http://tools.openoffice.org/unowinreg_prebuild/680/ and put it into external/unowinreg" >&5 -$as_echo "$as_me: error: for rebuilding unowinreg.dll you need the mingw32 C++ compiler. +echo "$as_me: error: for rebuilding unowinreg.dll you need the mingw32 C++ compiler. Specify mingw32 g++ executable name with --with-mingwin. Or use prebuilt one from http://tools.openoffice.org/unowinreg_prebuild/680/ and put it into external/unowinreg" >&2;} @@ -13300,10 +12825,10 @@ $as_echo "$as_me: error: for rebuilding unowinreg.dll you need the mingw32 C++ c if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}$WITH_MINGWIN", so it can be a program name with args. set dummy ${ac_tool_prefix}$WITH_MINGWIN; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_MINGWCXX+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$MINGWCXX"; then ac_cv_prog_MINGWCXX="$MINGWCXX" # Let the user override the test. @@ -13316,7 +12841,7 @@ do 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_MINGWCXX="${ac_tool_prefix}$WITH_MINGWIN" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -13327,11 +12852,11 @@ fi fi MINGWCXX=$ac_cv_prog_MINGWCXX if test -n "$MINGWCXX"; then - { $as_echo "$as_me:$LINENO: result: $MINGWCXX" >&5 -$as_echo "$MINGWCXX" >&6; } + { echo "$as_me:$LINENO: result: $MINGWCXX" >&5 +echo "${ECHO_T}$MINGWCXX" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -13340,10 +12865,10 @@ if test -z "$ac_cv_prog_MINGWCXX"; then ac_ct_MINGWCXX=$MINGWCXX # Extract the first word of "$WITH_MINGWIN", so it can be a program name with args. set dummy $WITH_MINGWIN; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ 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_MINGWCXX+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$ac_ct_MINGWCXX"; then ac_cv_prog_ac_ct_MINGWCXX="$ac_ct_MINGWCXX" # Let the user override the test. @@ -13356,7 +12881,7 @@ do 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_MINGWCXX="$WITH_MINGWIN" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -13367,11 +12892,11 @@ fi fi ac_ct_MINGWCXX=$ac_cv_prog_ac_ct_MINGWCXX if test -n "$ac_ct_MINGWCXX"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_MINGWCXX" >&5 -$as_echo "$ac_ct_MINGWCXX" >&6; } + { echo "$as_me:$LINENO: result: $ac_ct_MINGWCXX" >&5 +echo "${ECHO_T}$ac_ct_MINGWCXX" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi if test "x$ac_ct_MINGWCXX" = x; then @@ -13379,8 +12904,12 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ 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 MINGWCXX=$ac_ct_MINGWCXX @@ -13391,19 +12920,19 @@ fi fi if test "$MINGWCXX" = "false"; then - { { $as_echo "$as_me:$LINENO: error: specified MinGW32 C++ cross-compiler not found. Install it or correct name." >&5 -$as_echo "$as_me: error: specified MinGW32 C++ cross-compiler not found. Install it or correct name." >&2;} + { { echo "$as_me:$LINENO: error: specified MinGW32 C++ cross-compiler not found. Install it or correct name." >&5 +echo "$as_me: error: specified MinGW32 C++ cross-compiler not found. Install it or correct name." >&2;} { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:$LINENO: checking whether we are using the MinGW32 cross C++ compiler" >&5 -$as_echo_n "checking whether we are using the MinGW32 cross C++ compiler... " >&6; } + { echo "$as_me:$LINENO: checking whether we are using the MinGW32 cross C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the MinGW32 cross C++ compiler... $ECHO_C" >&6; } if ! echo "`$MINGWCXX -dumpmachine`" | grep -q mingw32; then - { { $as_echo "$as_me:$LINENO: error: no" >&5 -$as_echo "$as_me: error: no" >&2;} + { { echo "$as_me:$LINENO: error: no" >&5 +echo "$as_me: error: no" >&2;} { (exit 1); exit 1; }; } else - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } fi if echo "$WITH_MINGWIN" | $EGREP -q "/"; then if ! test -x "`echo $WITH_MINGWIN | $SED -e s/g++/strip/`"; then MINGSTRIP=false; else MINGWSTRIP=$(basename $(echo $WITH_MINGWIN | $SED -e s/g++/strip/)); fi @@ -13411,10 +12940,10 @@ $as_echo "yes" >&6; } if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/`", so it can be a program name with args. set dummy ${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/`; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_MINGWSTRIP+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$MINGWSTRIP"; then ac_cv_prog_MINGWSTRIP="$MINGWSTRIP" # Let the user override the test. @@ -13427,7 +12956,7 @@ do 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_MINGWSTRIP="${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/`" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -13438,11 +12967,11 @@ fi fi MINGWSTRIP=$ac_cv_prog_MINGWSTRIP if test -n "$MINGWSTRIP"; then - { $as_echo "$as_me:$LINENO: result: $MINGWSTRIP" >&5 -$as_echo "$MINGWSTRIP" >&6; } + { echo "$as_me:$LINENO: result: $MINGWSTRIP" >&5 +echo "${ECHO_T}$MINGWSTRIP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -13451,10 +12980,10 @@ if test -z "$ac_cv_prog_MINGWSTRIP"; then ac_ct_MINGWSTRIP=$MINGWSTRIP # Extract the first word of "`echo $WITH_MINGWIN | $SED -e s/g++/strip/`", so it can be a program name with args. set dummy `echo $WITH_MINGWIN | $SED -e s/g++/strip/`; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ 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_MINGWSTRIP+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$ac_ct_MINGWSTRIP"; then ac_cv_prog_ac_ct_MINGWSTRIP="$ac_ct_MINGWSTRIP" # Let the user override the test. @@ -13467,7 +12996,7 @@ do 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_MINGWSTRIP="`echo $WITH_MINGWIN | $SED -e s/g++/strip/`" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -13478,11 +13007,11 @@ fi fi ac_ct_MINGWSTRIP=$ac_cv_prog_ac_ct_MINGWSTRIP if test -n "$ac_ct_MINGWSTRIP"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_MINGWSTRIP" >&5 -$as_echo "$ac_ct_MINGWSTRIP" >&6; } + { echo "$as_me:$LINENO: result: $ac_ct_MINGWSTRIP" >&5 +echo "${ECHO_T}$ac_ct_MINGWSTRIP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi if test "x$ac_ct_MINGWSTRIP" = x; then @@ -13490,8 +13019,12 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ 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 MINGWSTRIP=$ac_ct_MINGWSTRIP @@ -13502,8 +13035,8 @@ fi fi if test "$MINGWSTRIP" = "false"; then - { { $as_echo "$as_me:$LINENO: error: MinGW32 binutils needed. Install them." >&5 -$as_echo "$as_me: error: MinGW32 binutils needed. Install them." >&2;} + { { echo "$as_me:$LINENO: error: MinGW32 binutils needed. Install them." >&5 +echo "$as_me: error: MinGW32 binutils needed. Install them." >&2;} { (exit 1); exit 1; }; } fi ac_ext=cpp @@ -13525,10 +13058,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu save_LIBS=$LIBS LIBS="" -{ $as_echo "$as_me:$LINENO: checking for main in -lkernel32" >&5 -$as_echo_n "checking for main in -lkernel32... " >&6; } +{ echo "$as_me:$LINENO: checking for main in -lkernel32" >&5 +echo $ECHO_N "checking for main in -lkernel32... $ECHO_C" >&6; } if test "${ac_cv_lib_kernel32_main+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lkernel32 $LIBS" @@ -13554,37 +13087,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_kernel32_main=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_kernel32_main=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_kernel32_main" >&5 -$as_echo "$ac_cv_lib_kernel32_main" >&6; } -if test "x$ac_cv_lib_kernel32_main" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_kernel32_main" >&5 +echo "${ECHO_T}$ac_cv_lib_kernel32_main" >&6; } +if test $ac_cv_lib_kernel32_main = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBKERNEL32 1 _ACEOF @@ -13595,10 +13124,10 @@ fi ac_cv_lib_kernel32=ac_cv_lib_kernel32_main -{ $as_echo "$as_me:$LINENO: checking for main in -ladvapi32" >&5 -$as_echo_n "checking for main in -ladvapi32... " >&6; } +{ echo "$as_me:$LINENO: checking for main in -ladvapi32" >&5 +echo $ECHO_N "checking for main in -ladvapi32... $ECHO_C" >&6; } if test "${ac_cv_lib_advapi32_main+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ladvapi32 $LIBS" @@ -13624,37 +13153,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_advapi32_main=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_advapi32_main=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_advapi32_main" >&5 -$as_echo "$ac_cv_lib_advapi32_main" >&6; } -if test "x$ac_cv_lib_advapi32_main" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_advapi32_main" >&5 +echo "${ECHO_T}$ac_cv_lib_advapi32_main" >&6; } +if test $ac_cv_lib_advapi32_main = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBADVAPI32 1 _ACEOF @@ -13665,17 +13190,17 @@ fi ac_cv_lib_advapi32=ac_cv_lib_advapi32_main if test "${ac_cv_header_windows_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for windows.h" >&5 -$as_echo_n "checking for windows.h... " >&6; } + { echo "$as_me:$LINENO: checking for windows.h" >&5 +echo $ECHO_N "checking for windows.h... $ECHO_C" >&6; } if test "${ac_cv_header_windows_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_windows_h" >&5 -$as_echo "$ac_cv_header_windows_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_windows_h" >&5 +echo "${ECHO_T}$ac_cv_header_windows_h" >&6; } else # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking windows.h usability" >&5 -$as_echo_n "checking windows.h usability... " >&6; } +{ echo "$as_me:$LINENO: checking windows.h usability" >&5 +echo $ECHO_N "checking windows.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -13691,33 +13216,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ $as_echo "$as_me:$LINENO: checking windows.h presence" >&5 -$as_echo_n "checking windows.h presence... " >&6; } +{ echo "$as_me:$LINENO: checking windows.h presence" >&5 +echo $ECHO_N "checking windows.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -13731,71 +13255,70 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: windows.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: windows.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: windows.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: windows.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: windows.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: windows.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: windows.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: windows.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: windows.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: windows.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: windows.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: windows.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: windows.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: windows.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: windows.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: windows.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: windows.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: windows.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: windows.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: windows.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: windows.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: windows.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: windows.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: windows.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: windows.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: windows.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: windows.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: windows.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: windows.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: windows.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: windows.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: windows.h: in the future, the compiler will take precedence" >&2;} ;; esac -{ $as_echo "$as_me:$LINENO: checking for windows.h" >&5 -$as_echo_n "checking for windows.h... " >&6; } +{ echo "$as_me:$LINENO: checking for windows.h" >&5 +echo $ECHO_N "checking for windows.h... $ECHO_C" >&6; } if test "${ac_cv_header_windows_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_windows_h=$ac_header_preproc fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_windows_h" >&5 -$as_echo "$ac_cv_header_windows_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_windows_h" >&5 +echo "${ECHO_T}$ac_cv_header_windows_h" >&6; } fi -if test "x$ac_cv_header_windows_h" = x""yes; then +if test $ac_cv_header_windows_h = yes; then : else - { { $as_echo "$as_me:$LINENO: error: windows.h missing" >&5 -$as_echo "$as_me: error: windows.h missing" >&2;} + { { echo "$as_me:$LINENO: error: windows.h missing" >&5 +echo "$as_me: error: windows.h missing" >&2;} { (exit 1); exit 1; }; } fi @@ -13815,47 +13338,47 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi BUILD_TYPE="$BUILD_TYPE ODK" else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } BUILD_UNOWINREG=NO fi -{ $as_echo "$as_me:$LINENO: checking whether to build qadevOOo" >&5 -$as_echo_n "checking whether to build qadevOOo... " >&6; } +{ echo "$as_me:$LINENO: checking whether to build qadevOOo" >&5 +echo $ECHO_N "checking whether to build qadevOOo... $ECHO_C" >&6; } if test "z$enable_qadevooo" = "z" -o "$enable_qadevooo" != "no"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } BUILD_QADEVOOO="YES" BUILD_TYPE="$BUILD_TYPE QADEVOOO" else BUILD_QADEVOOO="NO" - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi if test -z "$with_system_stdlibs" -a -z "$with_system_libs"; then if test -n "$checkforprelink" -a -f /etc/rpm/macros.prelink; then with_system_stdlibs=yes - { $as_echo "$as_me:$LINENO: WARNING: prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >&5 -$as_echo "$as_me: WARNING: prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >&2;} + { echo "$as_me:$LINENO: WARNING: prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >&5 +echo "$as_me: WARNING: prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >&2;} echo "prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >> warn fi fi -{ $as_echo "$as_me:$LINENO: checking whether to provide libstdc++/libgcc_s in the installset" >&5 -$as_echo_n "checking whether to provide libstdc++/libgcc_s in the installset... " >&6; } +{ echo "$as_me:$LINENO: checking whether to provide libstdc++/libgcc_s in the installset" >&5 +echo $ECHO_N "checking whether to provide libstdc++/libgcc_s in the installset... $ECHO_C" >&6; } if test -n "$with_system_stdlibs" -o -n "$with_system_libs" && \ test "$with_system_stdlibs" != "no"; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } SYSTEM_STDLIBS=YES else - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } SYSTEM_STDLIBS=NO fi @@ -13863,25 +13386,25 @@ fi if test "$_os" = "Darwin" && test "$with_system_zlib" != "no"; then with_system_zlib=yes fi -{ $as_echo "$as_me:$LINENO: checking which zlib to use" >&5 -$as_echo_n "checking which zlib to use... " >&6; } +{ echo "$as_me:$LINENO: checking which zlib to use" >&5 +echo $ECHO_N "checking which zlib to use... $ECHO_C" >&6; } if test -n "$with_system_zlib" -o -n "$with_system_libs" && \ test "$with_system_zlib" != "no"; then - { $as_echo "$as_me:$LINENO: result: external" >&5 -$as_echo "external" >&6; } + { echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6; } SYSTEM_ZLIB=YES if test "${ac_cv_header_zlib_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for zlib.h" >&5 -$as_echo_n "checking for zlib.h... " >&6; } + { echo "$as_me:$LINENO: checking for zlib.h" >&5 +echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; } if test "${ac_cv_header_zlib_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 -$as_echo "$ac_cv_header_zlib_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 +echo "${ECHO_T}$ac_cv_header_zlib_h" >&6; } else # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking zlib.h usability" >&5 -$as_echo_n "checking zlib.h usability... " >&6; } +{ echo "$as_me:$LINENO: checking zlib.h usability" >&5 +echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -13897,33 +13420,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_header_compiler=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ $as_echo "$as_me:$LINENO: checking zlib.h presence" >&5 -$as_echo_n "checking zlib.h presence... " >&6; } +{ echo "$as_me:$LINENO: checking zlib.h presence" >&5 +echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -13937,79 +13459,78 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;} ;; esac -{ $as_echo "$as_me:$LINENO: checking for zlib.h" >&5 -$as_echo_n "checking for zlib.h... " >&6; } +{ echo "$as_me:$LINENO: checking for zlib.h" >&5 +echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; } if test "${ac_cv_header_zlib_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_zlib_h=$ac_header_preproc fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 -$as_echo "$ac_cv_header_zlib_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 +echo "${ECHO_T}$ac_cv_header_zlib_h" >&6; } fi -if test "x$ac_cv_header_zlib_h" = x""yes; then +if test $ac_cv_header_zlib_h = yes; then : else - { { $as_echo "$as_me:$LINENO: error: zlib.h not found. install zlib" >&5 -$as_echo "$as_me: error: zlib.h not found. install zlib" >&2;} + { { echo "$as_me:$LINENO: error: zlib.h not found. install zlib" >&5 +echo "$as_me: error: zlib.h not found. install zlib" >&2;} { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:$LINENO: checking for deflate in -lz" >&5 -$as_echo_n "checking for deflate in -lz... " >&6; } + { echo "$as_me:$LINENO: checking for deflate in -lz" >&5 +echo $ECHO_N "checking for deflate in -lz... $ECHO_C" >&6; } if test "${ac_cv_lib_z_deflate+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lz $LIBS" @@ -14041,71 +13562,67 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_z_deflate=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_z_deflate=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_deflate" >&5 -$as_echo "$ac_cv_lib_z_deflate" >&6; } -if test "x$ac_cv_lib_z_deflate" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_deflate" >&5 +echo "${ECHO_T}$ac_cv_lib_z_deflate" >&6; } +if test $ac_cv_lib_z_deflate = yes; then ZLIB=-lz else - { { $as_echo "$as_me:$LINENO: error: zlib not found or functional" >&5 -$as_echo "$as_me: error: zlib not found or functional" >&2;} + { { echo "$as_me:$LINENO: error: zlib not found or functional" >&5 +echo "$as_me: error: zlib not found or functional" >&2;} { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:$LINENO: result: internal" >&5 -$as_echo "internal" >&6; } + { echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6; } SYSTEM_ZLIB=NO BUILD_TYPE="$BUILD_TYPE ZLIB" fi -{ $as_echo "$as_me:$LINENO: checking which jpeg to use" >&5 -$as_echo_n "checking which jpeg to use... " >&6; } +{ echo "$as_me:$LINENO: checking which jpeg to use" >&5 +echo $ECHO_N "checking which jpeg to use... $ECHO_C" >&6; } if test -n "$with_system_jpeg" -o -n "$with_system_libs" && \ test "$with_system_jpeg" != "no"; then - { $as_echo "$as_me:$LINENO: result: external" >&5 -$as_echo "external" >&6; } + { echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6; } SYSTEM_JPEG=YES if test "${ac_cv_header_jpeglib_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for jpeglib.h" >&5 -$as_echo_n "checking for jpeglib.h... " >&6; } + { echo "$as_me:$LINENO: checking for jpeglib.h" >&5 +echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6; } if test "${ac_cv_header_jpeglib_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5 -$as_echo "$ac_cv_header_jpeglib_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5 +echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6; } else # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking jpeglib.h usability" >&5 -$as_echo_n "checking jpeglib.h usability... " >&6; } +{ echo "$as_me:$LINENO: checking jpeglib.h usability" >&5 +echo $ECHO_N "checking jpeglib.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -14121,33 +13638,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_header_compiler=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ $as_echo "$as_me:$LINENO: checking jpeglib.h presence" >&5 -$as_echo_n "checking jpeglib.h presence... " >&6; } +{ echo "$as_me:$LINENO: checking jpeglib.h presence" >&5 +echo $ECHO_N "checking jpeglib.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -14161,79 +13677,78 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: jpeglib.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: jpeglib.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: jpeglib.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: jpeglib.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: jpeglib.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: jpeglib.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: jpeglib.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: jpeglib.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: jpeglib.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: jpeglib.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: jpeglib.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: jpeglib.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: jpeglib.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: jpeglib.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&2;} ;; esac -{ $as_echo "$as_me:$LINENO: checking for jpeglib.h" >&5 -$as_echo_n "checking for jpeglib.h... " >&6; } +{ echo "$as_me:$LINENO: checking for jpeglib.h" >&5 +echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6; } if test "${ac_cv_header_jpeglib_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_jpeglib_h=$ac_header_preproc fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5 -$as_echo "$ac_cv_header_jpeglib_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5 +echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6; } fi -if test "x$ac_cv_header_jpeglib_h" = x""yes; then +if test $ac_cv_header_jpeglib_h = yes; then : else - { { $as_echo "$as_me:$LINENO: error: jpeg.h not found. install libjpeg" >&5 -$as_echo "$as_me: error: jpeg.h not found. install libjpeg" >&2;} + { { echo "$as_me:$LINENO: error: jpeg.h not found. install libjpeg" >&5 +echo "$as_me: error: jpeg.h not found. install libjpeg" >&2;} { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:$LINENO: checking for jpeg_resync_to_restart in -ljpeg" >&5 -$as_echo_n "checking for jpeg_resync_to_restart in -ljpeg... " >&6; } + { echo "$as_me:$LINENO: checking for jpeg_resync_to_restart in -ljpeg" >&5 +echo $ECHO_N "checking for jpeg_resync_to_restart in -ljpeg... $ECHO_C" >&6; } if test "${ac_cv_lib_jpeg_jpeg_resync_to_restart+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ljpeg $LIBS" @@ -14265,70 +13780,66 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_jpeg_jpeg_resync_to_restart=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_jpeg_jpeg_resync_to_restart=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$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" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_resync_to_restart" >&5 +echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_resync_to_restart" >&6; } +if test $ac_cv_lib_jpeg_jpeg_resync_to_restart = yes; then JPEG3RDLIB=-ljpeg else - { $as_echo "$as_me:$LINENO: checking jpeg library not found or fuctional" >&5 -$as_echo_n "checking jpeg library not found or fuctional... " >&6; } + { echo "$as_me:$LINENO: checking jpeg library not found or fuctional" >&5 +echo $ECHO_N "checking jpeg library not found or fuctional... $ECHO_C" >&6; } fi else - { $as_echo "$as_me:$LINENO: result: internal" >&5 -$as_echo "internal" >&6; } + { echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6; } SYSTEM_JPEG=NO BUILD_TYPE="$BUILD_TYPE JPEG" fi -{ $as_echo "$as_me:$LINENO: checking which expat to use" >&5 -$as_echo_n "checking which expat to use... " >&6; } +{ echo "$as_me:$LINENO: checking which expat to use" >&5 +echo $ECHO_N "checking which expat to use... $ECHO_C" >&6; } if test -n "$with_system_expat" -o -n "$with_system_libs" && \ test "$with_system_expat" != "no"; then - { $as_echo "$as_me:$LINENO: result: external" >&5 -$as_echo "external" >&6; } + { echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6; } SYSTEM_EXPAT=YES if test "${ac_cv_header_expat_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for expat.h" >&5 -$as_echo_n "checking for expat.h... " >&6; } + { echo "$as_me:$LINENO: checking for expat.h" >&5 +echo $ECHO_N "checking for expat.h... $ECHO_C" >&6; } if test "${ac_cv_header_expat_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5 -$as_echo "$ac_cv_header_expat_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5 +echo "${ECHO_T}$ac_cv_header_expat_h" >&6; } else # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking expat.h usability" >&5 -$as_echo_n "checking expat.h usability... " >&6; } +{ echo "$as_me:$LINENO: checking expat.h usability" >&5 +echo $ECHO_N "checking expat.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -14344,33 +13855,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_header_compiler=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ $as_echo "$as_me:$LINENO: checking expat.h presence" >&5 -$as_echo_n "checking expat.h presence... " >&6; } +{ echo "$as_me:$LINENO: checking expat.h presence" >&5 +echo $ECHO_N "checking expat.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -14384,80 +13894,79 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: expat.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: expat.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: expat.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: expat.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: expat.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: expat.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: expat.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: expat.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: expat.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: expat.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: expat.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: expat.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: expat.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: expat.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: expat.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: expat.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: expat.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: expat.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: expat.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: expat.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: expat.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: expat.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: expat.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: expat.h: in the future, the compiler will take precedence" >&2;} ;; esac -{ $as_echo "$as_me:$LINENO: checking for expat.h" >&5 -$as_echo_n "checking for expat.h... " >&6; } +{ echo "$as_me:$LINENO: checking for expat.h" >&5 +echo $ECHO_N "checking for expat.h... $ECHO_C" >&6; } if test "${ac_cv_header_expat_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_expat_h=$ac_header_preproc fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5 -$as_echo "$ac_cv_header_expat_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5 +echo "${ECHO_T}$ac_cv_header_expat_h" >&6; } fi -if test "x$ac_cv_header_expat_h" = x""yes; then +if test $ac_cv_header_expat_h = yes; then : else - { { $as_echo "$as_me:$LINENO: error: expat.h not found. install expat" >&5 -$as_echo "$as_me: error: expat.h not found. install expat" >&2;} + { { echo "$as_me:$LINENO: error: expat.h not found. install expat" >&5 +echo "$as_me: error: expat.h not found. install expat" >&2;} { (exit 1); exit 1; }; } fi -{ $as_echo "$as_me:$LINENO: checking for XML_ParserCreate in -lexpat" >&5 -$as_echo_n "checking for XML_ParserCreate in -lexpat... " >&6; } +{ echo "$as_me:$LINENO: checking for XML_ParserCreate in -lexpat" >&5 +echo $ECHO_N "checking for XML_ParserCreate in -lexpat... $ECHO_C" >&6; } if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lexpat $LIBS" @@ -14489,37 +13998,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_expat_XML_ParserCreate=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_expat_XML_ParserCreate=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$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" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_expat_XML_ParserCreate" >&5 +echo "${ECHO_T}$ac_cv_lib_expat_XML_ParserCreate" >&6; } +if test $ac_cv_lib_expat_XML_ParserCreate = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBEXPAT 1 _ACEOF @@ -14527,24 +14032,24 @@ _ACEOF LIBS="-lexpat $LIBS" else - { $as_echo "$as_me:$LINENO: result: expat library not found or functional." >&5 -$as_echo "expat library not found or functional." >&6; } + { echo "$as_me:$LINENO: result: expat library not found or functional." >&5 +echo "${ECHO_T}expat library not found or functional." >&6; } fi else - { $as_echo "$as_me:$LINENO: result: internal" >&5 -$as_echo "internal" >&6; } + { echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6; } SYSTEM_EXPAT=NO BUILD_TYPE="$BUILD_TYPE EXPAT" fi -{ $as_echo "$as_me:$LINENO: checking which libwpd to use" >&5 -$as_echo_n "checking which libwpd to use... " >&6; } +{ echo "$as_me:$LINENO: checking which libwpd to use" >&5 +echo $ECHO_N "checking which libwpd to use... $ECHO_C" >&6; } if test -n "$with_system_libwpd" -o -n "$with_system_libs" && \ test "$with_system_libwpd" != "no"; then - { $as_echo "$as_me:$LINENO: result: external" >&5 -$as_echo "external" >&6; } + { echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6; } SYSTEM_LIBWPD=YES succeeded=no @@ -14552,10 +14057,10 @@ $as_echo "external" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -14570,7 +14075,7 @@ do 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -14583,11 +14088,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -14601,25 +14106,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:$LINENO: checking for libwpd-0.8 " >&5 -$as_echo_n "checking for libwpd-0.8 ... " >&6; } + { echo "$as_me:$LINENO: checking for libwpd-0.8 " >&5 +echo $ECHO_N "checking for libwpd-0.8 ... $ECHO_C" >&6; } if $PKG_CONFIG --exists "libwpd-0.8 " ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=yes - { $as_echo "$as_me:$LINENO: checking LIBWPD_CFLAGS" >&5 -$as_echo_n "checking LIBWPD_CFLAGS... " >&6; } + { echo "$as_me:$LINENO: checking LIBWPD_CFLAGS" >&5 +echo $ECHO_N "checking LIBWPD_CFLAGS... $ECHO_C" >&6; } LIBWPD_CFLAGS=`$PKG_CONFIG --cflags "libwpd-0.8 "` - { $as_echo "$as_me:$LINENO: result: $LIBWPD_CFLAGS" >&5 -$as_echo "$LIBWPD_CFLAGS" >&6; } + { echo "$as_me:$LINENO: result: $LIBWPD_CFLAGS" >&5 +echo "${ECHO_T}$LIBWPD_CFLAGS" >&6; } - { $as_echo "$as_me:$LINENO: checking LIBWPD_LIBS" >&5 -$as_echo_n "checking LIBWPD_LIBS... " >&6; } + { echo "$as_me:$LINENO: checking LIBWPD_LIBS" >&5 +echo $ECHO_N "checking LIBWPD_LIBS... $ECHO_C" >&6; } LIBWPD_LIBS=`$PKG_CONFIG --libs "libwpd-0.8 "` - { $as_echo "$as_me:$LINENO: result: $LIBWPD_LIBS" >&5 -$as_echo "$LIBWPD_LIBS" >&6; } + { echo "$as_me:$LINENO: result: $LIBWPD_LIBS" >&5 +echo "${ECHO_T}$LIBWPD_LIBS" >&6; } else LIBWPD_CFLAGS="" LIBWPD_LIBS="" @@ -14640,14 +14145,14 @@ $as_echo "$LIBWPD_LIBS" >&6; } if test $succeeded = yes; then : else - { { $as_echo "$as_me:$LINENO: error: Library requirements (libwpd-0.8 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -$as_echo "$as_me: error: Library requirements (libwpd-0.8 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { { echo "$as_me:$LINENO: error: Library requirements (libwpd-0.8 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (libwpd-0.8 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:$LINENO: result: internal" >&5 -$as_echo "internal" >&6; } + { echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6; } SYSTEM_LIBWPD=NO BUILD_TYPE="$BUILD_TYPE LIBWPD" fi @@ -14656,18 +14161,18 @@ fi if test "$test_freetype" = "yes"; then - { $as_echo "$as_me:$LINENO: checking whether freetype is available" >&5 -$as_echo_n "checking whether freetype is available... " >&6; } + { echo "$as_me:$LINENO: checking whether freetype is available" >&5 +echo $ECHO_N "checking whether freetype is available... $ECHO_C" >&6; } succeeded=no if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -14682,7 +14187,7 @@ do 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -14695,11 +14200,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -14713,25 +14218,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:$LINENO: checking for freetype2 >= 2.0 " >&5 -$as_echo_n "checking for freetype2 >= 2.0 ... " >&6; } + { echo "$as_me:$LINENO: checking for freetype2 >= 2.0 " >&5 +echo $ECHO_N "checking for freetype2 >= 2.0 ... $ECHO_C" >&6; } if $PKG_CONFIG --exists "freetype2 >= 2.0 " ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=yes - { $as_echo "$as_me:$LINENO: checking FREETYPE_CFLAGS" >&5 -$as_echo_n "checking FREETYPE_CFLAGS... " >&6; } + { echo "$as_me:$LINENO: checking FREETYPE_CFLAGS" >&5 +echo $ECHO_N "checking FREETYPE_CFLAGS... $ECHO_C" >&6; } FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2 >= 2.0 "` - { $as_echo "$as_me:$LINENO: result: $FREETYPE_CFLAGS" >&5 -$as_echo "$FREETYPE_CFLAGS" >&6; } + { echo "$as_me:$LINENO: result: $FREETYPE_CFLAGS" >&5 +echo "${ECHO_T}$FREETYPE_CFLAGS" >&6; } - { $as_echo "$as_me:$LINENO: checking FREETYPE_LIBS" >&5 -$as_echo_n "checking FREETYPE_LIBS... " >&6; } + { echo "$as_me:$LINENO: checking FREETYPE_LIBS" >&5 +echo $ECHO_N "checking FREETYPE_LIBS... $ECHO_C" >&6; } FREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2 >= 2.0 "` - { $as_echo "$as_me:$LINENO: result: $FREETYPE_LIBS" >&5 -$as_echo "$FREETYPE_LIBS" >&6; } + { echo "$as_me:$LINENO: result: $FREETYPE_LIBS" >&5 +echo "${ECHO_T}$FREETYPE_LIBS" >&6; } else FREETYPE_CFLAGS="" FREETYPE_LIBS="" @@ -14752,8 +14257,8 @@ $as_echo "$FREETYPE_LIBS" >&6; } if test $succeeded = yes; then : else - { { $as_echo "$as_me:$LINENO: error: Library requirements (freetype2 >= 2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -$as_echo "$as_me: error: Library requirements (freetype2 >= 2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { { echo "$as_me:$LINENO: error: Library requirements (freetype2 >= 2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (freetype2 >= 2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi @@ -14767,10 +14272,10 @@ if test "$test_freetype" = "yes"; then save_LIBS="$LIBS" CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS" LDFLAGS="$LDFLAGS $FREETYPE_LIBS" - { $as_echo "$as_me:$LINENO: checking for FT_GlyphSlot_Embolden in -lfreetype" >&5 -$as_echo_n "checking for FT_GlyphSlot_Embolden in -lfreetype... " >&6; } + { echo "$as_me:$LINENO: checking for FT_GlyphSlot_Embolden in -lfreetype" >&5 +echo $ECHO_N "checking for FT_GlyphSlot_Embolden in -lfreetype... $ECHO_C" >&6; } if test "${ac_cv_lib_freetype_FT_GlyphSlot_Embolden+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lfreetype $LIBS" @@ -14802,37 +14307,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_freetype_FT_GlyphSlot_Embolden=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_freetype_FT_GlyphSlot_Embolden=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$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" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_freetype_FT_GlyphSlot_Embolden" >&5 +echo "${ECHO_T}$ac_cv_lib_freetype_FT_GlyphSlot_Embolden" >&6; } +if test $ac_cv_lib_freetype_FT_GlyphSlot_Embolden = yes; then USE_FT_EMBOLDEN="YES" else USE_FT_EMBOLDEN="NO" @@ -14865,26 +14366,26 @@ if test -n "$with_system_libxml" -o -n "$with_system_libs" && \ fi fi -{ $as_echo "$as_me:$LINENO: checking which libxslt to use" >&5 -$as_echo_n "checking which libxslt to use... " >&6; } +{ echo "$as_me:$LINENO: checking which libxslt to use" >&5 +echo $ECHO_N "checking which libxslt to use... $ECHO_C" >&6; } if test -n "$with_system_libxslt" -o -n "$with_system_libs" -o \ "$_os" = "Darwin" && \ test "$with_system_libxslt" != "no"; then - { $as_echo "$as_me:$LINENO: result: external" >&5 -$as_echo "external" >&6; } + { echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6; } SYSTEM_LIBXSLT=YES if test "$_os" = "Darwin"; then - { $as_echo "$as_me:$LINENO: checking LIBXSLT_CFLAGS" >&5 -$as_echo_n "checking LIBXSLT_CFLAGS... " >&6; } + { echo "$as_me:$LINENO: checking LIBXSLT_CFLAGS" >&5 +echo $ECHO_N "checking LIBXSLT_CFLAGS... $ECHO_C" >&6; } LIBXSLT_CFLAGS=`xslt-config --cflags` - { $as_echo "$as_me:$LINENO: result: $LIBXSLT_CFLAGS" >&5 -$as_echo "$LIBXSLT_CFLAGS" >&6; } - { $as_echo "$as_me:$LINENO: checking LIBXSLT_LIBS" >&5 -$as_echo_n "checking LIBXSLT_LIBS... " >&6; } + { echo "$as_me:$LINENO: result: $LIBXSLT_CFLAGS" >&5 +echo "${ECHO_T}$LIBXSLT_CFLAGS" >&6; } + { echo "$as_me:$LINENO: checking LIBXSLT_LIBS" >&5 +echo $ECHO_N "checking LIBXSLT_LIBS... $ECHO_C" >&6; } LIBXSLT_LIBS=`xslt-config --libs` - { $as_echo "$as_me:$LINENO: result: $LIBXSLT_LIBS" >&5 -$as_echo "$LIBXSLT_LIBS" >&6; } + { echo "$as_me:$LINENO: result: $LIBXSLT_LIBS" >&5 +echo "${ECHO_T}$LIBXSLT_LIBS" >&6; } else @@ -14894,10 +14395,10 @@ $as_echo "$LIBXSLT_LIBS" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -14912,7 +14413,7 @@ do 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -14925,11 +14426,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -14943,25 +14444,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:$LINENO: checking for libxslt" >&5 -$as_echo_n "checking for libxslt... " >&6; } + { echo "$as_me:$LINENO: checking for libxslt" >&5 +echo $ECHO_N "checking for libxslt... $ECHO_C" >&6; } if $PKG_CONFIG --exists "libxslt" ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=yes - { $as_echo "$as_me:$LINENO: checking LIBXSLT_CFLAGS" >&5 -$as_echo_n "checking LIBXSLT_CFLAGS... " >&6; } + { echo "$as_me:$LINENO: checking LIBXSLT_CFLAGS" >&5 +echo $ECHO_N "checking LIBXSLT_CFLAGS... $ECHO_C" >&6; } LIBXSLT_CFLAGS=`$PKG_CONFIG --cflags "libxslt"` - { $as_echo "$as_me:$LINENO: result: $LIBXSLT_CFLAGS" >&5 -$as_echo "$LIBXSLT_CFLAGS" >&6; } + { echo "$as_me:$LINENO: result: $LIBXSLT_CFLAGS" >&5 +echo "${ECHO_T}$LIBXSLT_CFLAGS" >&6; } - { $as_echo "$as_me:$LINENO: checking LIBXSLT_LIBS" >&5 -$as_echo_n "checking LIBXSLT_LIBS... " >&6; } + { echo "$as_me:$LINENO: checking LIBXSLT_LIBS" >&5 +echo $ECHO_N "checking LIBXSLT_LIBS... $ECHO_C" >&6; } LIBXSLT_LIBS=`$PKG_CONFIG --libs "libxslt"` - { $as_echo "$as_me:$LINENO: result: $LIBXSLT_LIBS" >&5 -$as_echo "$LIBXSLT_LIBS" >&6; } + { echo "$as_me:$LINENO: result: $LIBXSLT_LIBS" >&5 +echo "${ECHO_T}$LIBXSLT_LIBS" >&6; } else LIBXSLT_CFLAGS="" LIBXSLT_LIBS="" @@ -14982,8 +14483,8 @@ $as_echo "$LIBXSLT_LIBS" >&6; } if test $succeeded = yes; then : else - { { $as_echo "$as_me:$LINENO: error: Library requirements (libxslt) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -$as_echo "$as_me: error: Library requirements (libxslt) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { { echo "$as_me:$LINENO: error: Library requirements (libxslt) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (libxslt) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi @@ -14992,10 +14493,10 @@ $as_echo "$as_me: error: Library requirements (libxslt) not met; consider adjust # Extract the first word of "xsltproc", so it can be a program name with args. set dummy xsltproc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_XSLTPROC+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $XSLTPROC in [\\/]* | ?:[\\/]*) @@ -15010,7 +14511,7 @@ do 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_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -15023,22 +14524,22 @@ esac fi XSLTPROC=$ac_cv_path_XSLTPROC if test -n "$XSLTPROC"; then - { $as_echo "$as_me:$LINENO: result: $XSLTPROC" >&5 -$as_echo "$XSLTPROC" >&6; } + { echo "$as_me:$LINENO: result: $XSLTPROC" >&5 +echo "${ECHO_T}$XSLTPROC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi if test "$XSLTPROC" = "no"; then - { { $as_echo "$as_me:$LINENO: error: xsltproc is required" >&5 -$as_echo "$as_me: error: xsltproc is required" >&2;} + { { echo "$as_me:$LINENO: error: xsltproc is required" >&5 +echo "$as_me: error: xsltproc is required" >&2;} { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:$LINENO: result: internal" >&5 -$as_echo "internal" >&6; } + { echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6; } SYSTEM_LIBXSLT=NO BUILD_TYPE="$BUILD_TYPE LIBXSLT" fi @@ -15047,25 +14548,25 @@ fi -{ $as_echo "$as_me:$LINENO: checking which libxml to use" >&5 -$as_echo_n "checking which libxml to use... " >&6; } +{ echo "$as_me:$LINENO: checking which libxml to use" >&5 +echo $ECHO_N "checking which libxml to use... $ECHO_C" >&6; } if test -n "$with_system_libxml" -o -n "$with_system_libs" -o \ "$_os" = "Darwin" && \ test "$with_system_libxml" != "no"; then - { $as_echo "$as_me:$LINENO: result: external" >&5 -$as_echo "external" >&6; } + { echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6; } SYSTEM_LIBXML=YES if test "$_os" = "Darwin"; then - { $as_echo "$as_me:$LINENO: checking LIBXML_CFLAGS" >&5 -$as_echo_n "checking LIBXML_CFLAGS... " >&6; } + { echo "$as_me:$LINENO: checking LIBXML_CFLAGS" >&5 +echo $ECHO_N "checking LIBXML_CFLAGS... $ECHO_C" >&6; } LIBXML_CFLAGS=`xml2-config --cflags` - { $as_echo "$as_me:$LINENO: result: $LIBXML_CFLAGS" >&5 -$as_echo "$LIBXML_CFLAGS" >&6; } - { $as_echo "$as_me:$LINENO: checking LIBXML_LIBS" >&5 -$as_echo_n "checking LIBXML_LIBS... " >&6; } + { echo "$as_me:$LINENO: result: $LIBXML_CFLAGS" >&5 +echo "${ECHO_T}$LIBXML_CFLAGS" >&6; } + { echo "$as_me:$LINENO: checking LIBXML_LIBS" >&5 +echo $ECHO_N "checking LIBXML_LIBS... $ECHO_C" >&6; } LIBXML_LIBS=`xml2-config --libs` - { $as_echo "$as_me:$LINENO: result: $LIBXML_LIBS" >&5 -$as_echo "$LIBXML_LIBS" >&6; } + { echo "$as_me:$LINENO: result: $LIBXML_LIBS" >&5 +echo "${ECHO_T}$LIBXML_LIBS" >&6; } else @@ -15075,10 +14576,10 @@ $as_echo "$LIBXML_LIBS" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -15093,7 +14594,7 @@ do 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -15106,11 +14607,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -15124,25 +14625,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:$LINENO: checking for libxml-2.0 >= 2.0" >&5 -$as_echo_n "checking for libxml-2.0 >= 2.0... " >&6; } + { echo "$as_me:$LINENO: checking for libxml-2.0 >= 2.0" >&5 +echo $ECHO_N "checking for libxml-2.0 >= 2.0... $ECHO_C" >&6; } if $PKG_CONFIG --exists "libxml-2.0 >= 2.0" ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=yes - { $as_echo "$as_me:$LINENO: checking LIBXML_CFLAGS" >&5 -$as_echo_n "checking LIBXML_CFLAGS... " >&6; } + { echo "$as_me:$LINENO: checking LIBXML_CFLAGS" >&5 +echo $ECHO_N "checking LIBXML_CFLAGS... $ECHO_C" >&6; } LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.0"` - { $as_echo "$as_me:$LINENO: result: $LIBXML_CFLAGS" >&5 -$as_echo "$LIBXML_CFLAGS" >&6; } + { echo "$as_me:$LINENO: result: $LIBXML_CFLAGS" >&5 +echo "${ECHO_T}$LIBXML_CFLAGS" >&6; } - { $as_echo "$as_me:$LINENO: checking LIBXML_LIBS" >&5 -$as_echo_n "checking LIBXML_LIBS... " >&6; } + { echo "$as_me:$LINENO: checking LIBXML_LIBS" >&5 +echo $ECHO_N "checking LIBXML_LIBS... $ECHO_C" >&6; } LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.0"` - { $as_echo "$as_me:$LINENO: result: $LIBXML_LIBS" >&5 -$as_echo "$LIBXML_LIBS" >&6; } + { echo "$as_me:$LINENO: result: $LIBXML_LIBS" >&5 +echo "${ECHO_T}$LIBXML_LIBS" >&6; } else LIBXML_CFLAGS="" LIBXML_LIBS="" @@ -15163,8 +14664,8 @@ $as_echo "$LIBXML_LIBS" >&6; } if test $succeeded = yes; then : else - { { $as_echo "$as_me:$LINENO: error: Library requirements (libxml-2.0 >= 2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -$as_echo "$as_me: error: Library requirements (libxml-2.0 >= 2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { { echo "$as_me:$LINENO: error: Library requirements (libxml-2.0 >= 2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (libxml-2.0 >= 2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi @@ -15172,8 +14673,8 @@ $as_echo "$as_me: error: Library requirements (libxml-2.0 >= 2.0) not met; consi BUILD_TYPE="$BUILD_TYPE LIBXMLSEC" else - { $as_echo "$as_me:$LINENO: result: internal" >&5 -$as_echo "internal" >&6; } + { echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6; } SYSTEM_LIBXML=NO BUILD_TYPE="$BUILD_TYPE LIBXML2 LIBXMLSEC" fi @@ -15184,21 +14685,21 @@ fi if test "$_os" = "Darwin" && test "$with_system_python" != "no"; then with_system_python=yes fi -{ $as_echo "$as_me:$LINENO: checking which python to use" >&5 -$as_echo_n "checking which python to use... " >&6; } +{ echo "$as_me:$LINENO: checking which python to use" >&5 +echo $ECHO_N "checking which python to use... $ECHO_C" >&6; } if test -n "$with_system_python" -o -n "$with_system_libs" && \ test "$with_system_python" != "no"; then SYSTEM_PYTHON=YES - { $as_echo "$as_me:$LINENO: result: external" >&5 -$as_echo "external" >&6; } + { echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6; } if test -n "$PYTHON"; then # If the user set $PYTHON, use it and don't search something else. - { $as_echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.2" >&5 -$as_echo_n "checking whether $PYTHON version >= 2.2... " >&6; } + { echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.2" >&5 +echo $ECHO_N "checking whether $PYTHON version >= 2.2... $ECHO_C" >&6; } prog="import sys, string # split strings by '.' and convert to numeric. Append some zeros # because we need at least 4 digits for the hex conversion. @@ -15211,11 +14712,11 @@ sys.exit(sys.hexversion < minverhex)" ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - { { $as_echo "$as_me:$LINENO: error: too old" >&5 -$as_echo "$as_me: error: too old" >&2;} + { { echo "$as_me:$LINENO: error: too old" >&5 +echo "$as_me: error: too old" >&2;} { (exit 1); exit 1; }; } fi @@ -15223,10 +14724,10 @@ fi else # Otherwise, try each interpreter until we find one that satisfies # VERSION. - { $as_echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.2" >&5 -$as_echo_n "checking for a Python interpreter with version >= 2.2... " >&6; } + { echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.2" >&5 +echo $ECHO_N "checking for a Python interpreter with version >= 2.2... $ECHO_C" >&6; } if test "${am_cv_pathless_PYTHON+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else for am_cv_pathless_PYTHON in python python2 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do @@ -15248,18 +14749,18 @@ fi done fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_pathless_PYTHON" >&5 -$as_echo "$am_cv_pathless_PYTHON" >&6; } +{ echo "$as_me:$LINENO: result: $am_cv_pathless_PYTHON" >&5 +echo "${ECHO_T}$am_cv_pathless_PYTHON" >&6; } # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. if test "$am_cv_pathless_PYTHON" = none; then PYTHON=: else # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args. set dummy $am_cv_pathless_PYTHON; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PYTHON+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PYTHON in [\\/]* | ?:[\\/]*) @@ -15274,7 +14775,7 @@ do 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_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -15286,11 +14787,11 @@ esac fi PYTHON=$ac_cv_path_PYTHON if test -n "$PYTHON"; then - { $as_echo "$as_me:$LINENO: result: $PYTHON" >&5 -$as_echo "$PYTHON" >&6; } + { echo "$as_me:$LINENO: result: $PYTHON" >&5 +echo "${ECHO_T}$PYTHON" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -15300,21 +14801,21 @@ fi if test "$PYTHON" = :; then - { { $as_echo "$as_me:$LINENO: error: no suitable Python interpreter found" >&5 -$as_echo "$as_me: error: no suitable Python interpreter found" >&2;} + { { echo "$as_me:$LINENO: error: no suitable Python interpreter found" >&5 +echo "$as_me: error: no suitable Python interpreter found" >&2;} { (exit 1); exit 1; }; } else - { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5 -$as_echo_n "checking for $am_display_PYTHON version... " >&6; } + { echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5 +echo $ECHO_N "checking for $am_display_PYTHON version... $ECHO_C" >&6; } if test "${am_cv_python_version+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else am_cv_python_version=`$PYTHON -c "import sys; print sys.version[:3]"` fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_python_version" >&5 -$as_echo "$am_cv_python_version" >&6; } +{ echo "$as_me:$LINENO: result: $am_cv_python_version" >&5 +echo "${ECHO_T}$am_cv_python_version" >&6; } PYTHON_VERSION=$am_cv_python_version @@ -15325,30 +14826,30 @@ $as_echo "$am_cv_python_version" >&6; } - { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5 -$as_echo_n "checking for $am_display_PYTHON platform... " >&6; } + { echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5 +echo $ECHO_N "checking for $am_display_PYTHON platform... $ECHO_C" >&6; } if test "${am_cv_python_platform+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"` fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5 -$as_echo "$am_cv_python_platform" >&6; } +{ echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5 +echo "${ECHO_T}$am_cv_python_platform" >&6; } PYTHON_PLATFORM=$am_cv_python_platform - { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5 -$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; } + { echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5 +echo $ECHO_N "checking for $am_display_PYTHON script directory... $ECHO_C" >&6; } if test "${am_cv_python_pythondir+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null || echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5 -$as_echo "$am_cv_python_pythondir" >&6; } +{ echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5 +echo "${ECHO_T}$am_cv_python_pythondir" >&6; } pythondir=$am_cv_python_pythondir @@ -15356,16 +14857,16 @@ $as_echo "$am_cv_python_pythondir" >&6; } pkgpythondir=\${pythondir}/$PACKAGE - { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5 -$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; } + { echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5 +echo $ECHO_N "checking for $am_display_PYTHON extension module directory... $ECHO_C" >&6; } if test "${am_cv_python_pyexecdir+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null || echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"` fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5 -$as_echo "$am_cv_python_pyexecdir" >&6; } +{ echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5 +echo "${ECHO_T}$am_cv_python_pyexecdir" >&6; } pyexecdir=$am_cv_python_pyexecdir @@ -15391,17 +14892,17 @@ $as_echo "$am_cv_python_pyexecdir" >&6; } save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS" if test "${ac_cv_header_Python_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for Python.h" >&5 -$as_echo_n "checking for Python.h... " >&6; } + { echo "$as_me:$LINENO: checking for Python.h" >&5 +echo $ECHO_N "checking for Python.h... $ECHO_C" >&6; } if test "${ac_cv_header_Python_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_Python_h" >&5 -$as_echo "$ac_cv_header_Python_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_Python_h" >&5 +echo "${ECHO_T}$ac_cv_header_Python_h" >&6; } else # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking Python.h usability" >&5 -$as_echo_n "checking Python.h usability... " >&6; } +{ echo "$as_me:$LINENO: checking Python.h usability" >&5 +echo $ECHO_N "checking Python.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -15417,33 +14918,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_header_compiler=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ $as_echo "$as_me:$LINENO: checking Python.h presence" >&5 -$as_echo_n "checking Python.h presence... " >&6; } +{ echo "$as_me:$LINENO: checking Python.h presence" >&5 +echo $ECHO_N "checking Python.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -15457,71 +14957,70 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: Python.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: Python.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: Python.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: Python.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: Python.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: Python.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: Python.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: Python.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: Python.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: Python.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: Python.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: Python.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: Python.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: Python.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: Python.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: Python.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: Python.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: Python.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: Python.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: Python.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: Python.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: Python.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: Python.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: Python.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: Python.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: Python.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: Python.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: Python.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: Python.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: Python.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: Python.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: Python.h: in the future, the compiler will take precedence" >&2;} ;; esac -{ $as_echo "$as_me:$LINENO: checking for Python.h" >&5 -$as_echo_n "checking for Python.h... " >&6; } +{ echo "$as_me:$LINENO: checking for Python.h" >&5 +echo $ECHO_N "checking for Python.h... $ECHO_C" >&6; } if test "${ac_cv_header_Python_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_Python_h=$ac_header_preproc fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_Python_h" >&5 -$as_echo "$ac_cv_header_Python_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_Python_h" >&5 +echo "${ECHO_T}$ac_cv_header_Python_h" >&6; } fi -if test "x$ac_cv_header_Python_h" = x""yes; then +if test $ac_cv_header_Python_h = yes; then : else - { { $as_echo "$as_me:$LINENO: error: Python headers not found" >&5 -$as_echo "$as_me: error: Python headers not found" >&2;} + { { echo "$as_me:$LINENO: error: Python headers not found" >&5 +echo "$as_me: error: Python headers not found" >&2;} { (exit 1); exit 1; }; } fi @@ -15530,8 +15029,8 @@ fi else SYSTEM_PYTHON=NO BUILD_TYPE="$BUILD_TYPE PYTHON" - { $as_echo "$as_me:$LINENO: result: internal" >&5 -$as_echo "internal" >&6; } + { echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6; } # Embedded python dies without Home set if test "z$HOME" = "z"; then export HOME=""; @@ -15540,10 +15039,10 @@ $as_echo "internal" >&6; } if test -z "$BZIP2"; then # Extract the first word of "bzip2", so it can be a program name with args. set dummy bzip2; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_BZIP2+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $BZIP2 in [\\/]* | ?:[\\/]*) @@ -15558,7 +15057,7 @@ do 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_path_BZIP2="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -15570,17 +15069,17 @@ esac fi BZIP2=$ac_cv_path_BZIP2 if test -n "$BZIP2"; then - { $as_echo "$as_me:$LINENO: result: $BZIP2" >&5 -$as_echo "$BZIP2" >&6; } + { echo "$as_me:$LINENO: result: $BZIP2" >&5 +echo "${ECHO_T}$BZIP2" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi if test -z "$BZIP2"; then - { { $as_echo "$as_me:$LINENO: error: the internal Python module has a .tar.bz2. You need bzip2" >&5 -$as_echo "$as_me: error: the internal Python module has a .tar.bz2. You need bzip2" >&2;} + { { echo "$as_me:$LINENO: error: the internal Python module has a .tar.bz2. You need bzip2" >&5 +echo "$as_me: error: the internal Python module has a .tar.bz2. You need bzip2" >&2;} { (exit 1); exit 1; }; } fi fi @@ -15591,17 +15090,17 @@ fi HOME=`echo $HOME | sed 's:\\\\:/:g'` -{ $as_echo "$as_me:$LINENO: checking which db to use" >&5 -$as_echo_n "checking which db to use... " >&6; } +{ echo "$as_me:$LINENO: checking which db to use" >&5 +echo $ECHO_N "checking which db to use... $ECHO_C" >&6; } if test -n "$with_system_db" -o -n "$with_system_libs" && \ test "$with_system_db" != "no"; then SYSTEM_DB=YES - { $as_echo "$as_me:$LINENO: result: external" >&5 -$as_echo "external" >&6; } - { $as_echo "$as_me:$LINENO: checking for db.h" >&5 -$as_echo_n "checking for db.h... " >&6; } + { echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6; } + { echo "$as_me:$LINENO: checking for db.h" >&5 +echo $ECHO_N "checking for db.h... $ECHO_C" >&6; } if test "${ac_cv_header_db_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -15620,21 +15119,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_cv_header_db_h=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_header_db_h=no @@ -15642,17 +15140,17 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5 -$as_echo "$ac_cv_header_db_h" >&6; } -if test "x$ac_cv_header_db_h" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5 +echo "${ECHO_T}$ac_cv_header_db_h" >&6; } +if test $ac_cv_header_db_h = yes; then DB_INCLUDES=/usr/include else CFLAGS=-I/usr/include/db4 - { $as_echo "$as_me:$LINENO: checking for db4/db.h" >&5 -$as_echo_n "checking for db4/db.h... " >&6; } + { echo "$as_me:$LINENO: checking for db4/db.h" >&5 +echo $ECHO_N "checking for db4/db.h... $ECHO_C" >&6; } if test "${ac_cv_header_db4_db_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -15670,21 +15168,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_cv_header_db4_db_h=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_header_db4_db_h=no @@ -15692,13 +15189,13 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_db4_db_h" >&5 -$as_echo "$ac_cv_header_db4_db_h" >&6; } -if test "x$ac_cv_header_db4_db_h" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_header_db4_db_h" >&5 +echo "${ECHO_T}$ac_cv_header_db4_db_h" >&6; } +if test $ac_cv_header_db4_db_h = yes; then DB_INCLUDES=/usr/include/db4 else - { { $as_echo "$as_me:$LINENO: error: no. install the db4 libraries" >&5 -$as_echo "$as_me: error: no. install the db4 libraries" >&2;} + { { echo "$as_me:$LINENO: error: no. install the db4 libraries" >&5 +echo "$as_me: error: no. install the db4 libraries" >&2;} { (exit 1); exit 1; }; } fi @@ -15707,17 +15204,15 @@ fi fi - { $as_echo "$as_me:$LINENO: checking whether db is at least 4.1" >&5 -$as_echo_n "checking whether db is at least 4.1... " >&6; } + { echo "$as_me:$LINENO: checking whether db is at least 4.1" >&5 +echo $ECHO_N "checking whether db is at least 4.1... $ECHO_C" >&6; } for v in `seq 1 7`; do if test "$cross_compiling" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot run test program while cross compiling +echo "$as_me: error: cannot run test program while cross compiling See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } + { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -15740,52 +15235,49 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' { (case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then DB_VERSION_MINOR=$v else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -rf conftest.dSYM rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi done if test "$DB_VERSION_MINOR" -gt "1"; then - { $as_echo "$as_me:$LINENO: result: OK" >&5 -$as_echo "OK" >&6; } + { echo "$as_me:$LINENO: result: OK" >&5 +echo "${ECHO_T}OK" >&6; } DB_VERSION=4.$DB_VERSION_MINOR else - { { $as_echo "$as_me:$LINENO: error: no. you need at least db 4.1" >&5 -$as_echo "$as_me: error: no. you need at least db 4.1" >&2;} + { { echo "$as_me:$LINENO: error: no. you need at least db 4.1" >&5 +echo "$as_me: error: no. you need at least db 4.1" >&2;} { (exit 1); exit 1; }; } fi # does not work :/ #AC_CHECK_LIB(db, db_create, [], # [AC_MSG_ERROR([db library not installed or functional])], []) -{ $as_echo "$as_me:$LINENO: checking for main in -ldb" >&5 -$as_echo_n "checking for main in -ldb... " >&6; } +{ echo "$as_me:$LINENO: checking for main in -ldb" >&5 +echo $ECHO_N "checking for main in -ldb... $ECHO_C" >&6; } if test "${ac_cv_lib_db_main+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldb $LIBS" @@ -15811,37 +15303,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_db_main=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_db_main=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_db_main" >&5 -$as_echo "$ac_cv_lib_db_main" >&6; } -if test "x$ac_cv_lib_db_main" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_db_main" >&5 +echo "${ECHO_T}$ac_cv_lib_db_main" >&6; } +if test $ac_cv_lib_db_main = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBDB 1 _ACEOF @@ -15849,16 +15337,16 @@ _ACEOF LIBS="-ldb $LIBS" else - { { $as_echo "$as_me:$LINENO: error: db not installed or functional" >&5 -$as_echo "$as_me: error: db not installed or functional" >&2;} + { { echo "$as_me:$LINENO: error: db not installed or functional" >&5 +echo "$as_me: error: db not installed or functional" >&2;} { (exit 1); exit 1; }; } fi ac_cv_lib_db=ac_cv_lib_db_main SCPDEFS="$SCPDEFS -DSYSTEM_DB" else - { $as_echo "$as_me:$LINENO: result: internal" >&5 -$as_echo "internal" >&6; } + { echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6; } SYSTEM_DB=NO BUILD_TYPE="$BUILD_TYPE BERKELEYDB" fi @@ -15867,22 +15355,22 @@ fi -{ $as_echo "$as_me:$LINENO: checking which lucene to use" >&5 -$as_echo_n "checking which lucene to use... " >&6; } +{ echo "$as_me:$LINENO: checking which lucene to use" >&5 +echo $ECHO_N "checking which lucene to use... $ECHO_C" >&6; } if test -n "$with_system_lucene" -o -n "$with_system_libs" && \ test "$with_system_lucene" != "no" && test "$with_system_jars" != "no"; then - { $as_echo "$as_me:$LINENO: result: external" >&5 -$as_echo "external" >&6; } + { echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6; } SYSTEM_LUCENE=YES if test -z $LUCENE_CORE_JAR; then - { $as_echo "$as_me:$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; } + { echo "$as_me:$LINENO: checking for /usr/share/java/lucene-core-2.3.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/lucene-core-2.3.jar... $ECHO_C" >&6; } if test "${ac_cv_file__usr_share_java_lucene_core_2_3_jar+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/lucene-core-2.3.jar"; then ac_cv_file__usr_share_java_lucene_core_2_3_jar=yes @@ -15890,20 +15378,20 @@ else ac_cv_file__usr_share_java_lucene_core_2_3_jar=no fi fi -{ $as_echo "$as_me:$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" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_core_2_3_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_lucene_core_2_3_jar" >&6; } +if test $ac_cv_file__usr_share_java_lucene_core_2_3_jar = yes; then LUCENE_CORE_JAR=/usr/share/java/lucene-core-2.3.jar else - { $as_echo "$as_me:$LINENO: checking for /usr/share/java/lucene.jar" >&5 -$as_echo_n "checking for /usr/share/java/lucene.jar... " >&6; } + { echo "$as_me:$LINENO: checking for /usr/share/java/lucene.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/lucene.jar... $ECHO_C" >&6; } if test "${ac_cv_file__usr_share_java_lucene_jar+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/lucene.jar"; then ac_cv_file__usr_share_java_lucene_jar=yes @@ -15911,13 +15399,13 @@ else ac_cv_file__usr_share_java_lucene_jar=no fi fi -{ $as_echo "$as_me:$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" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_lucene_jar" >&6; } +if test $ac_cv_file__usr_share_java_lucene_jar = yes; then LUCENE_CORE_JAR=/usr/share/java/lucene.jar else - { { $as_echo "$as_me:$LINENO: error: lucene-core.jar replacement not found" >&5 -$as_echo "$as_me: error: lucene-core.jar replacement not found" >&2;} + { { echo "$as_me:$LINENO: error: lucene-core.jar replacement not found" >&5 +echo "$as_me: error: lucene-core.jar replacement not found" >&2;} { (exit 1); exit 1; }; } fi @@ -15927,15 +15415,15 @@ fi fi else - as_ac_File=`$as_echo "ac_cv_file_$LUCENE_CORE_JAR" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $LUCENE_CORE_JAR" >&5 -$as_echo_n "checking for $LUCENE_CORE_JAR... " >&6; } + as_ac_File=`echo "ac_cv_file_$LUCENE_CORE_JAR" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $LUCENE_CORE_JAR" >&5 +echo $ECHO_N "checking for $LUCENE_CORE_JAR... $ECHO_C" >&6; } if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$LUCENE_CORE_JAR"; then eval "$as_ac_File=yes" @@ -15943,31 +15431,28 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_File'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_File'}'` = yes; then : else - { { $as_echo "$as_me:$LINENO: error: lucene-core.jar not found." >&5 -$as_echo "$as_me: error: lucene-core.jar not found." >&2;} + { { echo "$as_me:$LINENO: error: lucene-core.jar not found." >&5 +echo "$as_me: error: lucene-core.jar not found." >&2;} { (exit 1); exit 1; }; } fi fi if test -z $LUCENE_ANALYZERS_JAR; then - { $as_echo "$as_me:$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; } + { echo "$as_me:$LINENO: checking for /usr/share/java/lucene-analyzers-2.3.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/lucene-analyzers-2.3.jar... $ECHO_C" >&6; } if test "${ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/lucene-analyzers-2.3.jar"; then ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar=yes @@ -15975,20 +15460,20 @@ else ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar=no fi fi -{ $as_echo "$as_me:$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" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar" >&6; } +if test $ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar = yes; then LUCENE_ANALYZERS_JAR=/usr/share/java/lucene-analyzers-2.3.jar else - { $as_echo "$as_me:$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; } + { echo "$as_me:$LINENO: checking for /usr/share/java/lucene-contrib/lucene-analyzers.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/lucene-contrib/lucene-analyzers.jar... $ECHO_C" >&6; } if test "${ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/lucene-contrib/lucene-analyzers.jar"; then ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar=yes @@ -15996,13 +15481,13 @@ else ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar=no fi fi -{ $as_echo "$as_me:$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" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar" >&6; } +if test $ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar = yes; then LUCENE_ANALYZERS_JAR=/usr/share/java/lucene-contrib/lucene-analyzers.jar else - { { $as_echo "$as_me:$LINENO: error: lucene-analyzers.jar replacement not found." >&5 -$as_echo "$as_me: error: lucene-analyzers.jar replacement not found." >&2;} + { { echo "$as_me:$LINENO: error: lucene-analyzers.jar replacement not found." >&5 +echo "$as_me: error: lucene-analyzers.jar replacement not found." >&2;} { (exit 1); exit 1; }; } fi @@ -16012,15 +15497,15 @@ fi fi else - as_ac_File=`$as_echo "ac_cv_file_$LUCENE_CORE_JAR" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $LUCENE_CORE_JAR" >&5 -$as_echo_n "checking for $LUCENE_CORE_JAR... " >&6; } + as_ac_File=`echo "ac_cv_file_$LUCENE_CORE_JAR" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $LUCENE_CORE_JAR" >&5 +echo $ECHO_N "checking for $LUCENE_CORE_JAR... $ECHO_C" >&6; } if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$LUCENE_CORE_JAR"; then eval "$as_ac_File=yes" @@ -16028,24 +15513,21 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_File'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_File'}'` = yes; then : else - { { $as_echo "$as_me:$LINENO: error: lucene-analyzers.jar not found." >&5 -$as_echo "$as_me: error: lucene-analyzers.jar not found." >&2;} + { { echo "$as_me:$LINENO: error: lucene-analyzers.jar not found." >&5 +echo "$as_me: error: lucene-analyzers.jar not found." >&2;} { (exit 1); exit 1; }; } fi fi else - { $as_echo "$as_me:$LINENO: result: internal" >&5 -$as_echo "internal" >&6; } + { echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6; } SYSTEM_LUCENE=NO BUILD_TYPE="$BUILD_TYPE LUCENE" fi @@ -16053,25 +15535,25 @@ fi -{ $as_echo "$as_me:$LINENO: checking which hsqldb to use" >&5 -$as_echo_n "checking which hsqldb to use... " >&6; } +{ echo "$as_me:$LINENO: checking which hsqldb to use" >&5 +echo $ECHO_N "checking which hsqldb to use... $ECHO_C" >&6; } if test -n "$with_system_hsqldb" -o -n "$with_system_libs" && \ test "$with_system_hsqldb" != "no" && test "$with_system_jars" != "no"; then - { $as_echo "$as_me:$LINENO: result: external" >&5 -$as_echo "external" >&6; } + { echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6; } SYSTEM_HSQLDB=YES if test -z $HSQLDB_JAR; then HSQLDB_JAR=/usr/share/java/hsqldb.jar fi - as_ac_File=`$as_echo "ac_cv_file_$HSQLDB_JAR" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $HSQLDB_JAR" >&5 -$as_echo_n "checking for $HSQLDB_JAR... " >&6; } + as_ac_File=`echo "ac_cv_file_$HSQLDB_JAR" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $HSQLDB_JAR" >&5 +echo $ECHO_N "checking for $HSQLDB_JAR... $ECHO_C" >&6; } if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$HSQLDB_JAR"; then eval "$as_ac_File=yes" @@ -16079,22 +15561,19 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_File'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_File'}'` = yes; then : else - { { $as_echo "$as_me:$LINENO: error: hsqldb.jar not found." >&5 -$as_echo "$as_me: error: hsqldb.jar not found." >&2;} + { { echo "$as_me:$LINENO: error: hsqldb.jar not found." >&5 +echo "$as_me: error: hsqldb.jar not found." >&2;} { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:$LINENO: checking whether hsqldb is >= 1.8.0.9" >&5 -$as_echo_n "checking whether hsqldb is >= 1.8.0.9... " >&6; } + { echo "$as_me:$LINENO: checking whether hsqldb is >= 1.8.0.9" >&5 +echo $ECHO_N "checking whether hsqldb is >= 1.8.0.9... $ECHO_C" >&6; } export HSQLDB_JAR if $PERL -e 'use Archive::Zip; my $file = "$ENV{'HSQLDB_JAR'}"; @@ -16117,41 +15596,41 @@ $as_echo_n "checking whether hsqldb is >= 1.8.0.9... " >&6; } } else { exit 1; }'; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - { { $as_echo "$as_me:$LINENO: error: no, hsqldb >= 1.8.0.9 is needed" >&5 -$as_echo "$as_me: error: no, hsqldb >= 1.8.0.9 is needed" >&2;} + { { echo "$as_me:$LINENO: error: no, hsqldb >= 1.8.0.9 is needed" >&5 +echo "$as_me: error: no, hsqldb >= 1.8.0.9 is needed" >&2;} { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:$LINENO: result: internal" >&5 -$as_echo "internal" >&6; } + { echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6; } SYSTEM_HSQLDB=NO BUILD_TYPE="$BUILD_TYPE HSQLDB" fi -{ $as_echo "$as_me:$LINENO: checking which beanshell to use" >&5 -$as_echo_n "checking which beanshell to use... " >&6; } +{ echo "$as_me:$LINENO: checking which beanshell to use" >&5 +echo $ECHO_N "checking which beanshell to use... $ECHO_C" >&6; } if test -n "$with_system_beanshell" -o -n "$with_system_libs" && \ test "$with_system_beanshell" != "no" && test "$with_system_jars" != "no"; then - { $as_echo "$as_me:$LINENO: result: external" >&5 -$as_echo "external" >&6; } + { echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6; } SYSTEM_BSH=YES if test -z $BSH_JAR; then BSH_JAR=/usr/share/java/bsh.jar fi - as_ac_File=`$as_echo "ac_cv_file_$BSH_JAR" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $BSH_JAR" >&5 -$as_echo_n "checking for $BSH_JAR... " >&6; } + as_ac_File=`echo "ac_cv_file_$BSH_JAR" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $BSH_JAR" >&5 +echo $ECHO_N "checking for $BSH_JAR... $ECHO_C" >&6; } if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$BSH_JAR"; then eval "$as_ac_File=yes" @@ -16159,23 +15638,20 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_File'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_File'}'` = yes; then : else - { { $as_echo "$as_me:$LINENO: error: bsh.jar not found." >&5 -$as_echo "$as_me: error: bsh.jar not found." >&2;} + { { echo "$as_me:$LINENO: error: bsh.jar not found." >&5 +echo "$as_me: error: bsh.jar not found." >&2;} { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:$LINENO: result: internal" >&5 -$as_echo "internal" >&6; } + { echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6; } SYSTEM_BSH=NO BUILD_TYPE="$BUILD_TYPE BSH" fi @@ -16183,22 +15659,22 @@ fi -{ $as_echo "$as_me:$LINENO: checking which saxon to use" >&5 -$as_echo_n "checking which saxon to use... " >&6; } +{ echo "$as_me:$LINENO: checking which saxon to use" >&5 +echo $ECHO_N "checking which saxon to use... $ECHO_C" >&6; } if test -n "$with_system_saxon" -o -n "$with_system_libs" && \ test "$with_system_saxon" != "no" && test "$with_system_jars" != "no"; then - { $as_echo "$as_me:$LINENO: result: external" >&5 -$as_echo "external" >&6; } + { echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6; } SYSTEM_SAXON=YES if test -z $SAXON_JAR; then - { $as_echo "$as_me:$LINENO: checking for /usr/share/java/saxon9.jar" >&5 -$as_echo_n "checking for /usr/share/java/saxon9.jar... " >&6; } + { echo "$as_me:$LINENO: checking for /usr/share/java/saxon9.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/saxon9.jar... $ECHO_C" >&6; } if test "${ac_cv_file__usr_share_java_saxon9_jar+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/saxon9.jar"; then ac_cv_file__usr_share_java_saxon9_jar=yes @@ -16206,20 +15682,20 @@ else ac_cv_file__usr_share_java_saxon9_jar=no fi fi -{ $as_echo "$as_me:$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" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_saxon9_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_saxon9_jar" >&6; } +if test $ac_cv_file__usr_share_java_saxon9_jar = yes; then SAXON_JAR=/usr/share/java/saxon9.jar else - { $as_echo "$as_me:$LINENO: checking for /usr/share/java/saxon.jar" >&5 -$as_echo_n "checking for /usr/share/java/saxon.jar... " >&6; } + { echo "$as_me:$LINENO: checking for /usr/share/java/saxon.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/saxon.jar... $ECHO_C" >&6; } if test "${ac_cv_file__usr_share_java_saxon_jar+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/saxon.jar"; then ac_cv_file__usr_share_java_saxon_jar=yes @@ -16227,19 +15703,19 @@ else ac_cv_file__usr_share_java_saxon_jar=no fi fi -{ $as_echo "$as_me:$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" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_saxon_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_saxon_jar" >&6; } +if test $ac_cv_file__usr_share_java_saxon_jar = yes; then SAXON_JAR=/usr/share/java/saxon.jar else - { $as_echo "$as_me:$LINENO: checking for /usr/share/java/saxon9.jar" >&5 -$as_echo_n "checking for /usr/share/java/saxon9.jar... " >&6; } + { echo "$as_me:$LINENO: checking for /usr/share/java/saxon9.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/saxon9.jar... $ECHO_C" >&6; } if test "${ac_cv_file__usr_share_java_saxon9_jar+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/saxon9.jar"; then ac_cv_file__usr_share_java_saxon9_jar=yes @@ -16247,13 +15723,13 @@ else ac_cv_file__usr_share_java_saxon9_jar=no fi fi -{ $as_echo "$as_me:$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" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_saxon9_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_saxon9_jar" >&6; } +if test $ac_cv_file__usr_share_java_saxon9_jar = yes; then SAXON_JAR=/usr/share/java/saxon9.jar else - { { $as_echo "$as_me:$LINENO: error: saxon.jar replacement not found" >&5 -$as_echo "$as_me: error: saxon.jar replacement not found" >&2;} + { { echo "$as_me:$LINENO: error: saxon.jar replacement not found" >&5 +echo "$as_me: error: saxon.jar replacement not found" >&2;} { (exit 1); exit 1; }; } fi @@ -16267,15 +15743,15 @@ fi fi else - as_ac_File=`$as_echo "ac_cv_file_$SAXON_JAR" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $SAXON_JAR" >&5 -$as_echo_n "checking for $SAXON_JAR... " >&6; } + as_ac_File=`echo "ac_cv_file_$SAXON_JAR" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $SAXON_JAR" >&5 +echo $ECHO_N "checking for $SAXON_JAR... $ECHO_C" >&6; } if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$SAXON_JAR"; then eval "$as_ac_File=yes" @@ -16283,31 +15759,28 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_File'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_File'}'` = yes; then : else - { { $as_echo "$as_me:$LINENO: error: saxon.jar replacement not found." >&5 -$as_echo "$as_me: error: saxon.jar replacement not found." >&2;} + { { echo "$as_me:$LINENO: error: saxon.jar replacement not found." >&5 +echo "$as_me: error: saxon.jar replacement not found." >&2;} { (exit 1); exit 1; }; } fi fi if test -n "$SERIALIZER_JAR"; then - as_ac_File=`$as_echo "ac_cv_file_$SERIALIZER_JAR" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $SERIALIZER_JAR" >&5 -$as_echo_n "checking for $SERIALIZER_JAR... " >&6; } + as_ac_File=`echo "ac_cv_file_$SERIALIZER_JAR" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $SERIALIZER_JAR" >&5 +echo $ECHO_N "checking for $SERIALIZER_JAR... $ECHO_C" >&6; } if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$SERIALIZER_JAR"; then eval "$as_ac_File=yes" @@ -16315,25 +15788,22 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_File'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_File'}'` = yes; then : else - { { $as_echo "$as_me:$LINENO: error: serializer.jar not found." >&5 -$as_echo "$as_me: error: serializer.jar not found." >&2;} + { { echo "$as_me:$LINENO: error: serializer.jar not found." >&5 +echo "$as_me: error: serializer.jar not found." >&2;} { (exit 1); exit 1; }; } fi fi else - { $as_echo "$as_me:$LINENO: result: internal" >&5 -$as_echo "internal" >&6; } + { echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6; } SYSTEM_SAXON=NO NEED_SAXON=TRUE fi @@ -16347,20 +15817,20 @@ fi if test "$_os" = "Darwin" && test "$with_system_curl" != "no"; then with_system_curl=yes fi -{ $as_echo "$as_me:$LINENO: checking which curl to use" >&5 -$as_echo_n "checking which curl to use... " >&6; } +{ echo "$as_me:$LINENO: checking which curl to use" >&5 +echo $ECHO_N "checking which curl to use... $ECHO_C" >&6; } if test -n "$with_system_curl" -o -n "$with_system_libs" && \ test "$with_system_curl" != "no"; then - { $as_echo "$as_me:$LINENO: result: external" >&5 -$as_echo "external" >&6; } + { echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6; } SYSTEM_CURL=YES # Extract the first word of "curl-config", so it can be a program name with args. set dummy curl-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_CURLCONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $CURLCONFIG in [\\/]* | ?:[\\/]*) @@ -16375,7 +15845,7 @@ do 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_path_CURLCONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -16387,38 +15857,38 @@ esac fi CURLCONFIG=$ac_cv_path_CURLCONFIG if test -n "$CURLCONFIG"; then - { $as_echo "$as_me:$LINENO: result: $CURLCONFIG" >&5 -$as_echo "$CURLCONFIG" >&6; } + { echo "$as_me:$LINENO: result: $CURLCONFIG" >&5 +echo "${ECHO_T}$CURLCONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi if test -z "$CURLCONFIG"; then - { { $as_echo "$as_me:$LINENO: error: install curl to run this script" >&5 -$as_echo "$as_me: error: install curl to run this script" >&2;} + { { echo "$as_me:$LINENO: error: install curl to run this script" >&5 +echo "$as_me: error: install curl to run this script" >&2;} { (exit 1); exit 1; }; } fi # check curl version - { $as_echo "$as_me:$LINENO: checking whether curl is >= 7.9.8" >&5 -$as_echo_n "checking whether curl is >= 7.9.8... " >&6; } + { echo "$as_me:$LINENO: checking whether curl is >= 7.9.8" >&5 +echo $ECHO_N "checking whether curl is >= 7.9.8... $ECHO_C" >&6; } if test "`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $1 }'`" -gt "7" -a \ "`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $2 }'`" -gt "9" -a \ "`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $3 }'`" -gt "8"; then - { { $as_echo "$as_me:$LINENO: error: no, you need at least curl 7.9,8" >&5 -$as_echo "$as_me: error: no, you need at least curl 7.9,8" >&2;} + { { echo "$as_me:$LINENO: error: no, you need at least curl 7.9,8" >&5 +echo "$as_me: error: no, you need at least curl 7.9,8" >&2;} { (exit 1); exit 1; }; } else - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } fi CURL_LIBS=`$CURLCONFIG --libs` CURL_CFLAGS=`$CURLCONFIG --cflags` else - { $as_echo "$as_me:$LINENO: result: internal" >&5 -$as_echo "internal" >&6; } + { echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6; } SYSTEM_CURL=NO BUILD_TYPE="$BUILD_TYPE CURL" fi @@ -16426,12 +15896,12 @@ fi -{ $as_echo "$as_me:$LINENO: checking which boost to use" >&5 -$as_echo_n "checking which boost to use... " >&6; } +{ echo "$as_me:$LINENO: checking which boost to use" >&5 +echo $ECHO_N "checking which boost to use... $ECHO_C" >&6; } if test -n "$with_system_boost" -o -n "$with_system_headers" && \ test "$with_system_boost" != "no"; then - { $as_echo "$as_me:$LINENO: result: external" >&5 -$as_echo "external" >&6; } + { echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6; } SYSTEM_BOOST=YES ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -16440,17 +15910,17 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex ac_compiler_gnu=$ac_cv_cxx_compiler_gnu if test "${ac_cv_header_boost_shared_ptr_hpp+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for boost/shared_ptr.hpp" >&5 -$as_echo_n "checking for boost/shared_ptr.hpp... " >&6; } + { echo "$as_me:$LINENO: checking for boost/shared_ptr.hpp" >&5 +echo $ECHO_N "checking for boost/shared_ptr.hpp... $ECHO_C" >&6; } if test "${ac_cv_header_boost_shared_ptr_hpp+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_shared_ptr_hpp" >&5 -$as_echo "$ac_cv_header_boost_shared_ptr_hpp" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_boost_shared_ptr_hpp" >&5 +echo "${ECHO_T}$ac_cv_header_boost_shared_ptr_hpp" >&6; } else # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking boost/shared_ptr.hpp usability" >&5 -$as_echo_n "checking boost/shared_ptr.hpp usability... " >&6; } +{ echo "$as_me:$LINENO: checking boost/shared_ptr.hpp usability" >&5 +echo $ECHO_N "checking boost/shared_ptr.hpp usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -16466,33 +15936,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ $as_echo "$as_me:$LINENO: checking boost/shared_ptr.hpp presence" >&5 -$as_echo_n "checking boost/shared_ptr.hpp presence... " >&6; } +{ echo "$as_me:$LINENO: checking boost/shared_ptr.hpp presence" >&5 +echo $ECHO_N "checking boost/shared_ptr.hpp presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -16506,87 +15975,86 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: boost/shared_ptr.hpp: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: boost/shared_ptr.hpp: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: present but cannot be compiled" >&5 +echo "$as_me: WARNING: boost/shared_ptr.hpp: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: boost/shared_ptr.hpp: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: boost/shared_ptr.hpp: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: boost/shared_ptr.hpp: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: boost/shared_ptr.hpp: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: boost/shared_ptr.hpp: in the future, the compiler will take precedence" >&2;} ;; esac -{ $as_echo "$as_me:$LINENO: checking for boost/shared_ptr.hpp" >&5 -$as_echo_n "checking for boost/shared_ptr.hpp... " >&6; } +{ echo "$as_me:$LINENO: checking for boost/shared_ptr.hpp" >&5 +echo $ECHO_N "checking for boost/shared_ptr.hpp... $ECHO_C" >&6; } if test "${ac_cv_header_boost_shared_ptr_hpp+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_boost_shared_ptr_hpp=$ac_header_preproc fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_shared_ptr_hpp" >&5 -$as_echo "$ac_cv_header_boost_shared_ptr_hpp" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_boost_shared_ptr_hpp" >&5 +echo "${ECHO_T}$ac_cv_header_boost_shared_ptr_hpp" >&6; } fi -if test "x$ac_cv_header_boost_shared_ptr_hpp" = x""yes; then +if test $ac_cv_header_boost_shared_ptr_hpp = yes; then : else - { { $as_echo "$as_me:$LINENO: error: boost/shared_ptr.hpp not found. install boost" >&5 -$as_echo "$as_me: error: boost/shared_ptr.hpp not found. install boost" >&2;} + { { echo "$as_me:$LINENO: error: boost/shared_ptr.hpp not found. install boost" >&5 +echo "$as_me: error: boost/shared_ptr.hpp not found. install boost" >&2;} { (exit 1); exit 1; }; } fi if test "${ac_cv_header_boost_spirit_core_hpp+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for boost/spirit/core.hpp" >&5 -$as_echo_n "checking for boost/spirit/core.hpp... " >&6; } + { echo "$as_me:$LINENO: checking for boost/spirit/core.hpp" >&5 +echo $ECHO_N "checking for boost/spirit/core.hpp... $ECHO_C" >&6; } if test "${ac_cv_header_boost_spirit_core_hpp+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_spirit_core_hpp" >&5 -$as_echo "$ac_cv_header_boost_spirit_core_hpp" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_boost_spirit_core_hpp" >&5 +echo "${ECHO_T}$ac_cv_header_boost_spirit_core_hpp" >&6; } else # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking boost/spirit/core.hpp usability" >&5 -$as_echo_n "checking boost/spirit/core.hpp usability... " >&6; } +{ echo "$as_me:$LINENO: checking boost/spirit/core.hpp usability" >&5 +echo $ECHO_N "checking boost/spirit/core.hpp usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -16602,33 +16070,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ $as_echo "$as_me:$LINENO: checking boost/spirit/core.hpp presence" >&5 -$as_echo_n "checking boost/spirit/core.hpp presence... " >&6; } +{ echo "$as_me:$LINENO: checking boost/spirit/core.hpp presence" >&5 +echo $ECHO_N "checking boost/spirit/core.hpp presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -16642,71 +16109,70 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: boost/spirit/core.hpp: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: boost/spirit/core.hpp: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: boost/spirit/core.hpp: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: boost/spirit/core.hpp: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: boost/spirit/core.hpp: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: boost/spirit/core.hpp: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: boost/spirit/core.hpp: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: boost/spirit/core.hpp: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: boost/spirit/core.hpp: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: boost/spirit/core.hpp: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: present but cannot be compiled" >&5 +echo "$as_me: WARNING: boost/spirit/core.hpp: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: boost/spirit/core.hpp: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: boost/spirit/core.hpp: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: boost/spirit/core.hpp: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: boost/spirit/core.hpp: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: boost/spirit/core.hpp: in the future, the compiler will take precedence" >&2;} ;; esac -{ $as_echo "$as_me:$LINENO: checking for boost/spirit/core.hpp" >&5 -$as_echo_n "checking for boost/spirit/core.hpp... " >&6; } +{ echo "$as_me:$LINENO: checking for boost/spirit/core.hpp" >&5 +echo $ECHO_N "checking for boost/spirit/core.hpp... $ECHO_C" >&6; } if test "${ac_cv_header_boost_spirit_core_hpp+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_boost_spirit_core_hpp=$ac_header_preproc fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_spirit_core_hpp" >&5 -$as_echo "$ac_cv_header_boost_spirit_core_hpp" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_boost_spirit_core_hpp" >&5 +echo "${ECHO_T}$ac_cv_header_boost_spirit_core_hpp" >&6; } fi -if test "x$ac_cv_header_boost_spirit_core_hpp" = x""yes; then +if test $ac_cv_header_boost_spirit_core_hpp = yes; then : else - { { $as_echo "$as_me:$LINENO: error: boost/spirit/core.hpp not found. install boost" >&5 -$as_echo "$as_me: error: boost/spirit/core.hpp not found. install boost" >&2;} + { { echo "$as_me:$LINENO: error: boost/spirit/core.hpp not found. install boost" >&5 +echo "$as_me: error: boost/spirit/core.hpp not found. install boost" >&2;} { (exit 1); exit 1; }; } fi @@ -16718,19 +16184,19 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu else - { $as_echo "$as_me:$LINENO: result: internal" >&5 -$as_echo "internal" >&6; } + { echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6; } BUILD_TYPE="$BUILD_TYPE BOOST" SYSTEM_BOOST=NO fi -{ $as_echo "$as_me:$LINENO: checking which vigra to use" >&5 -$as_echo_n "checking which vigra to use... " >&6; } +{ echo "$as_me:$LINENO: checking which vigra to use" >&5 +echo $ECHO_N "checking which vigra to use... $ECHO_C" >&6; } if test -n "$with_system_vigra" -o -n "$with_system_headers" && \ test "$with_system_vigra" != "no"; then - { $as_echo "$as_me:$LINENO: result: external" >&5 -$as_echo "external" >&6; } + { echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6; } SYSTEM_VIGRA=YES ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -16739,17 +16205,17 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex ac_compiler_gnu=$ac_cv_cxx_compiler_gnu if test "${ac_cv_header_vigra_copyimage_hxx+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for vigra/copyimage.hxx" >&5 -$as_echo_n "checking for vigra/copyimage.hxx... " >&6; } + { echo "$as_me:$LINENO: checking for vigra/copyimage.hxx" >&5 +echo $ECHO_N "checking for vigra/copyimage.hxx... $ECHO_C" >&6; } if test "${ac_cv_header_vigra_copyimage_hxx+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_vigra_copyimage_hxx" >&5 -$as_echo "$ac_cv_header_vigra_copyimage_hxx" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_vigra_copyimage_hxx" >&5 +echo "${ECHO_T}$ac_cv_header_vigra_copyimage_hxx" >&6; } else # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking vigra/copyimage.hxx usability" >&5 -$as_echo_n "checking vigra/copyimage.hxx usability... " >&6; } +{ echo "$as_me:$LINENO: checking vigra/copyimage.hxx usability" >&5 +echo $ECHO_N "checking vigra/copyimage.hxx usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -16765,33 +16231,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ $as_echo "$as_me:$LINENO: checking vigra/copyimage.hxx presence" >&5 -$as_echo_n "checking vigra/copyimage.hxx presence... " >&6; } +{ echo "$as_me:$LINENO: checking vigra/copyimage.hxx presence" >&5 +echo $ECHO_N "checking vigra/copyimage.hxx presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -16805,71 +16270,70 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: vigra/copyimage.hxx: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: vigra/copyimage.hxx: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: vigra/copyimage.hxx: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: vigra/copyimage.hxx: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: vigra/copyimage.hxx: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: vigra/copyimage.hxx: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: vigra/copyimage.hxx: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: vigra/copyimage.hxx: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: vigra/copyimage.hxx: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: vigra/copyimage.hxx: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: present but cannot be compiled" >&5 +echo "$as_me: WARNING: vigra/copyimage.hxx: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: vigra/copyimage.hxx: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: vigra/copyimage.hxx: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: vigra/copyimage.hxx: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: vigra/copyimage.hxx: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: vigra/copyimage.hxx: in the future, the compiler will take precedence" >&2;} ;; esac -{ $as_echo "$as_me:$LINENO: checking for vigra/copyimage.hxx" >&5 -$as_echo_n "checking for vigra/copyimage.hxx... " >&6; } +{ echo "$as_me:$LINENO: checking for vigra/copyimage.hxx" >&5 +echo $ECHO_N "checking for vigra/copyimage.hxx... $ECHO_C" >&6; } if test "${ac_cv_header_vigra_copyimage_hxx+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_vigra_copyimage_hxx=$ac_header_preproc fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_vigra_copyimage_hxx" >&5 -$as_echo "$ac_cv_header_vigra_copyimage_hxx" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_vigra_copyimage_hxx" >&5 +echo "${ECHO_T}$ac_cv_header_vigra_copyimage_hxx" >&6; } fi -if test "x$ac_cv_header_vigra_copyimage_hxx" = x""yes; then +if test $ac_cv_header_vigra_copyimage_hxx = yes; then : else - { { $as_echo "$as_me:$LINENO: error: vigra/copyimage.hxx not found. install vigra" >&5 -$as_echo "$as_me: error: vigra/copyimage.hxx not found. install vigra" >&2;} + { { echo "$as_me:$LINENO: error: vigra/copyimage.hxx not found. install vigra" >&5 +echo "$as_me: error: vigra/copyimage.hxx not found. install vigra" >&2;} { (exit 1); exit 1; }; } fi @@ -16881,33 +16345,33 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu else - { $as_echo "$as_me:$LINENO: result: internal" >&5 -$as_echo "internal" >&6; } + { echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6; } BUILD_TYPE="$BUILD_TYPE VIGRA" SYSTEM_VIGRA=NO fi -{ $as_echo "$as_me:$LINENO: checking which odbc headers to use" >&5 -$as_echo_n "checking which odbc headers to use... " >&6; } +{ echo "$as_me:$LINENO: checking which odbc headers to use" >&5 +echo $ECHO_N "checking which odbc headers to use... $ECHO_C" >&6; } if test -n "$with_system_odbc_headers" -o -n "$with_system_headers" && \ test "$with_system_odbc_headers" != "no"; then - { $as_echo "$as_me:$LINENO: result: external" >&5 -$as_echo "external" >&6; } + { echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6; } SYSTEM_ODBC_HEADERS=YES if test "${ac_cv_header_sqlext_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for sqlext.h" >&5 -$as_echo_n "checking for sqlext.h... " >&6; } + { echo "$as_me:$LINENO: checking for sqlext.h" >&5 +echo $ECHO_N "checking for sqlext.h... $ECHO_C" >&6; } if test "${ac_cv_header_sqlext_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sqlext_h" >&5 -$as_echo "$ac_cv_header_sqlext_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_sqlext_h" >&5 +echo "${ECHO_T}$ac_cv_header_sqlext_h" >&6; } else # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking sqlext.h usability" >&5 -$as_echo_n "checking sqlext.h usability... " >&6; } +{ echo "$as_me:$LINENO: checking sqlext.h usability" >&5 +echo $ECHO_N "checking sqlext.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -16923,33 +16387,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_header_compiler=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ $as_echo "$as_me:$LINENO: checking sqlext.h presence" >&5 -$as_echo_n "checking sqlext.h presence... " >&6; } +{ echo "$as_me:$LINENO: checking sqlext.h presence" >&5 +echo $ECHO_N "checking sqlext.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -16963,162 +16426,160 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: sqlext.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: sqlext.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sqlext.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: sqlext.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: sqlext.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: sqlext.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: sqlext.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: sqlext.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: sqlext.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: sqlext.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sqlext.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: sqlext.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sqlext.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: sqlext.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sqlext.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: sqlext.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sqlext.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: sqlext.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sqlext.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: sqlext.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: sqlext.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: sqlext.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: sqlext.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: sqlext.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: sqlext.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: sqlext.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: sqlext.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: sqlext.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: sqlext.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: sqlext.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: sqlext.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: sqlext.h: in the future, the compiler will take precedence" >&2;} ;; esac -{ $as_echo "$as_me:$LINENO: checking for sqlext.h" >&5 -$as_echo_n "checking for sqlext.h... " >&6; } +{ echo "$as_me:$LINENO: checking for sqlext.h" >&5 +echo $ECHO_N "checking for sqlext.h... $ECHO_C" >&6; } if test "${ac_cv_header_sqlext_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_sqlext_h=$ac_header_preproc fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sqlext_h" >&5 -$as_echo "$ac_cv_header_sqlext_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_sqlext_h" >&5 +echo "${ECHO_T}$ac_cv_header_sqlext_h" >&6; } fi -if test "x$ac_cv_header_sqlext_h" = x""yes; then +if test $ac_cv_header_sqlext_h = yes; then : else - { { $as_echo "$as_me:$LINENO: error: odbc not found. install odbc" >&5 -$as_echo "$as_me: error: odbc not found. install odbc" >&2;} + { { echo "$as_me:$LINENO: error: odbc not found. install odbc" >&5 +echo "$as_me: error: odbc not found. install odbc" >&2;} { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:$LINENO: result: internal" >&5 -$as_echo "internal" >&6; } + { echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6; } SYSTEM_ODBC_HEADERS=NO BUILD_TYPE="$BUILD_TYPE UNIXODBC" fi -{ $as_echo "$as_me:$LINENO: checking whether to enable build of Mozilla/Mozilla NSS-using components" >&5 -$as_echo_n "checking whether to enable build of Mozilla/Mozilla NSS-using components... " >&6; } +{ echo "$as_me:$LINENO: checking whether to enable build of Mozilla/Mozilla NSS-using components" >&5 +echo $ECHO_N "checking whether to enable build of Mozilla/Mozilla NSS-using components... $ECHO_C" >&6; } if test "$enable_mozilla" = "no"; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } WITH_MOZILLA=NO else - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } WITH_MOZILLA=YES fi -{ $as_echo "$as_me:$LINENO: checking whether to build Mozilla addressbook connectivity" >&5 -$as_echo_n "checking whether to build Mozilla addressbook connectivity... " >&6; } +{ echo "$as_me:$LINENO: checking whether to build Mozilla addressbook connectivity" >&5 +echo $ECHO_N "checking whether to build Mozilla addressbook connectivity... $ECHO_C" >&6; } if test "$enable_mozilla" = "no"; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } elif test "$with_system_mozilla" = "yes"; then - { $as_echo "$as_me:$LINENO: result: no, not possible with system-mozilla" >&5 -$as_echo "no, not possible with system-mozilla" >&6; } + { echo "$as_me:$LINENO: result: no, not possible with system-mozilla" >&5 +echo "${ECHO_T}no, not possible with system-mozilla" >&6; } else - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } fi -{ $as_echo "$as_me:$LINENO: checking whether to build XML Security support" >&5 -$as_echo_n "checking whether to build XML Security support... " >&6; } +{ echo "$as_me:$LINENO: checking whether to build XML Security support" >&5 +echo $ECHO_N "checking whether to build XML Security support... $ECHO_C" >&6; } if test "$enable_mozilla" = "no"; then - { $as_echo "$as_me:$LINENO: result: no, since Mozilla (NSS) disabled but needed" >&5 -$as_echo "no, since Mozilla (NSS) disabled but needed" >&6; } + { echo "$as_me:$LINENO: result: no, since Mozilla (NSS) disabled but needed" >&5 +echo "${ECHO_T}no, since Mozilla (NSS) disabled but needed" >&6; } else - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } fi -{ $as_echo "$as_me:$LINENO: checking whether to build LDAP configuration backend" >&5 -$as_echo_n "checking whether to build LDAP configuration backend... " >&6; } +{ echo "$as_me:$LINENO: checking whether to build LDAP configuration backend" >&5 +echo $ECHO_N "checking whether to build LDAP configuration backend... $ECHO_C" >&6; } if test -z "$enable_ldap" || test "$enable_ldap" = "yes"; then if test "$enable_mozilla" = "yes" || test "$with_openldap" = "yes"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } WITH_LDAP=YES else - { $as_echo "$as_me:$LINENO: result: no. Either Mozilla or OpenLDAP needed" >&5 -$as_echo "no. Either Mozilla or OpenLDAP needed" >&6; } + { echo "$as_me:$LINENO: result: no. Either Mozilla or OpenLDAP needed" >&5 +echo "${ECHO_T}no. Either Mozilla or OpenLDAP needed" >&6; } WITH_LDAP=NO fi else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } WITH_LDAP=NO fi if test "$WITH_LDAP" = "YES"; then - { $as_echo "$as_me:$LINENO: checking which LDAP SDK to use" >&5 -$as_echo_n "checking which LDAP SDK to use... " >&6; } + { echo "$as_me:$LINENO: checking which LDAP SDK to use" >&5 +echo $ECHO_N "checking which LDAP SDK to use... $ECHO_C" >&6; } if test -n "$with_openldap" && test "$with_openldap" != "no"; then - { $as_echo "$as_me:$LINENO: result: OpenLDAP" >&5 -$as_echo "OpenLDAP" >&6; } + { echo "$as_me:$LINENO: result: OpenLDAP" >&5 +echo "${ECHO_T}OpenLDAP" >&6; } WITH_OPENLDAP=YES for ac_header in ldap.h do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -17134,33 +16595,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_header_compiler=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -17174,88 +16634,84 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ;; esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF else - { { $as_echo "$as_me:$LINENO: error: ldap.h not found. install openldap libs" >&5 -$as_echo "$as_me: error: ldap.h not found. install openldap libs" >&2;} + { { echo "$as_me:$LINENO: error: ldap.h not found. install openldap libs" >&5 +echo "$as_me: error: ldap.h not found. install openldap libs" >&2;} { (exit 1); exit 1; }; } fi done -{ $as_echo "$as_me:$LINENO: checking for ldap_simple_bind_s in -lldap" >&5 -$as_echo_n "checking for ldap_simple_bind_s in -lldap... " >&6; } +{ echo "$as_me:$LINENO: checking for ldap_simple_bind_s in -lldap" >&5 +echo $ECHO_N "checking for ldap_simple_bind_s in -lldap... $ECHO_C" >&6; } if test "${ac_cv_lib_ldap_ldap_simple_bind_s+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lldap $LIBS" @@ -17287,37 +16743,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_ldap_ldap_simple_bind_s=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_ldap_ldap_simple_bind_s=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$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" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_simple_bind_s" >&5 +echo "${ECHO_T}$ac_cv_lib_ldap_ldap_simple_bind_s" >&6; } +if test $ac_cv_lib_ldap_ldap_simple_bind_s = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBLDAP 1 _ACEOF @@ -17325,18 +16777,18 @@ _ACEOF LIBS="-lldap $LIBS" else - { { $as_echo "$as_me:$LINENO: error: openldap lib not found or functional" >&5 -$as_echo "$as_me: error: openldap lib not found or functional" >&2;} + { { echo "$as_me:$LINENO: error: openldap lib not found or functional" >&5 +echo "$as_me: error: openldap lib not found or functional" >&2;} { (exit 1); exit 1; }; } fi # rumours say that OpenLDAP doesn't have that function. I looked and # it has it. Test for it to be sure -{ $as_echo "$as_me:$LINENO: checking for ldap_set_option in -lldap" >&5 -$as_echo_n "checking for ldap_set_option in -lldap... " >&6; } +{ echo "$as_me:$LINENO: checking for ldap_set_option in -lldap" >&5 +echo $ECHO_N "checking for ldap_set_option in -lldap... $ECHO_C" >&6; } if test "${ac_cv_lib_ldap_ldap_set_option+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lldap $LIBS" @@ -17368,37 +16820,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_ldap_ldap_set_option=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_ldap_ldap_set_option=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$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" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_set_option" >&5 +echo "${ECHO_T}$ac_cv_lib_ldap_ldap_set_option" >&6; } +if test $ac_cv_lib_ldap_ldap_set_option = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBLDAP 1 _ACEOF @@ -17406,14 +16854,14 @@ _ACEOF LIBS="-lldap $LIBS" else - { { $as_echo "$as_me:$LINENO: error: openldap lib not found or functional" >&5 -$as_echo "$as_me: error: openldap lib not found or functional" >&2;} + { { echo "$as_me:$LINENO: error: openldap lib not found or functional" >&5 +echo "$as_me: error: openldap lib not found or functional" >&2;} { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:$LINENO: result: Netscape/Mozilla" >&5 -$as_echo "Netscape/Mozilla" >&6; } + { echo "$as_me:$LINENO: result: Netscape/Mozilla" >&5 +echo "${ECHO_T}Netscape/Mozilla" >&6; } # TODO. Actually do a sanity check and check for # LDAP_OPT_SIZELIMIT and LDAP_X_OPT_CONNECT_TIMEOUT WITH_OPENLDAP=NO @@ -17422,14 +16870,14 @@ fi -{ $as_echo "$as_me:$LINENO: checking which mozilla to use" >&5 -$as_echo_n "checking which mozilla to use... " >&6; } +{ echo "$as_me:$LINENO: checking which mozilla to use" >&5 +echo $ECHO_N "checking which mozilla to use... $ECHO_C" >&6; } if test -n "$with_system_mozilla" && test "$with_system_mozilla" != "no"; then - { $as_echo "$as_me:$LINENO: result: external" >&5 -$as_echo "external" >&6; } + { echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6; } SYSTEM_MOZILLA=YES - { $as_echo "$as_me:$LINENO: checking which Mozilla flavour to use" >&5 -$as_echo_n "checking which Mozilla flavour to use... " >&6; } + { echo "$as_me:$LINENO: checking which Mozilla flavour to use" >&5 +echo $ECHO_N "checking which Mozilla flavour to use... $ECHO_C" >&6; } if test -n "$with_system_mozilla" && test "$with_system_mozilla" = "libxul"; then MOZ_FLAVOUR=libxul elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "xulrunner"; then @@ -17444,8 +16892,8 @@ $as_echo_n "checking which Mozilla flavour to use... " >&6; } MOZ_FLAVOUR=libxul fi tmp=`echo $MOZ_FLAVOUR | $PERL -e 'print ucfirst();'` - { $as_echo "$as_me:$LINENO: result: $tmp" >&5 -$as_echo "$tmp" >&6; } + { echo "$as_me:$LINENO: result: $tmp" >&5 +echo "${ECHO_T}$tmp" >&6; } succeeded=no @@ -17453,10 +16901,10 @@ $as_echo "$tmp" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -17471,7 +16919,7 @@ do 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -17484,11 +16932,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -17502,25 +16950,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:$LINENO: checking for nss" >&5 -$as_echo_n "checking for nss... " >&6; } + { echo "$as_me:$LINENO: checking for nss" >&5 +echo $ECHO_N "checking for nss... $ECHO_C" >&6; } if $PKG_CONFIG --exists "nss" ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=yes - { $as_echo "$as_me:$LINENO: checking MOZ_NSS_CFLAGS" >&5 -$as_echo_n "checking MOZ_NSS_CFLAGS... " >&6; } + { echo "$as_me:$LINENO: checking MOZ_NSS_CFLAGS" >&5 +echo $ECHO_N "checking MOZ_NSS_CFLAGS... $ECHO_C" >&6; } MOZ_NSS_CFLAGS=`$PKG_CONFIG --cflags "nss"` - { $as_echo "$as_me:$LINENO: result: $MOZ_NSS_CFLAGS" >&5 -$as_echo "$MOZ_NSS_CFLAGS" >&6; } + { echo "$as_me:$LINENO: result: $MOZ_NSS_CFLAGS" >&5 +echo "${ECHO_T}$MOZ_NSS_CFLAGS" >&6; } - { $as_echo "$as_me:$LINENO: checking MOZ_NSS_LIBS" >&5 -$as_echo_n "checking MOZ_NSS_LIBS... " >&6; } + { echo "$as_me:$LINENO: checking MOZ_NSS_LIBS" >&5 +echo $ECHO_N "checking MOZ_NSS_LIBS... $ECHO_C" >&6; } MOZ_NSS_LIBS=`$PKG_CONFIG --libs "nss"` - { $as_echo "$as_me:$LINENO: result: $MOZ_NSS_LIBS" >&5 -$as_echo "$MOZ_NSS_LIBS" >&6; } + { echo "$as_me:$LINENO: result: $MOZ_NSS_LIBS" >&5 +echo "${ECHO_T}$MOZ_NSS_LIBS" >&6; } else MOZ_NSS_CFLAGS="" MOZ_NSS_LIBS="" @@ -17551,10 +16999,10 @@ $as_echo "$MOZ_NSS_LIBS" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -17569,7 +17017,7 @@ do 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -17582,11 +17030,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -17600,25 +17048,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-nss " >&5 -$as_echo_n "checking for $MOZ_FLAVOUR-nss ... " >&6; } + { echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-nss " >&5 +echo $ECHO_N "checking for $MOZ_FLAVOUR-nss ... $ECHO_C" >&6; } if $PKG_CONFIG --exists "$MOZ_FLAVOUR-nss " ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=yes - { $as_echo "$as_me:$LINENO: checking MOZ_NSS_CFLAGS" >&5 -$as_echo_n "checking MOZ_NSS_CFLAGS... " >&6; } + { echo "$as_me:$LINENO: checking MOZ_NSS_CFLAGS" >&5 +echo $ECHO_N "checking MOZ_NSS_CFLAGS... $ECHO_C" >&6; } MOZ_NSS_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-nss "` - { $as_echo "$as_me:$LINENO: result: $MOZ_NSS_CFLAGS" >&5 -$as_echo "$MOZ_NSS_CFLAGS" >&6; } + { echo "$as_me:$LINENO: result: $MOZ_NSS_CFLAGS" >&5 +echo "${ECHO_T}$MOZ_NSS_CFLAGS" >&6; } - { $as_echo "$as_me:$LINENO: checking MOZ_NSS_LIBS" >&5 -$as_echo_n "checking MOZ_NSS_LIBS... " >&6; } + { echo "$as_me:$LINENO: checking MOZ_NSS_LIBS" >&5 +echo $ECHO_N "checking MOZ_NSS_LIBS... $ECHO_C" >&6; } MOZ_NSS_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-nss "` - { $as_echo "$as_me:$LINENO: result: $MOZ_NSS_LIBS" >&5 -$as_echo "$MOZ_NSS_LIBS" >&6; } + { echo "$as_me:$LINENO: result: $MOZ_NSS_LIBS" >&5 +echo "${ECHO_T}$MOZ_NSS_LIBS" >&6; } else MOZ_NSS_CFLAGS="" MOZ_NSS_LIBS="" @@ -17639,8 +17087,8 @@ $as_echo "$MOZ_NSS_LIBS" >&6; } if test $succeeded = yes; then : else - { { $as_echo "$as_me:$LINENO: error: Library requirements ($MOZ_FLAVOUR-nss ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -$as_echo "$as_me: error: Library requirements ($MOZ_FLAVOUR-nss ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { { echo "$as_me:$LINENO: error: Library requirements ($MOZ_FLAVOUR-nss ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements ($MOZ_FLAVOUR-nss ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi @@ -17656,10 +17104,10 @@ $as_echo "$as_me: error: Library requirements ($MOZ_FLAVOUR-nss ) not met; consi if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -17674,7 +17122,7 @@ do 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -17687,11 +17135,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -17705,25 +17153,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:$LINENO: checking for nspr " >&5 -$as_echo_n "checking for nspr ... " >&6; } + { echo "$as_me:$LINENO: checking for nspr " >&5 +echo $ECHO_N "checking for nspr ... $ECHO_C" >&6; } if $PKG_CONFIG --exists "nspr " ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=yes - { $as_echo "$as_me:$LINENO: checking MOZ_NSPR_CFLAGS" >&5 -$as_echo_n "checking MOZ_NSPR_CFLAGS... " >&6; } + { echo "$as_me:$LINENO: checking MOZ_NSPR_CFLAGS" >&5 +echo $ECHO_N "checking MOZ_NSPR_CFLAGS... $ECHO_C" >&6; } MOZ_NSPR_CFLAGS=`$PKG_CONFIG --cflags "nspr "` - { $as_echo "$as_me:$LINENO: result: $MOZ_NSPR_CFLAGS" >&5 -$as_echo "$MOZ_NSPR_CFLAGS" >&6; } + { echo "$as_me:$LINENO: result: $MOZ_NSPR_CFLAGS" >&5 +echo "${ECHO_T}$MOZ_NSPR_CFLAGS" >&6; } - { $as_echo "$as_me:$LINENO: checking MOZ_NSPR_LIBS" >&5 -$as_echo_n "checking MOZ_NSPR_LIBS... " >&6; } + { echo "$as_me:$LINENO: checking MOZ_NSPR_LIBS" >&5 +echo $ECHO_N "checking MOZ_NSPR_LIBS... $ECHO_C" >&6; } MOZ_NSPR_LIBS=`$PKG_CONFIG --libs "nspr "` - { $as_echo "$as_me:$LINENO: result: $MOZ_NSPR_LIBS" >&5 -$as_echo "$MOZ_NSPR_LIBS" >&6; } + { echo "$as_me:$LINENO: result: $MOZ_NSPR_LIBS" >&5 +echo "${ECHO_T}$MOZ_NSPR_LIBS" >&6; } else MOZ_NSPR_CFLAGS="" MOZ_NSPR_LIBS="" @@ -17744,8 +17192,8 @@ $as_echo "$MOZ_NSPR_LIBS" >&6; } if test $succeeded = yes; then : else - { { $as_echo "$as_me:$LINENO: error: Library requirements (nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -$as_echo "$as_me: error: Library requirements (nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { { echo "$as_me:$LINENO: error: Library requirements (nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi @@ -17758,10 +17206,10 @@ $as_echo "$as_me: error: Library requirements (nspr ) not met; consider adjustin if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -17776,7 +17224,7 @@ do 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -17789,11 +17237,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -17807,25 +17255,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-nspr " >&5 -$as_echo_n "checking for $MOZ_FLAVOUR-nspr ... " >&6; } + { echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-nspr " >&5 +echo $ECHO_N "checking for $MOZ_FLAVOUR-nspr ... $ECHO_C" >&6; } if $PKG_CONFIG --exists "$MOZ_FLAVOUR-nspr " ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=yes - { $as_echo "$as_me:$LINENO: checking MOZ_NSPR_CFLAGS" >&5 -$as_echo_n "checking MOZ_NSPR_CFLAGS... " >&6; } + { echo "$as_me:$LINENO: checking MOZ_NSPR_CFLAGS" >&5 +echo $ECHO_N "checking MOZ_NSPR_CFLAGS... $ECHO_C" >&6; } MOZ_NSPR_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-nspr "` - { $as_echo "$as_me:$LINENO: result: $MOZ_NSPR_CFLAGS" >&5 -$as_echo "$MOZ_NSPR_CFLAGS" >&6; } + { echo "$as_me:$LINENO: result: $MOZ_NSPR_CFLAGS" >&5 +echo "${ECHO_T}$MOZ_NSPR_CFLAGS" >&6; } - { $as_echo "$as_me:$LINENO: checking MOZ_NSPR_LIBS" >&5 -$as_echo_n "checking MOZ_NSPR_LIBS... " >&6; } + { echo "$as_me:$LINENO: checking MOZ_NSPR_LIBS" >&5 +echo $ECHO_N "checking MOZ_NSPR_LIBS... $ECHO_C" >&6; } MOZ_NSPR_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-nspr "` - { $as_echo "$as_me:$LINENO: result: $MOZ_NSPR_LIBS" >&5 -$as_echo "$MOZ_NSPR_LIBS" >&6; } + { echo "$as_me:$LINENO: result: $MOZ_NSPR_LIBS" >&5 +echo "${ECHO_T}$MOZ_NSPR_LIBS" >&6; } else MOZ_NSPR_CFLAGS="" MOZ_NSPR_LIBS="" @@ -17846,8 +17294,8 @@ $as_echo "$MOZ_NSPR_LIBS" >&6; } if test $succeeded = yes; then : else - { { $as_echo "$as_me:$LINENO: error: Library requirements ($MOZ_FLAVOUR-nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -$as_echo "$as_me: error: Library requirements ($MOZ_FLAVOUR-nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { { echo "$as_me:$LINENO: error: Library requirements ($MOZ_FLAVOUR-nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements ($MOZ_FLAVOUR-nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi @@ -17860,10 +17308,10 @@ $as_echo "$as_me: error: Library requirements ($MOZ_FLAVOUR-nspr ) not met; cons if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -17878,7 +17326,7 @@ do 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -17891,11 +17339,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -17909,25 +17357,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-xpcom" >&5 -$as_echo_n "checking for $MOZ_FLAVOUR-xpcom... " >&6; } + { echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-xpcom" >&5 +echo $ECHO_N "checking for $MOZ_FLAVOUR-xpcom... $ECHO_C" >&6; } if $PKG_CONFIG --exists "$MOZ_FLAVOUR-xpcom" ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=yes - { $as_echo "$as_me:$LINENO: checking MOZILLAXPCOM_CFLAGS" >&5 -$as_echo_n "checking MOZILLAXPCOM_CFLAGS... " >&6; } + { echo "$as_me:$LINENO: checking MOZILLAXPCOM_CFLAGS" >&5 +echo $ECHO_N "checking MOZILLAXPCOM_CFLAGS... $ECHO_C" >&6; } MOZILLAXPCOM_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-xpcom"` - { $as_echo "$as_me:$LINENO: result: $MOZILLAXPCOM_CFLAGS" >&5 -$as_echo "$MOZILLAXPCOM_CFLAGS" >&6; } + { echo "$as_me:$LINENO: result: $MOZILLAXPCOM_CFLAGS" >&5 +echo "${ECHO_T}$MOZILLAXPCOM_CFLAGS" >&6; } - { $as_echo "$as_me:$LINENO: checking MOZILLAXPCOM_LIBS" >&5 -$as_echo_n "checking MOZILLAXPCOM_LIBS... " >&6; } + { echo "$as_me:$LINENO: checking MOZILLAXPCOM_LIBS" >&5 +echo $ECHO_N "checking MOZILLAXPCOM_LIBS... $ECHO_C" >&6; } MOZILLAXPCOM_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-xpcom"` - { $as_echo "$as_me:$LINENO: result: $MOZILLAXPCOM_LIBS" >&5 -$as_echo "$MOZILLAXPCOM_LIBS" >&6; } + { echo "$as_me:$LINENO: result: $MOZILLAXPCOM_LIBS" >&5 +echo "${ECHO_T}$MOZILLAXPCOM_LIBS" >&6; } else MOZILLAXPCOM_CFLAGS="" MOZILLAXPCOM_LIBS="" @@ -17962,10 +17410,10 @@ $as_echo "$MOZILLAXPCOM_LIBS" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -17980,7 +17428,7 @@ do 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -17993,11 +17441,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -18011,25 +17459,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:$LINENO: checking for libxul " >&5 -$as_echo_n "checking for libxul ... " >&6; } + { echo "$as_me:$LINENO: checking for libxul " >&5 +echo $ECHO_N "checking for libxul ... $ECHO_C" >&6; } if $PKG_CONFIG --exists "libxul " ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=yes - { $as_echo "$as_me:$LINENO: checking MOZILLAXPCOM_CFLAGS" >&5 -$as_echo_n "checking MOZILLAXPCOM_CFLAGS... " >&6; } + { echo "$as_me:$LINENO: checking MOZILLAXPCOM_CFLAGS" >&5 +echo $ECHO_N "checking MOZILLAXPCOM_CFLAGS... $ECHO_C" >&6; } MOZILLAXPCOM_CFLAGS=`$PKG_CONFIG --cflags "libxul "` - { $as_echo "$as_me:$LINENO: result: $MOZILLAXPCOM_CFLAGS" >&5 -$as_echo "$MOZILLAXPCOM_CFLAGS" >&6; } + { echo "$as_me:$LINENO: result: $MOZILLAXPCOM_CFLAGS" >&5 +echo "${ECHO_T}$MOZILLAXPCOM_CFLAGS" >&6; } - { $as_echo "$as_me:$LINENO: checking MOZILLAXPCOM_LIBS" >&5 -$as_echo_n "checking MOZILLAXPCOM_LIBS... " >&6; } + { echo "$as_me:$LINENO: checking MOZILLAXPCOM_LIBS" >&5 +echo $ECHO_N "checking MOZILLAXPCOM_LIBS... $ECHO_C" >&6; } MOZILLAXPCOM_LIBS=`$PKG_CONFIG --libs "libxul "` - { $as_echo "$as_me:$LINENO: result: $MOZILLAXPCOM_LIBS" >&5 -$as_echo "$MOZILLAXPCOM_LIBS" >&6; } + { echo "$as_me:$LINENO: result: $MOZILLAXPCOM_LIBS" >&5 +echo "${ECHO_T}$MOZILLAXPCOM_LIBS" >&6; } else MOZILLAXPCOM_CFLAGS="" MOZILLAXPCOM_LIBS="" @@ -18050,8 +17498,8 @@ $as_echo "$MOZILLAXPCOM_LIBS" >&6; } if test $succeeded = yes; then : else - { { $as_echo "$as_me:$LINENO: error: Library requirements (libxul ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -$as_echo "$as_me: error: Library requirements (libxul ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { { echo "$as_me:$LINENO: error: Library requirements (libxul ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (libxul ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi @@ -18071,10 +17519,10 @@ $as_echo "$as_me: error: Library requirements (libxul ) not met; consider adjust CPPFLAGS="$CPPFLAGS $MOZ_NSS_CFLAGS" LDFLAGS="$LDFLAGS $MOZ_NSS_LIBS" -{ $as_echo "$as_me:$LINENO: checking for PK11_GetCertFromPrivateKey in -lnss3" >&5 -$as_echo_n "checking for PK11_GetCertFromPrivateKey in -lnss3... " >&6; } +{ echo "$as_me:$LINENO: checking for PK11_GetCertFromPrivateKey in -lnss3" >&5 +echo $ECHO_N "checking for PK11_GetCertFromPrivateKey in -lnss3... $ECHO_C" >&6; } if test "${ac_cv_lib_nss3_PK11_GetCertFromPrivateKey+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lnss3 $LIBS" @@ -18106,37 +17554,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_nss3_PK11_GetCertFromPrivateKey=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_nss3_PK11_GetCertFromPrivateKey=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nss3_PK11_GetCertFromPrivateKey" >&5 -$as_echo "$ac_cv_lib_nss3_PK11_GetCertFromPrivateKey" >&6; } -if test "x$ac_cv_lib_nss3_PK11_GetCertFromPrivateKey" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_nss3_PK11_GetCertFromPrivateKey" >&5 +echo "${ECHO_T}$ac_cv_lib_nss3_PK11_GetCertFromPrivateKey" >&6; } +if test $ac_cv_lib_nss3_PK11_GetCertFromPrivateKey = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBNSS3 1 _ACEOF @@ -18144,10 +17588,10 @@ _ACEOF LIBS="-lnss3 $LIBS" else - { { $as_echo "$as_me:$LINENO: error: PK11_GetCertFromPrivateKey missing but needed. + { { echo "$as_me:$LINENO: error: PK11_GetCertFromPrivateKey missing but needed. See https://bugzilla.mozilla.org/show_bug.cgi?id=262274. Fixed since nss 3.9.3 (contained by e.g. mozilla >= 1.7.5)" >&5 -$as_echo "$as_me: error: PK11_GetCertFromPrivateKey missing but needed. +echo "$as_me: error: PK11_GetCertFromPrivateKey missing but needed. See https://bugzilla.mozilla.org/show_bug.cgi?id=262274. Fixed since nss 3.9.3 (contained by e.g. mozilla >= 1.7.5)" >&2;} { (exit 1); exit 1; }; } @@ -18159,17 +17603,17 @@ fi MOZ_LIB_XPCOM=$MOZILLAXPCOM_LIBS if test "$WITH_LDAP" != "NO" && test "$WITH_OPENLDAP" != "YES"; then - { $as_echo "$as_me:$LINENO: checking whether $tmp was compiled with --enable-ldap" >&5 -$as_echo_n "checking whether $tmp was compiled with --enable-ldap... " >&6; } + { echo "$as_me:$LINENO: checking whether $tmp was compiled with --enable-ldap" >&5 +echo $ECHO_N "checking whether $tmp was compiled with --enable-ldap... $ECHO_C" >&6; } if test -d "$MOZ_INC/ldap"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } MOZ_LDAP_CFLAGS="-I$MOZ_INC" else - { { $as_echo "$as_me:$LINENO: error: no. + { { echo "$as_me:$LINENO: error: no. Could not find LDAP header include files in $MOZ_INC/ldap. Please recompile $tmp with --enable-ldap or use --with-openldap." >&5 -$as_echo "$as_me: error: no. +echo "$as_me: error: no. Could not find LDAP header include files in $MOZ_INC/ldap. Please recompile $tmp with --enable-ldap or use --with-openldap." >&2;} { (exit 1); exit 1; }; } @@ -18183,46 +17627,46 @@ Please recompile $tmp with --enable-ldap or use --with-openldap." >&2;} fi elif test "$enable_mozilla" = "no"; then - { $as_echo "$as_me:$LINENO: result: none" >&5 -$as_echo "none" >&6; } + { echo "$as_me:$LINENO: result: none" >&5 +echo "${ECHO_T}none" >&6; } WITH_MOZILLA=NO else - { $as_echo "$as_me:$LINENO: result: internal" >&5 -$as_echo "internal" >&6; } + { echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6; } SYSTEM_MOZILLA=NO BUILD_TYPE="$BUILD_TYPE MOZ" if test -z "$with_mozilla_version"; then MOZILLA_VERSION= else - { $as_echo "$as_me:$LINENO: checking which mozilla version to build" >&5 -$as_echo_n "checking which mozilla version to build... " >&6; } + { echo "$as_me:$LINENO: checking which mozilla version to build" >&5 +echo $ECHO_N "checking which mozilla version to build... $ECHO_C" >&6; } MOZILLA_VERSION=$with_mozilla_version enable_build_mozilla=1 - { $as_echo "$as_me:$LINENO: result: $MOZILLA_VERSION" >&5 -$as_echo "$MOZILLA_VERSION" >&6; } + { echo "$as_me:$LINENO: result: $MOZILLA_VERSION" >&5 +echo "${ECHO_T}$MOZILLA_VERSION" >&6; } fi -{ $as_echo "$as_me:$LINENO: checking for toolkit mozilla should use" >&5 -$as_echo_n "checking for toolkit mozilla should use... " >&6; } +{ echo "$as_me:$LINENO: checking for toolkit mozilla should use" >&5 +echo $ECHO_N "checking for toolkit mozilla should use... $ECHO_C" >&6; } if test -z "$with_mozilla_toolkit"; then if test "$_os" != "WINNT" ; then if test "$_os" = "Darwin" ; then MOZILLA_TOOLKIT=mac - { $as_echo "$as_me:$LINENO: result: mac" >&5 -$as_echo "mac" >&6; } + { echo "$as_me:$LINENO: result: mac" >&5 +echo "${ECHO_T}mac" >&6; } else MOZILLA_TOOLKIT=gtk2 - { $as_echo "$as_me:$LINENO: result: gtk2" >&5 -$as_echo "gtk2" >&6; } + { echo "$as_me:$LINENO: result: gtk2" >&5 +echo "${ECHO_T}gtk2" >&6; } fi fi else MOZILLA_TOOLKIT=$with_mozilla_toolkit enable_build_mozilla=1 - { $as_echo "$as_me:$LINENO: result: $MOZILLA_TOOLKIT" >&5 -$as_echo "$MOZILLA_TOOLKIT" >&6; } + { echo "$as_me:$LINENO: result: $MOZILLA_TOOLKIT" >&5 +echo "${ECHO_T}$MOZILLA_TOOLKIT" >&6; } fi #if test "$_os" = "Darwin" && test "$MOZILLA_TOOLKIT" != "gtk2"; then # #only gtk2 toolkit supported - xlib or cocoa nees glib1 and libIDL1 - the latter is not @@ -18239,16 +17683,16 @@ else enable_build_mozilla= fi -{ $as_echo "$as_me:$LINENO: checking whether to build Mozilla/SeaMonkey" >&5 -$as_echo_n "checking whether to build Mozilla/SeaMonkey... " >&6; } +{ echo "$as_me:$LINENO: checking whether to build Mozilla/SeaMonkey" >&5 +echo $ECHO_N "checking whether to build Mozilla/SeaMonkey... $ECHO_C" >&6; } if test -n "$enable_build_mozilla"; then BUILD_MOZAB="TRUE" - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else BUILD_MOZAB="" - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi if test "$BUILD_MOZAB" = "TRUE"; then @@ -18256,13 +17700,13 @@ if test "$BUILD_MOZAB" = "TRUE"; then if test "$WITH_MINGWIN" != "yes"; then # compiling with MSVC. Only supported platform here is MSVS2005 at the moment. if test "$MSVSVER" != "2005"; then - { { $as_echo "$as_me:$LINENO: error: Building SeaMonkey is supported with Microsoft Visual Studio .NET 2005 only." >&5 -$as_echo "$as_me: error: Building SeaMonkey is supported with Microsoft Visual Studio .NET 2005 only." >&2;} + { { echo "$as_me:$LINENO: error: Building SeaMonkey is supported with Microsoft Visual Studio .NET 2005 only." >&5 +echo "$as_me: error: Building SeaMonkey is supported with Microsoft Visual Studio .NET 2005 only." >&2;} { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:$LINENO: WARNING: Building SeaMonkey with mingwin is not tested, and likely to break." >&5 -$as_echo "$as_me: WARNING: Building SeaMonkey with mingwin is not tested, and likely to break." >&2;} + { echo "$as_me:$LINENO: WARNING: Building SeaMonkey with mingwin is not tested, and likely to break." >&5 +echo "$as_me: WARNING: Building SeaMonkey with mingwin is not tested, and likely to break." >&2;} echo "Building SeaMonkey with mingwin is not tested, and likely to break." >> warn fi fi @@ -18272,56 +17716,56 @@ $as_echo "$as_me: WARNING: Building SeaMonkey with mingwin is not tested, and li fi MOZILLA_SOURCE_VERSION="seamonkey-${MOZILLA_VERSION}.source" for e in gz bz2; do - { $as_echo "$as_me:$LINENO: checking for $MOZILLA_SOURCE_VERSION.tar.$e" >&5 -$as_echo_n "checking for $MOZILLA_SOURCE_VERSION.tar.$e... " >&6; } + { echo "$as_me:$LINENO: checking for $MOZILLA_SOURCE_VERSION.tar.$e" >&5 +echo $ECHO_N "checking for $MOZILLA_SOURCE_VERSION.tar.$e... $ECHO_C" >&6; } if test ! -e "moz/download/$MOZILLA_SOURCE_VERSION.tar.$e" && test "$HAVE_MOZILLA_TARBALL" != "y"; then - { $as_echo "$as_me:$LINENO: result: not found" >&5 -$as_echo "not found" >&6; } + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } HAVE_MOZILLA_TARBALL=n else - { $as_echo "$as_me:$LINENO: result: found" >&5 -$as_echo "found" >&6; } + { echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6; } HAVE_MOZILLA_TARBALL=y fi done if test "$HAVE_MOZILLA_TARBALL" != "y"; then - { { $as_echo "$as_me:$LINENO: error: Mozilla/SeaMonkey source archive not found. + { { echo "$as_me:$LINENO: error: Mozilla/SeaMonkey source archive not found. Please copy $MOZILLA_SOURCE_VERSION.tar.bz2 or $MOZILLA_SOURCE_VERSION.tar.gz to moz/download/. The archives can be found here: http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/$MOZILLA_VERSION/" >&5 -$as_echo "$as_me: error: Mozilla/SeaMonkey source archive not found. +echo "$as_me: error: Mozilla/SeaMonkey source archive not found. Please copy $MOZILLA_SOURCE_VERSION.tar.bz2 or $MOZILLA_SOURCE_VERSION.tar.gz to moz/download/. The archives can be found here: http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/$MOZILLA_VERSION/" >&2;} { (exit 1); exit 1; }; } fi if test "$_os" = "WINNT"; then - { $as_echo "$as_me:$LINENO: checking for moztools binaries" >&5 -$as_echo_n "checking for moztools binaries... " >&6; } + { echo "$as_me:$LINENO: checking for moztools binaries" >&5 +echo $ECHO_N "checking for moztools binaries... $ECHO_C" >&6; } if test ! -e "moz/download/vc8-moztools.zip" ; then - { { $as_echo "$as_me:$LINENO: error: The following file is missing in moz/download: vc8-moztools.zip + { { echo "$as_me:$LINENO: error: The following file is missing in moz/download: vc8-moztools.zip (from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc8/)" >&5 -$as_echo "$as_me: error: The following file is missing in moz/download: vc8-moztools.zip +echo "$as_me: error: The following file is missing in moz/download: vc8-moztools.zip (from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc8/)" >&2;} { (exit 1); exit 1; }; } else - { $as_echo "$as_me:$LINENO: result: ok" >&5 -$as_echo "ok" >&6; } + { echo "$as_me:$LINENO: result: ok" >&5 +echo "${ECHO_T}ok" >&6; } fi elif test "$_os" = "Darwin"; then if test "$MOZILLA_TOOLKIT" = "gtk2"; then - { $as_echo "$as_me:$LINENO: checking whether mozilla can be built..." >&5 -$as_echo "$as_me: checking whether mozilla can be built..." >&6;} + { echo "$as_me:$LINENO: checking whether mozilla can be built..." >&5 +echo "$as_me: checking whether mozilla can be built..." >&6;} succeeded=no if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -18336,7 +17780,7 @@ do 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -18349,11 +17793,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -18367,25 +17811,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:$LINENO: checking for gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8" >&5 -$as_echo_n "checking for gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8... " >&6; } + { echo "$as_me:$LINENO: checking for gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8" >&5 +echo $ECHO_N "checking for gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8... $ECHO_C" >&6; } if $PKG_CONFIG --exists "gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8" ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=yes - { $as_echo "$as_me:$LINENO: checking MOZGTK2_CFLAGS" >&5 -$as_echo_n "checking MOZGTK2_CFLAGS... " >&6; } + { echo "$as_me:$LINENO: checking MOZGTK2_CFLAGS" >&5 +echo $ECHO_N "checking MOZGTK2_CFLAGS... $ECHO_C" >&6; } MOZGTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8"` - { $as_echo "$as_me:$LINENO: result: $MOZGTK2_CFLAGS" >&5 -$as_echo "$MOZGTK2_CFLAGS" >&6; } + { echo "$as_me:$LINENO: result: $MOZGTK2_CFLAGS" >&5 +echo "${ECHO_T}$MOZGTK2_CFLAGS" >&6; } - { $as_echo "$as_me:$LINENO: checking MOZGTK2_LIBS" >&5 -$as_echo_n "checking MOZGTK2_LIBS... " >&6; } + { echo "$as_me:$LINENO: checking MOZGTK2_LIBS" >&5 +echo $ECHO_N "checking MOZGTK2_LIBS... $ECHO_C" >&6; } MOZGTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8"` - { $as_echo "$as_me:$LINENO: result: $MOZGTK2_LIBS" >&5 -$as_echo "$MOZGTK2_LIBS" >&6; } + { echo "$as_me:$LINENO: result: $MOZGTK2_LIBS" >&5 +echo "${ECHO_T}$MOZGTK2_LIBS" >&6; } else MOZGTK2_CFLAGS="" MOZGTK2_LIBS="" @@ -18404,11 +17848,11 @@ $as_echo "$MOZGTK2_LIBS" >&6; } fi if test $succeeded = yes; then - { $as_echo "$as_me:$LINENO: OK - can build mozilla" >&5 -$as_echo "$as_me: OK - can build mozilla" >&6;} + { echo "$as_me:$LINENO: OK - can build mozilla" >&5 +echo "$as_me: OK - can build mozilla" >&6;} else - { { $as_echo "$as_me:$LINENO: error: Prerequisites to build mozilla not met. Either use the precompiled mozilla binaries or install the missing packages" >&5 -$as_echo "$as_me: error: Prerequisites to build mozilla not met. Either use the precompiled mozilla binaries or install the missing packages" >&2;} + { { echo "$as_me:$LINENO: error: Prerequisites to build mozilla not met. Either use the precompiled mozilla binaries or install the missing packages" >&5 +echo "$as_me: error: Prerequisites to build mozilla not met. Either use the precompiled mozilla binaries or install the missing packages" >&2;} { (exit 1); exit 1; }; } fi @@ -18419,10 +17863,10 @@ $as_echo "$as_me: error: Prerequisites to build mozilla not met. Either use the if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -18437,7 +17881,7 @@ do 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -18450,11 +17894,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -18468,25 +17912,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:$LINENO: checking for libIDL >= 0.6.3 libIDL <= 0.6.8" >&5 -$as_echo_n "checking for libIDL >= 0.6.3 libIDL <= 0.6.8... " >&6; } + { echo "$as_me:$LINENO: checking for libIDL >= 0.6.3 libIDL <= 0.6.8" >&5 +echo $ECHO_N "checking for libIDL >= 0.6.3 libIDL <= 0.6.8... $ECHO_C" >&6; } if $PKG_CONFIG --exists "libIDL >= 0.6.3 libIDL <= 0.6.8" ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=yes - { $as_echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5 -$as_echo_n "checking MOZLIBREQ_CFLAGS... " >&6; } + { echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5 +echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6; } MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "libIDL >= 0.6.3 libIDL <= 0.6.8"` - { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5 -$as_echo "$MOZLIBREQ_CFLAGS" >&6; } + { echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5 +echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6; } - { $as_echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5 -$as_echo_n "checking MOZLIBREQ_LIBS... " >&6; } + { echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5 +echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6; } MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "libIDL >= 0.6.3 libIDL <= 0.6.8"` - { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5 -$as_echo "$MOZLIBREQ_LIBS" >&6; } + { echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5 +echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6; } else MOZLIBREQ_CFLAGS="" MOZLIBREQ_LIBS="" @@ -18511,8 +17955,8 @@ $as_echo "$MOZLIBREQ_LIBS" >&6; } fi if test -z "$MOZIDL"; then - { { $as_echo "$as_me:$LINENO: error: libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla." >&5 -$as_echo "$as_me: error: libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla." >&2;} + { { echo "$as_me:$LINENO: error: libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla." >&5 +echo "$as_me: error: libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla." >&2;} { (exit 1); exit 1; }; } fi fi @@ -18525,10 +17969,10 @@ $as_echo "$as_me: error: libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to b if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -18543,7 +17987,7 @@ do 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -18556,11 +18000,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -18574,25 +18018,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:$LINENO: checking for gtk+-2.0" >&5 -$as_echo_n "checking for gtk+-2.0... " >&6; } + { echo "$as_me:$LINENO: checking for gtk+-2.0" >&5 +echo $ECHO_N "checking for gtk+-2.0... $ECHO_C" >&6; } if $PKG_CONFIG --exists "gtk+-2.0" ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=yes - { $as_echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5 -$as_echo_n "checking MOZLIBREQ_CFLAGS... " >&6; } + { echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5 +echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6; } MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0"` - { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5 -$as_echo "$MOZLIBREQ_CFLAGS" >&6; } + { echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5 +echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6; } - { $as_echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5 -$as_echo_n "checking MOZLIBREQ_LIBS... " >&6; } + { echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5 +echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6; } MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "gtk+-2.0"` - { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5 -$as_echo "$MOZLIBREQ_LIBS" >&6; } + { echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5 +echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6; } else MOZLIBREQ_CFLAGS="" MOZLIBREQ_LIBS="" @@ -18617,8 +18061,8 @@ $as_echo "$MOZLIBREQ_LIBS" >&6; } fi if test -z "$MOZGTK"; then - { { $as_echo "$as_me:$LINENO: error: GTK2 is needed to build mozilla." >&5 -$as_echo "$as_me: error: GTK2 is needed to build mozilla." >&2;} + { { echo "$as_me:$LINENO: error: GTK2 is needed to build mozilla." >&5 +echo "$as_me: error: GTK2 is needed to build mozilla." >&2;} { (exit 1); exit 1; }; } fi @@ -18627,10 +18071,10 @@ $as_echo "$as_me: error: GTK2 is needed to build mozilla." >&2;} if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -18645,7 +18089,7 @@ do 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -18658,11 +18102,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -18676,25 +18120,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:$LINENO: checking for libIDL-2.0 >= 0.8.0" >&5 -$as_echo_n "checking for libIDL-2.0 >= 0.8.0... " >&6; } + { echo "$as_me:$LINENO: checking for libIDL-2.0 >= 0.8.0" >&5 +echo $ECHO_N "checking for libIDL-2.0 >= 0.8.0... $ECHO_C" >&6; } if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=yes - { $as_echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5 -$as_echo_n "checking MOZLIBREQ_CFLAGS... " >&6; } + { echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5 +echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6; } MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"` - { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5 -$as_echo "$MOZLIBREQ_CFLAGS" >&6; } + { echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5 +echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6; } - { $as_echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5 -$as_echo_n "checking MOZLIBREQ_LIBS... " >&6; } + { echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5 +echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6; } MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "libIDL-2.0 >= 0.8.0"` - { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5 -$as_echo "$MOZLIBREQ_LIBS" >&6; } + { echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5 +echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6; } else MOZLIBREQ_CFLAGS="" MOZLIBREQ_LIBS="" @@ -18719,8 +18163,8 @@ $as_echo "$MOZLIBREQ_LIBS" >&6; } fi if test -z "$MOZIDL"; then - { { $as_echo "$as_me:$LINENO: error: libIDL >= 0.8.0 is needed when using GTK2 to build mozilla." >&5 -$as_echo "$as_me: error: libIDL >= 0.8.0 is needed when using GTK2 to build mozilla." >&2;} + { { echo "$as_me:$LINENO: error: libIDL >= 0.8.0 is needed when using GTK2 to build mozilla." >&5 +echo "$as_me: error: libIDL >= 0.8.0 is needed when using GTK2 to build mozilla." >&2;} { (exit 1); exit 1; }; } fi else @@ -18730,10 +18174,10 @@ $as_echo "$as_me: error: libIDL >= 0.8.0 is needed when using GTK2 to build mozi if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -18748,7 +18192,7 @@ do 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -18761,11 +18205,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -18779,25 +18223,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:$LINENO: checking for gtk+ >= 1.2.3" >&5 -$as_echo_n "checking for gtk+ >= 1.2.3... " >&6; } + { echo "$as_me:$LINENO: checking for gtk+ >= 1.2.3" >&5 +echo $ECHO_N "checking for gtk+ >= 1.2.3... $ECHO_C" >&6; } if $PKG_CONFIG --exists "gtk+ >= 1.2.3" ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=yes - { $as_echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5 -$as_echo_n "checking MOZLIBREQ_CFLAGS... " >&6; } + { echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5 +echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6; } MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "gtk+ >= 1.2.3"` - { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5 -$as_echo "$MOZLIBREQ_CFLAGS" >&6; } + { echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5 +echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6; } - { $as_echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5 -$as_echo_n "checking MOZLIBREQ_LIBS... " >&6; } + { echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5 +echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6; } MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "gtk+ >= 1.2.3"` - { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5 -$as_echo "$MOZLIBREQ_LIBS" >&6; } + { echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5 +echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6; } else MOZLIBREQ_CFLAGS="" MOZLIBREQ_LIBS="" @@ -18822,8 +18266,8 @@ $as_echo "$MOZLIBREQ_LIBS" >&6; } fi if test -z "$MOZGTK"; then - { { $as_echo "$as_me:$LINENO: error: gtk 1.2 is needed when not using GTK2 to build mozilla." >&5 -$as_echo "$as_me: error: gtk 1.2 is needed when not using GTK2 to build mozilla." >&2;} + { { echo "$as_me:$LINENO: error: gtk 1.2 is needed when not using GTK2 to build mozilla." >&5 +echo "$as_me: error: gtk 1.2 is needed when not using GTK2 to build mozilla." >&2;} { (exit 1); exit 1; }; } fi @@ -18832,10 +18276,10 @@ $as_echo "$as_me: error: gtk 1.2 is needed when not using GTK2 to build mozilla. if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -18850,7 +18294,7 @@ do 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -18863,11 +18307,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -18881,25 +18325,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:$LINENO: checking for libidl >= 0.6.3 libidl <= 0.6.8" >&5 -$as_echo_n "checking for libidl >= 0.6.3 libidl <= 0.6.8... " >&6; } + { echo "$as_me:$LINENO: checking for libidl >= 0.6.3 libidl <= 0.6.8" >&5 +echo $ECHO_N "checking for libidl >= 0.6.3 libidl <= 0.6.8... $ECHO_C" >&6; } if $PKG_CONFIG --exists "libidl >= 0.6.3 libidl <= 0.6.8" ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=yes - { $as_echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5 -$as_echo_n "checking MOZLIBREQ_CFLAGS... " >&6; } + { echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5 +echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6; } MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "libidl >= 0.6.3 libidl <= 0.6.8"` - { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5 -$as_echo "$MOZLIBREQ_CFLAGS" >&6; } + { echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5 +echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6; } - { $as_echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5 -$as_echo_n "checking MOZLIBREQ_LIBS... " >&6; } + { echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5 +echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6; } MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "libidl >= 0.6.3 libidl <= 0.6.8"` - { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5 -$as_echo "$MOZLIBREQ_LIBS" >&6; } + { echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5 +echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6; } else MOZLIBREQ_CFLAGS="" MOZLIBREQ_LIBS="" @@ -18924,8 +18368,8 @@ $as_echo "$MOZLIBREQ_LIBS" >&6; } fi if test -z "$MOZIDL"; then - { { $as_echo "$as_me:$LINENO: error: libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla." >&5 -$as_echo "$as_me: error: libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla." >&2;} + { { echo "$as_me:$LINENO: error: libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla." >&5 +echo "$as_me: error: libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla." >&2;} { (exit 1); exit 1; }; } fi fi @@ -18944,25 +18388,25 @@ fi -{ $as_echo "$as_me:$LINENO: checking which sane header to use" >&5 -$as_echo_n "checking which sane header to use... " >&6; } +{ echo "$as_me:$LINENO: checking which sane header to use" >&5 +echo $ECHO_N "checking which sane header to use... $ECHO_C" >&6; } if test -n "$with_system_sane_header" -o -n "$with_system_headers" && \ test "$with_system_sane_header" != "no"; then - { $as_echo "$as_me:$LINENO: result: external" >&5 -$as_echo "external" >&6; } + { echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6; } SYSTEM_SANE_HEADER=YES if test "${ac_cv_header_sane_sane_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for sane/sane.h" >&5 -$as_echo_n "checking for sane/sane.h... " >&6; } + { echo "$as_me:$LINENO: checking for sane/sane.h" >&5 +echo $ECHO_N "checking for sane/sane.h... $ECHO_C" >&6; } if test "${ac_cv_header_sane_sane_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sane_sane_h" >&5 -$as_echo "$ac_cv_header_sane_sane_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_sane_sane_h" >&5 +echo "${ECHO_T}$ac_cv_header_sane_sane_h" >&6; } else # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking sane/sane.h usability" >&5 -$as_echo_n "checking sane/sane.h usability... " >&6; } +{ echo "$as_me:$LINENO: checking sane/sane.h usability" >&5 +echo $ECHO_N "checking sane/sane.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -18978,33 +18422,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_header_compiler=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ $as_echo "$as_me:$LINENO: checking sane/sane.h presence" >&5 -$as_echo_n "checking sane/sane.h presence... " >&6; } +{ echo "$as_me:$LINENO: checking sane/sane.h presence" >&5 +echo $ECHO_N "checking sane/sane.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -19018,89 +18461,88 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: sane/sane.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: sane/sane.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sane/sane.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: sane/sane.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: sane/sane.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: sane/sane.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: sane/sane.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: sane/sane.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: sane/sane.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: sane/sane.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sane/sane.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: sane/sane.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sane/sane.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: sane/sane.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sane/sane.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: sane/sane.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sane/sane.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: sane/sane.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: sane/sane.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: sane/sane.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: sane/sane.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: sane/sane.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: sane/sane.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: sane/sane.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: sane/sane.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: sane/sane.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: sane/sane.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: sane/sane.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: sane/sane.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: sane/sane.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: sane/sane.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: sane/sane.h: in the future, the compiler will take precedence" >&2;} ;; esac -{ $as_echo "$as_me:$LINENO: checking for sane/sane.h" >&5 -$as_echo_n "checking for sane/sane.h... " >&6; } +{ echo "$as_me:$LINENO: checking for sane/sane.h" >&5 +echo $ECHO_N "checking for sane/sane.h... $ECHO_C" >&6; } if test "${ac_cv_header_sane_sane_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_sane_sane_h=$ac_header_preproc fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sane_sane_h" >&5 -$as_echo "$ac_cv_header_sane_sane_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_sane_sane_h" >&5 +echo "${ECHO_T}$ac_cv_header_sane_sane_h" >&6; } fi -if test "x$ac_cv_header_sane_sane_h" = x""yes; then +if test $ac_cv_header_sane_sane_h = yes; then : else - { { $as_echo "$as_me:$LINENO: error: sane not found. install sane" >&5 -$as_echo "$as_me: error: sane not found. install sane" >&2;} + { { echo "$as_me:$LINENO: error: sane not found. install sane" >&5 +echo "$as_me: error: sane not found. install sane" >&2;} { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:$LINENO: result: internal" >&5 -$as_echo "internal" >&6; } + { echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6; } SYSTEM_SANE_HEADER=NO BUILD_TYPE="$BUILD_TYPE SANE" fi -{ $as_echo "$as_me:$LINENO: checking which icu to use" >&5 -$as_echo_n "checking which icu to use... " >&6; } +{ echo "$as_me:$LINENO: checking which icu to use" >&5 +echo $ECHO_N "checking which icu to use... $ECHO_C" >&6; } if test -n "$with_system_icu" -o -n "$with_system_libs" && \ test "$with_system_icu" != "no"; then - { $as_echo "$as_me:$LINENO: result: external" >&5 -$as_echo "external" >&6; } + { echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6; } SYSTEM_ICU=YES ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -19108,8 +18550,8 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - { $as_echo "$as_me:$LINENO: checking for unicode/rbbi.h" >&5 -$as_echo_n "checking for unicode/rbbi.h... " >&6; } + { echo "$as_me:$LINENO: checking for unicode/rbbi.h" >&5 +echo $ECHO_N "checking for unicode/rbbi.h... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -19123,36 +18565,35 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err }; then - { $as_echo "$as_me:$LINENO: result: checked." >&5 -$as_echo "checked." >&6; } + { echo "$as_me:$LINENO: result: checked." >&5 +echo "${ECHO_T}checked." >&6; } else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { { $as_echo "$as_me:$LINENO: error: icu headers not found." >&5 -$as_echo "$as_me: error: icu headers not found." >&2;} + { { echo "$as_me:$LINENO: error: icu headers not found." >&5 +echo "$as_me: error: icu headers not found." >&2;} { (exit 1); exit 1; }; } fi rm -f conftest.err conftest.$ac_ext # Extract the first word of "genbrk", so it can be a program name with args. set dummy genbrk; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_SYSTEM_GENBRK+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $SYSTEM_GENBRK in [\\/]* | ?:[\\/]*) @@ -19168,7 +18609,7 @@ do 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_path_SYSTEM_GENBRK="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -19180,25 +18621,25 @@ esac fi SYSTEM_GENBRK=$ac_cv_path_SYSTEM_GENBRK if test -n "$SYSTEM_GENBRK"; then - { $as_echo "$as_me:$LINENO: result: $SYSTEM_GENBRK" >&5 -$as_echo "$SYSTEM_GENBRK" >&6; } + { echo "$as_me:$LINENO: result: $SYSTEM_GENBRK" >&5 +echo "${ECHO_T}$SYSTEM_GENBRK" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi if test -z "$SYSTEM_GENBRK"; then - { { $as_echo "$as_me:$LINENO: error: \\"genbrk\\" not found in \$PATH, install the icu development tool \\"genbrk\"\" >&5 -$as_echo "$as_me: error: \\"genbrk\\" not found in \$PATH, install the icu development tool \\"genbrk\"\" >&2;} + { { echo "$as_me:$LINENO: error: \\"genbrk\\" not found in \$PATH, install the icu development tool \\"genbrk\"\" >&5 +echo "$as_me: error: \\"genbrk\\" not found in \$PATH, install the icu development tool \\"genbrk\"\" >&2;} { (exit 1); exit 1; }; } fi # Extract the first word of "genccode", so it can be a program name with args. set dummy genccode; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_SYSTEM_GENCCODE+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $SYSTEM_GENCCODE in [\\/]* | ?:[\\/]*) @@ -19214,7 +18655,7 @@ do 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_path_SYSTEM_GENCCODE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -19226,25 +18667,25 @@ esac fi SYSTEM_GENCCODE=$ac_cv_path_SYSTEM_GENCCODE if test -n "$SYSTEM_GENCCODE"; then - { $as_echo "$as_me:$LINENO: result: $SYSTEM_GENCCODE" >&5 -$as_echo "$SYSTEM_GENCCODE" >&6; } + { echo "$as_me:$LINENO: result: $SYSTEM_GENCCODE" >&5 +echo "${ECHO_T}$SYSTEM_GENCCODE" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi if test -z "$SYSTEM_GENCCODE"; then - { { $as_echo "$as_me:$LINENO: error: \\"genccode\\" not found in \$PATH, install the icu development tool \\"genccode\"\" >&5 -$as_echo "$as_me: error: \\"genccode\\" not found in \$PATH, install the icu development tool \\"genccode\"\" >&2;} + { { echo "$as_me:$LINENO: error: \\"genccode\\" not found in \$PATH, install the icu development tool \\"genccode\"\" >&5 +echo "$as_me: error: \\"genccode\\" not found in \$PATH, install the icu development tool \\"genccode\"\" >&2;} { (exit 1); exit 1; }; } fi # Extract the first word of "gencmn", so it can be a program name with args. set dummy gencmn; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_SYSTEM_GENCMN+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $SYSTEM_GENCMN in [\\/]* | ?:[\\/]*) @@ -19260,7 +18701,7 @@ do 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_path_SYSTEM_GENCMN="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -19272,29 +18713,27 @@ esac fi SYSTEM_GENCMN=$ac_cv_path_SYSTEM_GENCMN if test -n "$SYSTEM_GENCMN"; then - { $as_echo "$as_me:$LINENO: result: $SYSTEM_GENCMN" >&5 -$as_echo "$SYSTEM_GENCMN" >&6; } + { echo "$as_me:$LINENO: result: $SYSTEM_GENCMN" >&5 +echo "${ECHO_T}$SYSTEM_GENCMN" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi if test -z "$SYSTEM_GENCMN"; then - { { $as_echo "$as_me:$LINENO: error: \\"gencmn\\" not found in \$PATH, install the icu development tool \\"gencmn\"\" >&5 -$as_echo "$as_me: error: \\"gencmn\\" not found in \$PATH, install the icu development tool \\"gencmn\"\" >&2;} + { { echo "$as_me:$LINENO: error: \\"gencmn\\" not found in \$PATH, install the icu development tool \\"gencmn\"\" >&5 +echo "$as_me: error: \\"gencmn\\" not found in \$PATH, install the icu development tool \\"gencmn\"\" >&2;} { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:$LINENO: checking ICU version" >&5 -$as_echo_n "checking ICU version... " >&6; } + { echo "$as_me:$LINENO: checking ICU version" >&5 +echo $ECHO_N "checking ICU version... $ECHO_C" >&6; } if test "$cross_compiling" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot run test program while cross compiling +echo "$as_me: error: cannot run test program while cross compiling See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } + { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -19319,35 +18758,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' { (case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: OK" >&5 -$as_echo "OK" >&6; } + { echo "$as_me:$LINENO: result: OK" >&5 +echo "${ECHO_T}OK" >&6; } else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { $as_echo "$as_me:$LINENO: error: not suitable, only >= 4.0 supported currently" >&5 -$as_echo "$as_me: error: not suitable, only >= 4.0 supported currently" >&2;} +{ { echo "$as_me:$LINENO: error: not suitable, only >= 4.0 supported currently" >&5 +echo "$as_me: error: not suitable, only >= 4.0 supported currently" >&2;} { (exit 1); exit 1; }; } fi -rm -rf conftest.dSYM rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi @@ -19359,8 +18795,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu else - { $as_echo "$as_me:$LINENO: result: internal" >&5 -$as_echo "internal" >&6; } + { echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6; } SYSTEM_ICU=NO BUILD_TYPE="$BUILD_TYPE ICU" fi @@ -19372,15 +18808,15 @@ fi if test "$_os" = "Darwin"; then if test "x$with_x" = "xyes"; then - { { $as_echo "$as_me:$LINENO: error: X11 build is no longer supported on MacOSX, please use the native aqua build" >&5 -$as_echo "$as_me: error: X11 build is no longer supported on MacOSX, please use the native aqua build" >&2;} + { { echo "$as_me:$LINENO: error: X11 build is no longer supported on MacOSX, please use the native aqua build" >&5 +echo "$as_me: error: X11 build is no longer supported on MacOSX, please use the native aqua build" >&2;} { (exit 1); exit 1; }; } else - { $as_echo "$as_me:$LINENO: checking for /System/Library/Frameworks/AppKit.framework" >&5 -$as_echo_n "checking for /System/Library/Frameworks/AppKit.framework... " >&6; } + { echo "$as_me:$LINENO: checking for /System/Library/Frameworks/AppKit.framework" >&5 +echo $ECHO_N "checking for /System/Library/Frameworks/AppKit.framework... $ECHO_C" >&6; } if test -d "/System/Library/Frameworks/AppKit.framework/"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } x_includes="no_x_includes" x_libraries="no_x_libraries" enable_gtk=no @@ -19388,8 +18824,8 @@ $as_echo "yes" >&6; } ENABLE_CUPS="" else - { { $as_echo "$as_me:$LINENO: error: No AppKit.framewrok found" >&5 -$as_echo "$as_me: error: No AppKit.framewrok found" >&2;} + { { echo "$as_me:$LINENO: error: No AppKit.framewrok found" >&5 +echo "$as_me: error: No AppKit.framewrok found" >&2;} { (exit 1); exit 1; }; } fi fi @@ -19402,8 +18838,8 @@ elif test "$_os" = "OS2" ; then echo "Do Nothing for _os = OS2. Don't check for X11." : elif test "$_os" != "WINNT" ; then - { $as_echo "$as_me:$LINENO: checking for X" >&5 -$as_echo_n "checking for X... " >&6; } + { echo "$as_me:$LINENO: checking for X" >&5 +echo $ECHO_N "checking for X... $ECHO_C" >&6; } # Check whether --with-x was given. @@ -19417,11 +18853,11 @@ if test "x$with_x" = xno; then have_x=disabled else case $x_includes,$x_libraries in #( - *\'*) { { $as_echo "$as_me:$LINENO: error: cannot use X directory names containing '" >&5 -$as_echo "$as_me: error: cannot use X directory names containing '" >&2;} + *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5 +echo "$as_me: error: Cannot use X directory names containing '" >&2;} { (exit 1); exit 1; }; };; #( *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else # One or both of the vars are not set, and there is no cached value. ac_x_includes=no ac_x_libraries=no @@ -19442,7 +18878,7 @@ _ACEOF eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" done # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. - for ac_extension in a so sl dylib la dll; do + for ac_extension in a so sl; do if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && test -f "$ac_im_libdir/libX11.$ac_extension"; then ac_im_usrlibdir=$ac_im_libdir; break @@ -19456,7 +18892,7 @@ _ACEOF *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; esac case $ac_im_usrlibdir in - /usr/lib | /usr/lib64 | /lib | /lib64) ;; + /usr/lib | /lib) ;; *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; esac fi @@ -19517,14 +18953,13 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err @@ -19532,7 +18967,7 @@ $as_echo "$ac_try_echo") >&5 # We can compile using X headers with no special include directory. ac_x_includes= else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in $ac_x_header_dirs; do @@ -19573,33 +19008,30 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then LIBS=$ac_save_LIBS # We can link X programs with no special library path. ac_x_libraries= else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 LIBS=$ac_save_LIBS -for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` +for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` do # Don't even attempt the hair of trying to link an X program! - for ac_extension in a so sl dylib la dll; do + for ac_extension in a so sl; do if test -r "$ac_dir/libX11.$ac_extension"; then ac_x_libraries=$ac_dir break 2 @@ -19608,7 +19040,6 @@ do done fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi # $ac_x_libraries = no @@ -19631,8 +19062,8 @@ fi fi # $with_x != no if test "$have_x" != yes; then - { $as_echo "$as_me:$LINENO: result: $have_x" >&5 -$as_echo "$have_x" >&6; } + { echo "$as_me:$LINENO: result: $have_x" >&5 +echo "${ECHO_T}$have_x" >&6; } no_x=yes else # If each of the values was on the command line, it overrides each guess. @@ -19642,8 +19073,8 @@ else ac_cv_have_x="have_x=yes\ ac_x_includes='$x_includes'\ ac_x_libraries='$x_libraries'" - { $as_echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 -$as_echo "libraries $x_libraries, headers $x_includes" >&6; } + { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 +echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; } fi if test "$no_x" = yes; then @@ -19664,8 +19095,8 @@ else X_LIBS="$X_LIBS -L$x_libraries" # For Solaris; some versions of Sun CC require a space after -R and # others require no space. Words are not sufficient . . . . - { $as_echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 -$as_echo_n "checking whether -R must be followed by a space... " >&6; } + { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 +echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; } ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" ac_xsave_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes @@ -19690,26 +19121,23 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } X_LIBS="$X_LIBS -R$x_libraries" else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 LIBS="$ac_xsave_LIBS -R $x_libraries" @@ -19734,38 +19162,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } X_LIBS="$X_LIBS -R $x_libraries" else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: neither works" >&5 -$as_echo "neither works" >&6; } + { echo "$as_me:$LINENO: result: neither works" >&5 +echo "${ECHO_T}neither works" >&6; } fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext ac_c_werror_flag=$ac_xsave_c_werror_flag @@ -19811,30 +19234,27 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then : else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 -$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } + { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 +echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; } if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" @@ -19866,45 +19286,41 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dnet_dnet_ntoa=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_dnet_dnet_ntoa=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 -$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } -if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; } +if test $ac_cv_lib_dnet_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then - { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 -$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } + { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 +echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; } if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" @@ -19936,44 +19352,39 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dnet_stub_dnet_ntoa=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_dnet_stub_dnet_ntoa=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 -$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } -if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } +if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" fi fi fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS="$ac_xsave_LIBS" @@ -19986,10 +19397,10 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ # on Irix 5.2, according to T.E. Dickey. # The functions gethostbyname, getservbyname, and inet_addr are # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. - { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5 -$as_echo_n "checking for gethostbyname... " >&6; } + { echo "$as_me:$LINENO: checking for gethostbyname" >&5 +echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; } if test "${ac_cv_func_gethostbyname+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -20042,41 +19453,37 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_gethostbyname=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_func_gethostbyname=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 -$as_echo "$ac_cv_func_gethostbyname" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; } if test $ac_cv_func_gethostbyname = no; then - { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 -$as_echo_n "checking for gethostbyname in -lnsl... " >&6; } + { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 +echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; } if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" @@ -20108,45 +19515,41 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_nsl_gethostbyname=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_nsl_gethostbyname=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 -$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } -if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; } +if test $ac_cv_lib_nsl_gethostbyname = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi if test $ac_cv_lib_nsl_gethostbyname = no; then - { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 -$as_echo_n "checking for gethostbyname in -lbsd... " >&6; } + { echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 +echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; } if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" @@ -20178,37 +19581,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_bsd_gethostbyname=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_bsd_gethostbyname=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 -$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } -if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; } +if test $ac_cv_lib_bsd_gethostbyname = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" fi @@ -20222,10 +19621,10 @@ fi # variants that don't use the name server (or something). -lsocket # must be given before -lnsl if both are needed. We assume that # if connect needs -lnsl, so does gethostbyname. - { $as_echo "$as_me:$LINENO: checking for connect" >&5 -$as_echo_n "checking for connect... " >&6; } + { echo "$as_me:$LINENO: checking for connect" >&5 +echo $ECHO_N "checking for connect... $ECHO_C" >&6; } if test "${ac_cv_func_connect+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -20278,41 +19677,37 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_connect=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_func_connect=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 -$as_echo "$ac_cv_func_connect" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 +echo "${ECHO_T}$ac_cv_func_connect" >&6; } if test $ac_cv_func_connect = no; then - { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 -$as_echo_n "checking for connect in -lsocket... " >&6; } + { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 +echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; } if test "${ac_cv_lib_socket_connect+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" @@ -20344,47 +19739,43 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_socket_connect=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_socket_connect=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 -$as_echo "$ac_cv_lib_socket_connect" >&6; } -if test "x$ac_cv_lib_socket_connect" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 +echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; } +if test $ac_cv_lib_socket_connect = yes; then X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" fi fi # Guillermo Gomez says -lposix is necessary on A/UX. - { $as_echo "$as_me:$LINENO: checking for remove" >&5 -$as_echo_n "checking for remove... " >&6; } + { echo "$as_me:$LINENO: checking for remove" >&5 +echo $ECHO_N "checking for remove... $ECHO_C" >&6; } if test "${ac_cv_func_remove+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -20437,41 +19828,37 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_remove=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_func_remove=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 -$as_echo "$ac_cv_func_remove" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 +echo "${ECHO_T}$ac_cv_func_remove" >&6; } if test $ac_cv_func_remove = no; then - { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5 -$as_echo_n "checking for remove in -lposix... " >&6; } + { echo "$as_me:$LINENO: checking for remove in -lposix" >&5 +echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; } if test "${ac_cv_lib_posix_remove+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" @@ -20503,47 +19890,43 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_posix_remove=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_posix_remove=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 -$as_echo "$ac_cv_lib_posix_remove" >&6; } -if test "x$ac_cv_lib_posix_remove" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 +echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; } +if test $ac_cv_lib_posix_remove = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" fi fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - { $as_echo "$as_me:$LINENO: checking for shmat" >&5 -$as_echo_n "checking for shmat... " >&6; } + { echo "$as_me:$LINENO: checking for shmat" >&5 +echo $ECHO_N "checking for shmat... $ECHO_C" >&6; } if test "${ac_cv_func_shmat+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -20596,41 +19979,37 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_shmat=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_func_shmat=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 -$as_echo "$ac_cv_func_shmat" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 +echo "${ECHO_T}$ac_cv_func_shmat" >&6; } if test $ac_cv_func_shmat = no; then - { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 -$as_echo_n "checking for shmat in -lipc... " >&6; } + { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 +echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; } if test "${ac_cv_lib_ipc_shmat+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" @@ -20662,37 +20041,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_ipc_shmat=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_ipc_shmat=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 -$as_echo "$ac_cv_lib_ipc_shmat" >&6; } -if test "x$ac_cv_lib_ipc_shmat" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 +echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; } +if test $ac_cv_lib_ipc_shmat = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" fi @@ -20708,10 +20083,10 @@ fi # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. # John Interrante, Karl Berry - { $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 -$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } + { echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 +echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; } if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" @@ -20743,37 +20118,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_ICE_IceConnectionNumber=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_ICE_IceConnectionNumber=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 -$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } -if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; } +if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" fi @@ -20790,21 +20161,21 @@ fi x_libraries="default_x_libraries" fi if test -z "$x_libraries"; then - { { $as_echo "$as_me:$LINENO: error: No X libraries found" >&5 -$as_echo "$as_me: error: No X libraries found" >&2;} + { { echo "$as_me:$LINENO: error: No X libraries found" >&5 +echo "$as_me: error: No X libraries found" >&2;} { (exit 1); exit 1; }; } # Exit fi if test -z "$x_includes"; then - { { $as_echo "$as_me:$LINENO: error: No X includes found" >&5 -$as_echo "$as_me: error: No X includes found" >&2;} + { { echo "$as_me:$LINENO: error: No X includes found" >&5 +echo "$as_me: error: No X includes found" >&2;} { (exit 1); exit 1; }; } # Exit fi CFLAGS=$X_CFLAGS LDFLAGS="$X_LDFLAGS $X_LIBS" - { $as_echo "$as_me:$LINENO: checking for XOpenDisplay in -lX11" >&5 -$as_echo_n "checking for XOpenDisplay in -lX11... " >&6; } + { echo "$as_me:$LINENO: checking for XOpenDisplay in -lX11" >&5 +echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6; } if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 $LIBS" @@ -20836,48 +20207,44 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_X11_XOpenDisplay=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_X11_XOpenDisplay=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XOpenDisplay" >&5 -$as_echo "$ac_cv_lib_X11_XOpenDisplay" >&6; } -if test "x$ac_cv_lib_X11_XOpenDisplay" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6; } +if test $ac_cv_lib_X11_XOpenDisplay = yes; then x_libs="-lX11 $X_EXTRA_LIBS" else - { { $as_echo "$as_me:$LINENO: error: X Development libraries not found" >&5 -$as_echo "$as_me: error: X Development libraries not found" >&2;} + { { echo "$as_me:$LINENO: error: X Development libraries not found" >&5 +echo "$as_me: error: X Development libraries not found" >&2;} { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:$LINENO: checking for XauDisposeAuth in -lXau" >&5 -$as_echo_n "checking for XauDisposeAuth in -lXau... " >&6; } + { echo "$as_me:$LINENO: checking for XauDisposeAuth in -lXau" >&5 +echo $ECHO_N "checking for XauDisposeAuth in -lXau... $ECHO_C" >&6; } if test "${ac_cv_lib_Xau_XauDisposeAuth+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lXau $LIBS" @@ -20909,37 +20276,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_Xau_XauDisposeAuth=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_Xau_XauDisposeAuth=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xau_XauDisposeAuth" >&5 -$as_echo "$ac_cv_lib_Xau_XauDisposeAuth" >&6; } -if test "x$ac_cv_lib_Xau_XauDisposeAuth" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xau_XauDisposeAuth" >&5 +echo "${ECHO_T}$ac_cv_lib_Xau_XauDisposeAuth" >&6; } +if test $ac_cv_lib_Xau_XauDisposeAuth = yes; then XAU_LIBS="-lXau" fi @@ -20971,20 +20334,20 @@ fi if test "$_os" != "WINNT" -a "$_os" != "OS2" -a "$_os" != "Darwin"; then - { $as_echo "$as_me:$LINENO: checking whether to use Xaw" >&5 -$as_echo_n "checking whether to use Xaw... " >&6; } + { echo "$as_me:$LINENO: checking whether to use Xaw" >&5 +echo $ECHO_N "checking whether to use Xaw... $ECHO_C" >&6; } if test "$enable_Xaw" = "no"; then DISABLE_XAW=TRUE - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } for ac_header in X11/Composite.h do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -21002,21 +20365,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then eval "$as_ac_Header=yes" else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_Header=no" @@ -21024,46 +20386,42 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF else - { { $as_echo "$as_me:$LINENO: error: Xt include headers not found" >&5 -$as_echo "$as_me: error: Xt include headers not found" >&2;} + { { echo "$as_me:$LINENO: error: Xt include headers not found" >&5 +echo "$as_me: error: Xt include headers not found" >&2;} { (exit 1); exit 1; }; } fi done else - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } for ac_header in X11/Xaw/Label.h do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -21079,33 +20437,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_header_compiler=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -21119,88 +20476,84 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ;; esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF else - { { $as_echo "$as_me:$LINENO: error: Xaw include headers not found" >&5 -$as_echo "$as_me: error: Xaw include headers not found" >&2;} + { { echo "$as_me:$LINENO: error: Xaw include headers not found" >&5 +echo "$as_me: error: Xaw include headers not found" >&2;} { (exit 1); exit 1; }; } fi done -{ $as_echo "$as_me:$LINENO: checking for main in -lXaw" >&5 -$as_echo_n "checking for main in -lXaw... " >&6; } +{ echo "$as_me:$LINENO: checking for main in -lXaw" >&5 +echo $ECHO_N "checking for main in -lXaw... $ECHO_C" >&6; } if test "${ac_cv_lib_Xaw_main+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lXaw $LIBS" @@ -21226,37 +20579,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_Xaw_main=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_Xaw_main=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xaw_main" >&5 -$as_echo "$ac_cv_lib_Xaw_main" >&6; } -if test "x$ac_cv_lib_Xaw_main" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xaw_main" >&5 +echo "${ECHO_T}$ac_cv_lib_Xaw_main" >&6; } +if test $ac_cv_lib_Xaw_main = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBXAW 1 _ACEOF @@ -21264,8 +20613,8 @@ _ACEOF LIBS="-lXaw $LIBS" else - { { $as_echo "$as_me:$LINENO: error: Xaw library not found or functional" >&5 -$as_echo "$as_me: error: Xaw library not found or functional" >&2;} + { { echo "$as_me:$LINENO: error: Xaw library not found or functional" >&5 +echo "$as_me: error: Xaw library not found or functional" >&2;} { (exit 1); exit 1; }; } fi @@ -21277,17 +20626,17 @@ fi if test "$ENABLE_FONTCONFIG" = "TRUE" ; then if test "${ac_cv_header_fontconfig_fontconfig_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for fontconfig/fontconfig.h" >&5 -$as_echo_n "checking for fontconfig/fontconfig.h... " >&6; } + { echo "$as_me:$LINENO: checking for fontconfig/fontconfig.h" >&5 +echo $ECHO_N "checking for fontconfig/fontconfig.h... $ECHO_C" >&6; } if test "${ac_cv_header_fontconfig_fontconfig_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_fontconfig_fontconfig_h" >&5 -$as_echo "$ac_cv_header_fontconfig_fontconfig_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_fontconfig_fontconfig_h" >&5 +echo "${ECHO_T}$ac_cv_header_fontconfig_fontconfig_h" >&6; } else # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking fontconfig/fontconfig.h usability" >&5 -$as_echo_n "checking fontconfig/fontconfig.h usability... " >&6; } +{ echo "$as_me:$LINENO: checking fontconfig/fontconfig.h usability" >&5 +echo $ECHO_N "checking fontconfig/fontconfig.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -21303,33 +20652,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_header_compiler=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ $as_echo "$as_me:$LINENO: checking fontconfig/fontconfig.h presence" >&5 -$as_echo_n "checking fontconfig/fontconfig.h presence... " >&6; } +{ echo "$as_me:$LINENO: checking fontconfig/fontconfig.h presence" >&5 +echo $ECHO_N "checking fontconfig/fontconfig.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -21343,85 +20691,82 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: fontconfig/fontconfig.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: fontconfig/fontconfig.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: fontconfig/fontconfig.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: fontconfig/fontconfig.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: fontconfig/fontconfig.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: fontconfig/fontconfig.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: fontconfig/fontconfig.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: fontconfig/fontconfig.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: fontconfig/fontconfig.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: fontconfig/fontconfig.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: fontconfig/fontconfig.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: fontconfig/fontconfig.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: fontconfig/fontconfig.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: fontconfig/fontconfig.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: fontconfig/fontconfig.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: fontconfig/fontconfig.h: in the future, the compiler will take precedence" >&2;} ;; esac -{ $as_echo "$as_me:$LINENO: checking for fontconfig/fontconfig.h" >&5 -$as_echo_n "checking for fontconfig/fontconfig.h... " >&6; } +{ echo "$as_me:$LINENO: checking for fontconfig/fontconfig.h" >&5 +echo $ECHO_N "checking for fontconfig/fontconfig.h... $ECHO_C" >&6; } if test "${ac_cv_header_fontconfig_fontconfig_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_fontconfig_fontconfig_h=$ac_header_preproc fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_fontconfig_fontconfig_h" >&5 -$as_echo "$ac_cv_header_fontconfig_fontconfig_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_fontconfig_fontconfig_h" >&5 +echo "${ECHO_T}$ac_cv_header_fontconfig_fontconfig_h" >&6; } fi -if test "x$ac_cv_header_fontconfig_fontconfig_h" = x""yes; then +if test $ac_cv_header_fontconfig_fontconfig_h = yes; then : else - { { $as_echo "$as_me:$LINENO: error: fontconfig/fontconfig.h could not be found. libfontconfig1-dev or fontconfig???-devel missing?" >&5 -$as_echo "$as_me: error: fontconfig/fontconfig.h could not be found. libfontconfig1-dev or fontconfig???-devel missing?" >&2;} + { { echo "$as_me:$LINENO: error: fontconfig/fontconfig.h could not be found. libfontconfig1-dev or fontconfig???-devel missing?" >&5 +echo "$as_me: error: fontconfig/fontconfig.h could not be found. libfontconfig1-dev or fontconfig???-devel missing?" >&2;} { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:$LINENO: checking whether fontconfig is >= 2.2.0" >&5 -$as_echo_n "checking whether fontconfig is >= 2.2.0... " >&6; } + { echo "$as_me:$LINENO: checking whether fontconfig is >= 2.2.0" >&5 +echo $ECHO_N "checking whether fontconfig is >= 2.2.0... $ECHO_C" >&6; } if test "$cross_compiling" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot run test program while cross compiling +echo "$as_me: error: cannot run test program while cross compiling See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } + { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -21444,72 +20789,69 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' { (case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { $as_echo "$as_me:$LINENO: error: no, fontconfig >= 2.2.0 needed" >&5 -$as_echo "$as_me: error: no, fontconfig >= 2.2.0 needed" >&2;} +{ { echo "$as_me:$LINENO: error: no, fontconfig >= 2.2.0 needed" >&5 +echo "$as_me: error: no, fontconfig >= 2.2.0 needed" >&2;} { (exit 1); exit 1; }; } fi -rm -rf conftest.dSYM rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -{ $as_echo "$as_me:$LINENO: checking whether to link to Xrender" >&5 -$as_echo_n "checking whether to link to Xrender... " >&6; } +{ echo "$as_me:$LINENO: checking whether to link to Xrender" >&5 +echo $ECHO_N "checking whether to link to Xrender... $ECHO_C" >&6; } if test -n "$enable_xrender_link" -a "$enable_xrender_link" != "no"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } XRENDER_LINK=YES with_system_xrender_headers=yes else - { $as_echo "$as_me:$LINENO: result: no, dynamically open it" >&5 -$as_echo "no, dynamically open it" >&6; } + { echo "$as_me:$LINENO: result: no, dynamically open it" >&5 +echo "${ECHO_T}no, dynamically open it" >&6; } XRENDER_LINK=NO fi -{ $as_echo "$as_me:$LINENO: checking which Xrender headers to use" >&5 -$as_echo_n "checking which Xrender headers to use... " >&6; } +{ echo "$as_me:$LINENO: checking which Xrender headers to use" >&5 +echo $ECHO_N "checking which Xrender headers to use... $ECHO_C" >&6; } if test -n "$with_system_xrender_headers" -o -n "$with_system_headers" && \ test "$with_system_xrender_headers" != "no"; then - { $as_echo "$as_me:$LINENO: result: external" >&5 -$as_echo "external" >&6; } + { echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6; } SYSTEM_XRENDER_HEADERS=YES if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5 -$as_echo_n "checking for X11/extensions/Xrender.h... " >&6; } + { echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5 +echo $ECHO_N "checking for X11/extensions/Xrender.h... $ECHO_C" >&6; } if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5 -$as_echo "$ac_cv_header_X11_extensions_Xrender_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrender_h" >&6; } else # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking X11/extensions/Xrender.h usability" >&5 -$as_echo_n "checking X11/extensions/Xrender.h usability... " >&6; } +{ echo "$as_me:$LINENO: checking X11/extensions/Xrender.h usability" >&5 +echo $ECHO_N "checking X11/extensions/Xrender.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -21525,33 +20867,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_header_compiler=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ $as_echo "$as_me:$LINENO: checking X11/extensions/Xrender.h presence" >&5 -$as_echo_n "checking X11/extensions/Xrender.h presence... " >&6; } +{ echo "$as_me:$LINENO: checking X11/extensions/Xrender.h presence" >&5 +echo $ECHO_N "checking X11/extensions/Xrender.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -21565,87 +20906,86 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: X11/extensions/Xrender.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: X11/extensions/Xrender.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: X11/extensions/Xrender.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: X11/extensions/Xrender.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: X11/extensions/Xrender.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: X11/extensions/Xrender.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: X11/extensions/Xrender.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: X11/extensions/Xrender.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: X11/extensions/Xrender.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: X11/extensions/Xrender.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: X11/extensions/Xrender.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: X11/extensions/Xrender.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: X11/extensions/Xrender.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: X11/extensions/Xrender.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: X11/extensions/Xrender.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: X11/extensions/Xrender.h: in the future, the compiler will take precedence" >&2;} ;; esac -{ $as_echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5 -$as_echo_n "checking for X11/extensions/Xrender.h... " >&6; } +{ echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5 +echo $ECHO_N "checking for X11/extensions/Xrender.h... $ECHO_C" >&6; } if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_X11_extensions_Xrender_h=$ac_header_preproc fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5 -$as_echo "$ac_cv_header_X11_extensions_Xrender_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrender_h" >&6; } fi -if test "x$ac_cv_header_X11_extensions_Xrender_h" = x""yes; then +if test $ac_cv_header_X11_extensions_Xrender_h = yes; then : else - { { $as_echo "$as_me:$LINENO: error: Xrender not found. install X" >&5 -$as_echo "$as_me: error: Xrender not found. install X" >&2;} + { { echo "$as_me:$LINENO: error: Xrender not found. install X" >&5 +echo "$as_me: error: Xrender not found. install X" >&2;} { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:$LINENO: result: internal" >&5 -$as_echo "internal" >&6; } + { echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6; } SYSTEM_XRENDER_HEADERS=NO BUILD_TYPE="$BUILD_TYPE X11_EXTENSIONS" fi if test "$XRENDER_LINK" = "YES"; then -{ $as_echo "$as_me:$LINENO: checking for XRenderQueryVersion in -lXrender" >&5 -$as_echo_n "checking for XRenderQueryVersion in -lXrender... " >&6; } +{ echo "$as_me:$LINENO: checking for XRenderQueryVersion in -lXrender" >&5 +echo $ECHO_N "checking for XRenderQueryVersion in -lXrender... $ECHO_C" >&6; } if test "${ac_cv_lib_Xrender_XRenderQueryVersion+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lXrender $LIBS" @@ -21677,37 +21017,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_Xrender_XRenderQueryVersion=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_Xrender_XRenderQueryVersion=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xrender_XRenderQueryVersion" >&5 -$as_echo "$ac_cv_lib_Xrender_XRenderQueryVersion" >&6; } -if test "x$ac_cv_lib_Xrender_XRenderQueryVersion" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xrender_XRenderQueryVersion" >&5 +echo "${ECHO_T}$ac_cv_lib_Xrender_XRenderQueryVersion" >&6; } +if test $ac_cv_lib_Xrender_XRenderQueryVersion = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBXRENDER 1 _ACEOF @@ -21715,8 +21051,8 @@ _ACEOF LIBS="-lXrender $LIBS" else - { { $as_echo "$as_me:$LINENO: error: libXrender not found or functional" >&5 -$as_echo "$as_me: error: libXrender not found or functional" >&2;} + { { echo "$as_me:$LINENO: error: libXrender not found or functional" >&5 +echo "$as_me: error: libXrender not found or functional" >&2;} { (exit 1); exit 1; }; } fi @@ -21724,13 +21060,13 @@ fi -{ $as_echo "$as_me:$LINENO: checking whether to enable RandR support" >&5 -$as_echo_n "checking whether to enable RandR support... " >&6; } +{ echo "$as_me:$LINENO: checking whether to enable RandR support" >&5 +echo $ECHO_N "checking whether to enable RandR support... $ECHO_C" >&6; } if test "$test_randr" = "yes" -a \( "$enable_randr" = "yes" -o "$enable_randr" = "TRUE" \) ; then if test -z "$enable_randr_link" -o "$enable_randr_link" = "no"; then XRANDR_DLOPEN="TRUE" - { $as_echo "$as_me:$LINENO: result: resorting to dlopen libXrandr at runtime" >&5 -$as_echo "resorting to dlopen libXrandr at runtime" >&6; } + { echo "$as_me:$LINENO: result: resorting to dlopen libXrandr at runtime" >&5 +echo "${ECHO_T}resorting to dlopen libXrandr at runtime" >&6; } else XRANDR_DLOPEN="FALSE" @@ -21739,10 +21075,10 @@ $as_echo "resorting to dlopen libXrandr at runtime" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -21757,7 +21093,7 @@ do 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -21770,11 +21106,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -21788,25 +21124,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:$LINENO: checking for xrandr >= 1.2" >&5 -$as_echo_n "checking for xrandr >= 1.2... " >&6; } + { echo "$as_me:$LINENO: checking for xrandr >= 1.2" >&5 +echo $ECHO_N "checking for xrandr >= 1.2... $ECHO_C" >&6; } if $PKG_CONFIG --exists "xrandr >= 1.2" ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=yes - { $as_echo "$as_me:$LINENO: checking XRANDR_CFLAGS" >&5 -$as_echo_n "checking XRANDR_CFLAGS... " >&6; } + { echo "$as_me:$LINENO: checking XRANDR_CFLAGS" >&5 +echo $ECHO_N "checking XRANDR_CFLAGS... $ECHO_C" >&6; } XRANDR_CFLAGS=`$PKG_CONFIG --cflags "xrandr >= 1.2"` - { $as_echo "$as_me:$LINENO: result: $XRANDR_CFLAGS" >&5 -$as_echo "$XRANDR_CFLAGS" >&6; } + { echo "$as_me:$LINENO: result: $XRANDR_CFLAGS" >&5 +echo "${ECHO_T}$XRANDR_CFLAGS" >&6; } - { $as_echo "$as_me:$LINENO: checking XRANDR_LIBS" >&5 -$as_echo_n "checking XRANDR_LIBS... " >&6; } + { echo "$as_me:$LINENO: checking XRANDR_LIBS" >&5 +echo $ECHO_N "checking XRANDR_LIBS... $ECHO_C" >&6; } XRANDR_LIBS=`$PKG_CONFIG --libs "xrandr >= 1.2"` - { $as_echo "$as_me:$LINENO: result: $XRANDR_LIBS" >&5 -$as_echo "$XRANDR_LIBS" >&6; } + { echo "$as_me:$LINENO: result: $XRANDR_LIBS" >&5 +echo "${ECHO_T}$XRANDR_LIBS" >&6; } else XRANDR_CFLAGS="" XRANDR_LIBS="" @@ -21832,17 +21168,17 @@ $as_echo "$XRANDR_LIBS" >&6; } if test "$ENABLE_RANDR" != "TRUE"; then if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5 -$as_echo_n "checking for X11/extensions/Xrandr.h... " >&6; } + { echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5 +echo $ECHO_N "checking for X11/extensions/Xrandr.h... $ECHO_C" >&6; } if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5 -$as_echo "$ac_cv_header_X11_extensions_Xrandr_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrandr_h" >&6; } else # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking X11/extensions/Xrandr.h usability" >&5 -$as_echo_n "checking X11/extensions/Xrandr.h usability... " >&6; } +{ echo "$as_me:$LINENO: checking X11/extensions/Xrandr.h usability" >&5 +echo $ECHO_N "checking X11/extensions/Xrandr.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -21858,33 +21194,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_header_compiler=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ $as_echo "$as_me:$LINENO: checking X11/extensions/Xrandr.h presence" >&5 -$as_echo_n "checking X11/extensions/Xrandr.h presence... " >&6; } +{ echo "$as_me:$LINENO: checking X11/extensions/Xrandr.h presence" >&5 +echo $ECHO_N "checking X11/extensions/Xrandr.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -21898,81 +21233,80 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: X11/extensions/Xrandr.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: X11/extensions/Xrandr.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: X11/extensions/Xrandr.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: X11/extensions/Xrandr.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: X11/extensions/Xrandr.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: X11/extensions/Xrandr.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: X11/extensions/Xrandr.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: X11/extensions/Xrandr.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: X11/extensions/Xrandr.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: X11/extensions/Xrandr.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: X11/extensions/Xrandr.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: X11/extensions/Xrandr.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: X11/extensions/Xrandr.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: X11/extensions/Xrandr.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: X11/extensions/Xrandr.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: X11/extensions/Xrandr.h: in the future, the compiler will take precedence" >&2;} ;; esac -{ $as_echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5 -$as_echo_n "checking for X11/extensions/Xrandr.h... " >&6; } +{ echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5 +echo $ECHO_N "checking for X11/extensions/Xrandr.h... $ECHO_C" >&6; } if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_X11_extensions_Xrandr_h=$ac_header_preproc fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5 -$as_echo "$ac_cv_header_X11_extensions_Xrandr_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrandr_h" >&6; } fi -if test "x$ac_cv_header_X11_extensions_Xrandr_h" = x""yes; then +if test $ac_cv_header_X11_extensions_Xrandr_h = yes; then : else - { { $as_echo "$as_me:$LINENO: error: X11/extensions/Xrandr.h could not be found. X11 dev missing?" >&5 -$as_echo "$as_me: error: X11/extensions/Xrandr.h could not be found. X11 dev missing?" >&2;} + { { echo "$as_me:$LINENO: error: X11/extensions/Xrandr.h could not be found. X11 dev missing?" >&5 +echo "$as_me: error: X11/extensions/Xrandr.h could not be found. X11 dev missing?" >&2;} { (exit 1); exit 1; }; } fi XRANDR_CFLAGS=" " -{ $as_echo "$as_me:$LINENO: checking for XRRQueryExtension in -lXrandr" >&5 -$as_echo_n "checking for XRRQueryExtension in -lXrandr... " >&6; } +{ echo "$as_me:$LINENO: checking for XRRQueryExtension in -lXrandr" >&5 +echo $ECHO_N "checking for XRRQueryExtension in -lXrandr... $ECHO_C" >&6; } if test "${ac_cv_lib_Xrandr_XRRQueryExtension+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lXrandr $LIBS" @@ -22004,37 +21338,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_Xrandr_XRRQueryExtension=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_Xrandr_XRRQueryExtension=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRQueryExtension" >&5 -$as_echo "$ac_cv_lib_Xrandr_XRRQueryExtension" >&6; } -if test "x$ac_cv_lib_Xrandr_XRRQueryExtension" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRQueryExtension" >&5 +echo "${ECHO_T}$ac_cv_lib_Xrandr_XRRQueryExtension" >&6; } +if test $ac_cv_lib_Xrandr_XRRQueryExtension = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBXRANDR 1 _ACEOF @@ -22042,53 +21372,53 @@ _ACEOF LIBS="-lXrandr $LIBS" else - { { $as_echo "$as_me:$LINENO: error: libXrandr not found or functional" >&5 -$as_echo "$as_me: error: libXrandr not found or functional" >&2;} + { { echo "$as_me:$LINENO: error: libXrandr not found or functional" >&5 +echo "$as_me: error: libXrandr not found or functional" >&2;} { (exit 1); exit 1; }; } fi XRANDR_LIBS="-lXrandr " ENABLE_RANDR="TRUE" - { $as_echo "$as_me:$LINENO: result: enabling RandR support" >&5 -$as_echo "enabling RandR support" >&6; } + { echo "$as_me:$LINENO: result: enabling RandR support" >&5 +echo "${ECHO_T}enabling RandR support" >&6; } fi fi else ENABLE_RANDR="" - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -{ $as_echo "$as_me:$LINENO: checking whether to use neon" >&5 -$as_echo_n "checking whether to use neon... " >&6; } +{ echo "$as_me:$LINENO: checking whether to use neon" >&5 +echo $ECHO_N "checking whether to use neon... $ECHO_C" >&6; } if test "$enable_neon" = "no"; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } DISABLE_NEON=TRUE else - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } -{ $as_echo "$as_me:$LINENO: checking which neon to use" >&5 -$as_echo_n "checking which neon to use... " >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } +{ echo "$as_me:$LINENO: checking which neon to use" >&5 +echo $ECHO_N "checking which neon to use... $ECHO_C" >&6; } if test -n "$with_system_neon" -o -n "$with_system_libs" && \ test "$with_system_neon" != "no"; then - { $as_echo "$as_me:$LINENO: result: external" >&5 -$as_echo "external" >&6; } + { echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6; } succeeded=no if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -22103,7 +21433,7 @@ do 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -22116,11 +21446,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -22134,25 +21464,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:$LINENO: checking for neon >= 0.24.0" >&5 -$as_echo_n "checking for neon >= 0.24.0... " >&6; } + { echo "$as_me:$LINENO: checking for neon >= 0.24.0" >&5 +echo $ECHO_N "checking for neon >= 0.24.0... $ECHO_C" >&6; } if $PKG_CONFIG --exists "neon >= 0.24.0" ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=yes - { $as_echo "$as_me:$LINENO: checking NEON_CFLAGS" >&5 -$as_echo_n "checking NEON_CFLAGS... " >&6; } + { echo "$as_me:$LINENO: checking NEON_CFLAGS" >&5 +echo $ECHO_N "checking NEON_CFLAGS... $ECHO_C" >&6; } NEON_CFLAGS=`$PKG_CONFIG --cflags "neon >= 0.24.0"` - { $as_echo "$as_me:$LINENO: result: $NEON_CFLAGS" >&5 -$as_echo "$NEON_CFLAGS" >&6; } + { echo "$as_me:$LINENO: result: $NEON_CFLAGS" >&5 +echo "${ECHO_T}$NEON_CFLAGS" >&6; } - { $as_echo "$as_me:$LINENO: checking NEON_LIBS" >&5 -$as_echo_n "checking NEON_LIBS... " >&6; } + { echo "$as_me:$LINENO: checking NEON_LIBS" >&5 +echo $ECHO_N "checking NEON_LIBS... $ECHO_C" >&6; } NEON_LIBS=`$PKG_CONFIG --libs "neon >= 0.24.0"` - { $as_echo "$as_me:$LINENO: result: $NEON_LIBS" >&5 -$as_echo "$NEON_LIBS" >&6; } + { echo "$as_me:$LINENO: result: $NEON_LIBS" >&5 +echo "${ECHO_T}$NEON_LIBS" >&6; } else NEON_CFLAGS="" NEON_LIBS="" @@ -22173,8 +21503,8 @@ $as_echo "$NEON_LIBS" >&6; } if test $succeeded = yes; then : else - { { $as_echo "$as_me:$LINENO: error: you need neon >= 0.24.x for system-neon" >&5 -$as_echo "$as_me: error: you need neon >= 0.24.x for system-neon" >&2;} + { { echo "$as_me:$LINENO: error: you need neon >= 0.24.x for system-neon" >&5 +echo "$as_me: error: you need neon >= 0.24.x for system-neon" >&2;} { (exit 1); exit 1; }; } fi @@ -22182,8 +21512,8 @@ $as_echo "$as_me: error: you need neon >= 0.24.x for system-neon" >&2;} NEON_CFLAGS="$NEON_CFLAGS -DSYSTEM_NEON -DUSE_DAV_LOCKS=1" SYSTEM_NEON=YES else - { $as_echo "$as_me:$LINENO: result: internal" >&5 -$as_echo "internal" >&6; } + { echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6; } SYSTEM_NEON=NO NEON_LIBS=-lneon NEON_CFLAGS= @@ -22192,12 +21522,12 @@ fi if test "$_os" = "Darwin" && test "$with_system_openssl" != "no"; then with_system_openssl=yes fi -{ $as_echo "$as_me:$LINENO: checking which libssl to use" >&5 -$as_echo_n "checking which libssl to use... " >&6; } +{ echo "$as_me:$LINENO: checking which libssl to use" >&5 +echo $ECHO_N "checking which libssl to use... $ECHO_C" >&6; } if test -n "$with_system_openssl" -o -n "$with_system_libs" && \ test "$with_system_openssl" != "no"; then - { $as_echo "$as_me:$LINENO: result: external" >&5 -$as_echo "external" >&6; } + { echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6; } # Mac OS builds should get out without extra stuff is the Mac porters' # wish. And pkg-config is although Xcode ships a .pc for openssl if test "$_os" = "Darwin"; then @@ -22210,10 +21540,10 @@ $as_echo "external" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -22228,7 +21558,7 @@ do 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -22241,11 +21571,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -22259,25 +21589,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:$LINENO: checking for openssl " >&5 -$as_echo_n "checking for openssl ... " >&6; } + { echo "$as_me:$LINENO: checking for openssl " >&5 +echo $ECHO_N "checking for openssl ... $ECHO_C" >&6; } if $PKG_CONFIG --exists "openssl " ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=yes - { $as_echo "$as_me:$LINENO: checking OPENSSL_CFLAGS" >&5 -$as_echo_n "checking OPENSSL_CFLAGS... " >&6; } + { echo "$as_me:$LINENO: checking OPENSSL_CFLAGS" >&5 +echo $ECHO_N "checking OPENSSL_CFLAGS... $ECHO_C" >&6; } OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl "` - { $as_echo "$as_me:$LINENO: result: $OPENSSL_CFLAGS" >&5 -$as_echo "$OPENSSL_CFLAGS" >&6; } + { echo "$as_me:$LINENO: result: $OPENSSL_CFLAGS" >&5 +echo "${ECHO_T}$OPENSSL_CFLAGS" >&6; } - { $as_echo "$as_me:$LINENO: checking OPENSSL_LIBS" >&5 -$as_echo_n "checking OPENSSL_LIBS... " >&6; } + { echo "$as_me:$LINENO: checking OPENSSL_LIBS" >&5 +echo $ECHO_N "checking OPENSSL_LIBS... $ECHO_C" >&6; } OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl "` - { $as_echo "$as_me:$LINENO: result: $OPENSSL_LIBS" >&5 -$as_echo "$OPENSSL_LIBS" >&6; } + { echo "$as_me:$LINENO: result: $OPENSSL_LIBS" >&5 +echo "${ECHO_T}$OPENSSL_LIBS" >&6; } else OPENSSL_CFLAGS="" OPENSSL_LIBS="" @@ -22298,16 +21628,16 @@ $as_echo "$OPENSSL_LIBS" >&6; } if test $succeeded = yes; then : else - { { $as_echo "$as_me:$LINENO: error: Library requirements (openssl ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -$as_echo "$as_me: error: Library requirements (openssl ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { { echo "$as_me:$LINENO: error: Library requirements (openssl ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (openssl ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi fi SYSTEM_OPENSSL=YES else - { $as_echo "$as_me:$LINENO: result: internal" >&5 -$as_echo "internal" >&6; } + { echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6; } SYSTEM_OPENSSL=NO BUILD_TYPE="$BUILD_TYPE OPENSSL" fi @@ -22321,33 +21651,33 @@ fi fi -{ $as_echo "$as_me:$LINENO: checking whether to enable agg" >&5 -$as_echo_n "checking whether to enable agg... " >&6; } +{ echo "$as_me:$LINENO: checking whether to enable agg" >&5 +echo $ECHO_N "checking whether to enable agg... $ECHO_C" >&6; } if test "$with_agg" = "no"; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } else - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } ENABLE_AGG=YES - { $as_echo "$as_me:$LINENO: checking which AGG to use" >&5 -$as_echo_n "checking which AGG to use... " >&6; } + { echo "$as_me:$LINENO: checking which AGG to use" >&5 +echo $ECHO_N "checking which AGG to use... $ECHO_C" >&6; } if test -n "$with_system_agg" -o -n "$with_system_libs" && \ test "$with_system_agg" != "no"; then - { $as_echo "$as_me:$LINENO: result: external" >&5 -$as_echo "external" >&6; } + { echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6; } succeeded=no if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -22362,7 +21692,7 @@ do 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -22375,11 +21705,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -22393,25 +21723,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:$LINENO: checking for libagg >= 2.3" >&5 -$as_echo_n "checking for libagg >= 2.3... " >&6; } + { echo "$as_me:$LINENO: checking for libagg >= 2.3" >&5 +echo $ECHO_N "checking for libagg >= 2.3... $ECHO_C" >&6; } if $PKG_CONFIG --exists "libagg >= 2.3" ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=yes - { $as_echo "$as_me:$LINENO: checking AGG_CFLAGS" >&5 -$as_echo_n "checking AGG_CFLAGS... " >&6; } + { echo "$as_me:$LINENO: checking AGG_CFLAGS" >&5 +echo $ECHO_N "checking AGG_CFLAGS... $ECHO_C" >&6; } AGG_CFLAGS=`$PKG_CONFIG --cflags "libagg >= 2.3"` - { $as_echo "$as_me:$LINENO: result: $AGG_CFLAGS" >&5 -$as_echo "$AGG_CFLAGS" >&6; } + { echo "$as_me:$LINENO: result: $AGG_CFLAGS" >&5 +echo "${ECHO_T}$AGG_CFLAGS" >&6; } - { $as_echo "$as_me:$LINENO: checking AGG_LIBS" >&5 -$as_echo_n "checking AGG_LIBS... " >&6; } + { echo "$as_me:$LINENO: checking AGG_LIBS" >&5 +echo $ECHO_N "checking AGG_LIBS... $ECHO_C" >&6; } AGG_LIBS=`$PKG_CONFIG --libs "libagg >= 2.3"` - { $as_echo "$as_me:$LINENO: result: $AGG_LIBS" >&5 -$as_echo "$AGG_LIBS" >&6; } + { echo "$as_me:$LINENO: result: $AGG_LIBS" >&5 +echo "${ECHO_T}$AGG_LIBS" >&6; } else AGG_CFLAGS="" AGG_LIBS="" @@ -22432,13 +21762,13 @@ $as_echo "$AGG_LIBS" >&6; } if test $succeeded = yes; then : else - { { $as_echo "$as_me:$LINENO: error: Library requirements (libagg >= 2.3) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -$as_echo "$as_me: error: Library requirements (libagg >= 2.3) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { { echo "$as_me:$LINENO: error: Library requirements (libagg >= 2.3) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (libagg >= 2.3) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:$LINENO: checking agg version" >&5 -$as_echo_n "checking agg version... " >&6; } + { echo "$as_me:$LINENO: checking agg version" >&5 +echo $ECHO_N "checking agg version... $ECHO_C" >&6; } # workaround; if AGG_CFLAGS is empty (broken libagg.pc in 2.3), add /usr/include/agg2 anyway # (/usr/include gets stripped from pkg-config output) if test -z "$AGG_CFLAGS" || test "$AGG_CFLAGS" = " "; then @@ -22450,23 +21780,23 @@ $as_echo_n "checking agg version... " >&6; } $PKG_CONFIG --modversion libagg | grep -q 2.4; then # 2.4's libagg.pc.in still contains 2.3 :/ if $EGREP -q "Version 2.4" `echo $AGG_INCDIR`/agg_basics.h; then - { $as_echo "$as_me:$LINENO: result: 2.4" >&5 -$as_echo "2.4" >&6; } + { echo "$as_me:$LINENO: result: 2.4" >&5 +echo "${ECHO_T}2.4" >&6; } AGG_VERSION=2400 else - { $as_echo "$as_me:$LINENO: result: 2.3" >&5 -$as_echo "2.3" >&6; } + { echo "$as_me:$LINENO: result: 2.3" >&5 +echo "${ECHO_T}2.3" >&6; } AGG_VERSION=2300 fi SYSTEM_AGG=YES else - { { $as_echo "$as_me:$LINENO: error: only agg 2.3 and 2.4 are supported" >&5 -$as_echo "$as_me: error: only agg 2.3 and 2.4 are supported" >&2;} + { { echo "$as_me:$LINENO: error: only agg 2.3 and 2.4 are supported" >&5 +echo "$as_me: error: only agg 2.3 and 2.4 are supported" >&2;} { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:$LINENO: result: internal" >&5 -$as_echo "internal" >&6; } + { echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6; } SYSTEM_AGG=NO AGG_VERSION=2300 BUILD_TYPE="$BUILD_TYPE AGG" @@ -22475,12 +21805,12 @@ $as_echo "internal" >&6; } fi -{ $as_echo "$as_me:$LINENO: checking which redland library to use" >&5 -$as_echo_n "checking which redland library to use... " >&6; } +{ echo "$as_me:$LINENO: checking which redland library to use" >&5 +echo $ECHO_N "checking which redland library to use... $ECHO_C" >&6; } if test -n "$with_system_redland" && \ test "$with_system_redland" != "no"; then - { $as_echo "$as_me:$LINENO: result: external" >&5 -$as_echo "external" >&6; } + { echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6; } SYSTEM_REDLAND=YES succeeded=no @@ -22488,10 +21818,10 @@ $as_echo "external" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -22506,7 +21836,7 @@ do 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -22519,11 +21849,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -22537,25 +21867,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:$LINENO: checking for redland" >&5 -$as_echo_n "checking for redland... " >&6; } + { echo "$as_me:$LINENO: checking for redland" >&5 +echo $ECHO_N "checking for redland... $ECHO_C" >&6; } if $PKG_CONFIG --exists "redland" ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=yes - { $as_echo "$as_me:$LINENO: checking REDLAND_CFLAGS" >&5 -$as_echo_n "checking REDLAND_CFLAGS... " >&6; } + { echo "$as_me:$LINENO: checking REDLAND_CFLAGS" >&5 +echo $ECHO_N "checking REDLAND_CFLAGS... $ECHO_C" >&6; } REDLAND_CFLAGS=`$PKG_CONFIG --cflags "redland"` - { $as_echo "$as_me:$LINENO: result: $REDLAND_CFLAGS" >&5 -$as_echo "$REDLAND_CFLAGS" >&6; } + { echo "$as_me:$LINENO: result: $REDLAND_CFLAGS" >&5 +echo "${ECHO_T}$REDLAND_CFLAGS" >&6; } - { $as_echo "$as_me:$LINENO: checking REDLAND_LIBS" >&5 -$as_echo_n "checking REDLAND_LIBS... " >&6; } + { echo "$as_me:$LINENO: checking REDLAND_LIBS" >&5 +echo $ECHO_N "checking REDLAND_LIBS... $ECHO_C" >&6; } REDLAND_LIBS=`$PKG_CONFIG --libs "redland"` - { $as_echo "$as_me:$LINENO: result: $REDLAND_LIBS" >&5 -$as_echo "$REDLAND_LIBS" >&6; } + { echo "$as_me:$LINENO: result: $REDLAND_LIBS" >&5 +echo "${ECHO_T}$REDLAND_LIBS" >&6; } else REDLAND_CFLAGS="" REDLAND_LIBS="" @@ -22576,26 +21906,26 @@ $as_echo "$REDLAND_LIBS" >&6; } if test $succeeded = yes; then : else - { { $as_echo "$as_me:$LINENO: error: Library requirements (redland) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -$as_echo "$as_me: error: Library requirements (redland) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { { echo "$as_me:$LINENO: error: Library requirements (redland) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (redland) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:$LINENO: result: internal" >&5 -$as_echo "internal" >&6; } + { echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6; } BUILD_TYPE="$BUILD_TYPE REDLAND" SYSTEM_REDLAND=NO fi -{ $as_echo "$as_me:$LINENO: checking which libhunspell to use" >&5 -$as_echo_n "checking which libhunspell to use... " >&6; } +{ echo "$as_me:$LINENO: checking which libhunspell to use" >&5 +echo $ECHO_N "checking which libhunspell to use... $ECHO_C" >&6; } if test -n "$with_system_hunspell" -o -n "$with_system_libs" && \ test "$with_system_hunspell" != "no"; then - { $as_echo "$as_me:$LINENO: result: external" >&5 -$as_echo "external" >&6; } + { echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6; } SYSTEM_HUNSPELL=YES ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -22609,10 +21939,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -22627,7 +21957,7 @@ do 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -22640,11 +21970,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -22658,25 +21988,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:$LINENO: checking for hunspell" >&5 -$as_echo_n "checking for hunspell... " >&6; } + { echo "$as_me:$LINENO: checking for hunspell" >&5 +echo $ECHO_N "checking for hunspell... $ECHO_C" >&6; } if $PKG_CONFIG --exists "hunspell" ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=yes - { $as_echo "$as_me:$LINENO: checking HUNSPELL_CFLAGS" >&5 -$as_echo_n "checking HUNSPELL_CFLAGS... " >&6; } + { echo "$as_me:$LINENO: checking HUNSPELL_CFLAGS" >&5 +echo $ECHO_N "checking HUNSPELL_CFLAGS... $ECHO_C" >&6; } HUNSPELL_CFLAGS=`$PKG_CONFIG --cflags "hunspell"` - { $as_echo "$as_me:$LINENO: result: $HUNSPELL_CFLAGS" >&5 -$as_echo "$HUNSPELL_CFLAGS" >&6; } + { echo "$as_me:$LINENO: result: $HUNSPELL_CFLAGS" >&5 +echo "${ECHO_T}$HUNSPELL_CFLAGS" >&6; } - { $as_echo "$as_me:$LINENO: checking HUNSPELL_LIBS" >&5 -$as_echo_n "checking HUNSPELL_LIBS... " >&6; } + { echo "$as_me:$LINENO: checking HUNSPELL_LIBS" >&5 +echo $ECHO_N "checking HUNSPELL_LIBS... $ECHO_C" >&6; } HUNSPELL_LIBS=`$PKG_CONFIG --libs "hunspell"` - { $as_echo "$as_me:$LINENO: result: $HUNSPELL_LIBS" >&5 -$as_echo "$HUNSPELL_LIBS" >&6; } + { echo "$as_me:$LINENO: result: $HUNSPELL_LIBS" >&5 +echo "${ECHO_T}$HUNSPELL_LIBS" >&6; } else HUNSPELL_CFLAGS="" HUNSPELL_LIBS="" @@ -22702,17 +22032,17 @@ $as_echo "$HUNSPELL_LIBS" >&6; } if test "$HUNSPELL_PC" != "TRUE"; then if test "${ac_cv_header_hunspell_hxx+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for hunspell.hxx" >&5 -$as_echo_n "checking for hunspell.hxx... " >&6; } + { echo "$as_me:$LINENO: checking for hunspell.hxx" >&5 +echo $ECHO_N "checking for hunspell.hxx... $ECHO_C" >&6; } if test "${ac_cv_header_hunspell_hxx+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hxx" >&5 -$as_echo "$ac_cv_header_hunspell_hxx" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hxx" >&5 +echo "${ECHO_T}$ac_cv_header_hunspell_hxx" >&6; } else # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking hunspell.hxx usability" >&5 -$as_echo_n "checking hunspell.hxx usability... " >&6; } +{ echo "$as_me:$LINENO: checking hunspell.hxx usability" >&5 +echo $ECHO_N "checking hunspell.hxx usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -22728,33 +22058,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ $as_echo "$as_me:$LINENO: checking hunspell.hxx presence" >&5 -$as_echo_n "checking hunspell.hxx presence... " >&6; } +{ echo "$as_me:$LINENO: checking hunspell.hxx presence" >&5 +echo $ECHO_N "checking hunspell.hxx presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -22768,82 +22097,81 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: hunspell.hxx: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: hunspell.hxx: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: hunspell.hxx: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: hunspell.hxx: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: hunspell.hxx: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: hunspell.hxx: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: hunspell.hxx: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: hunspell.hxx: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: hunspell.hxx: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: hunspell.hxx: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: hunspell.hxx: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: hunspell.hxx: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: hunspell.hxx: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: hunspell.hxx: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: hunspell.hxx: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: hunspell.hxx: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: hunspell.hxx: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: hunspell.hxx: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: hunspell.hxx: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: hunspell.hxx: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: hunspell.hxx: present but cannot be compiled" >&5 +echo "$as_me: WARNING: hunspell.hxx: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: hunspell.hxx: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: hunspell.hxx: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: hunspell.hxx: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: hunspell.hxx: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: hunspell.hxx: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: hunspell.hxx: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: hunspell.hxx: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: hunspell.hxx: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: hunspell.hxx: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: hunspell.hxx: in the future, the compiler will take precedence" >&2;} ;; esac -{ $as_echo "$as_me:$LINENO: checking for hunspell.hxx" >&5 -$as_echo_n "checking for hunspell.hxx... " >&6; } +{ echo "$as_me:$LINENO: checking for hunspell.hxx" >&5 +echo $ECHO_N "checking for hunspell.hxx... $ECHO_C" >&6; } if test "${ac_cv_header_hunspell_hxx+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_hunspell_hxx=$ac_header_preproc fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hxx" >&5 -$as_echo "$ac_cv_header_hunspell_hxx" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hxx" >&5 +echo "${ECHO_T}$ac_cv_header_hunspell_hxx" >&6; } fi -if test "x$ac_cv_header_hunspell_hxx" = x""yes; then +if test $ac_cv_header_hunspell_hxx = yes; then : else if test "${ac_cv_header_hunspell_hunspell_hxx+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for hunspell/hunspell.hxx" >&5 -$as_echo_n "checking for hunspell/hunspell.hxx... " >&6; } + { echo "$as_me:$LINENO: checking for hunspell/hunspell.hxx" >&5 +echo $ECHO_N "checking for hunspell/hunspell.hxx... $ECHO_C" >&6; } if test "${ac_cv_header_hunspell_hunspell_hxx+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hunspell_hxx" >&5 -$as_echo "$ac_cv_header_hunspell_hunspell_hxx" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hunspell_hxx" >&5 +echo "${ECHO_T}$ac_cv_header_hunspell_hunspell_hxx" >&6; } else # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking hunspell/hunspell.hxx usability" >&5 -$as_echo_n "checking hunspell/hunspell.hxx usability... " >&6; } +{ echo "$as_me:$LINENO: checking hunspell/hunspell.hxx usability" >&5 +echo $ECHO_N "checking hunspell/hunspell.hxx usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -22859,33 +22187,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ $as_echo "$as_me:$LINENO: checking hunspell/hunspell.hxx presence" >&5 -$as_echo_n "checking hunspell/hunspell.hxx presence... " >&6; } +{ echo "$as_me:$LINENO: checking hunspell/hunspell.hxx presence" >&5 +echo $ECHO_N "checking hunspell/hunspell.hxx presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -22899,71 +22226,70 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: hunspell/hunspell.hxx: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: hunspell/hunspell.hxx: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: hunspell/hunspell.hxx: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: hunspell/hunspell.hxx: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: hunspell/hunspell.hxx: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: hunspell/hunspell.hxx: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: hunspell/hunspell.hxx: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: hunspell/hunspell.hxx: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: hunspell/hunspell.hxx: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: hunspell/hunspell.hxx: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: present but cannot be compiled" >&5 +echo "$as_me: WARNING: hunspell/hunspell.hxx: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: hunspell/hunspell.hxx: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: hunspell/hunspell.hxx: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: hunspell/hunspell.hxx: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: hunspell/hunspell.hxx: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: hunspell/hunspell.hxx: in the future, the compiler will take precedence" >&2;} ;; esac -{ $as_echo "$as_me:$LINENO: checking for hunspell/hunspell.hxx" >&5 -$as_echo_n "checking for hunspell/hunspell.hxx... " >&6; } +{ echo "$as_me:$LINENO: checking for hunspell/hunspell.hxx" >&5 +echo $ECHO_N "checking for hunspell/hunspell.hxx... $ECHO_C" >&6; } if test "${ac_cv_header_hunspell_hunspell_hxx+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_hunspell_hunspell_hxx=$ac_header_preproc fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hunspell_hxx" >&5 -$as_echo "$ac_cv_header_hunspell_hunspell_hxx" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hunspell_hxx" >&5 +echo "${ECHO_T}$ac_cv_header_hunspell_hunspell_hxx" >&6; } fi -if test "x$ac_cv_header_hunspell_hunspell_hxx" = x""yes; then +if test $ac_cv_header_hunspell_hunspell_hxx = yes; then HUNSPELL_CFLAGS=-I/usr/include/hunspell else - { { $as_echo "$as_me:$LINENO: error: hunspell headers not found." >&5 -$as_echo "$as_me: error: hunspell headers not found." >&2;} + { { echo "$as_me:$LINENO: error: hunspell headers not found." >&5 +echo "$as_me: error: hunspell headers not found." >&2;} { (exit 1); exit 1; }; } fi @@ -22973,10 +22299,10 @@ fi -{ $as_echo "$as_me:$LINENO: checking for main in -lhunspell" >&5 -$as_echo_n "checking for main in -lhunspell... " >&6; } +{ echo "$as_me:$LINENO: checking for main in -lhunspell" >&5 +echo $ECHO_N "checking for main in -lhunspell... $ECHO_C" >&6; } if test "${ac_cv_lib_hunspell_main+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lhunspell $LIBS" @@ -23002,37 +22328,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_hunspell_main=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_hunspell_main=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_hunspell_main" >&5 -$as_echo "$ac_cv_lib_hunspell_main" >&6; } -if test "x$ac_cv_lib_hunspell_main" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_hunspell_main" >&5 +echo "${ECHO_T}$ac_cv_lib_hunspell_main" >&6; } +if test $ac_cv_lib_hunspell_main = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBHUNSPELL 1 _ACEOF @@ -23040,8 +22362,8 @@ _ACEOF LIBS="-lhunspell $LIBS" else - { { $as_echo "$as_me:$LINENO: error: hunspell library not found." >&5 -$as_echo "$as_me: error: hunspell library not found." >&2;} + { { echo "$as_me:$LINENO: error: hunspell library not found." >&5 +echo "$as_me: error: hunspell library not found." >&2;} { (exit 1); exit 1; }; } fi @@ -23054,8 +22376,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu else - { $as_echo "$as_me:$LINENO: result: internal" >&5 -$as_echo "internal" >&6; } + { echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6; } SYSTEM_HUNSPELL=NO BUILD_TYPE="$BUILD_TYPE HUNSPELL" fi @@ -23063,25 +22385,25 @@ fi -{ $as_echo "$as_me:$LINENO: checking which altlinuxhyph to use" >&5 -$as_echo_n "checking which altlinuxhyph to use... " >&6; } +{ echo "$as_me:$LINENO: checking which altlinuxhyph to use" >&5 +echo $ECHO_N "checking which altlinuxhyph to use... $ECHO_C" >&6; } if test -n "$with_system_altlinuxhyph" -o -n "$with_system_libs" && \ test "$with_system_altlinuxhyph" != "no"; then - { $as_echo "$as_me:$LINENO: result: external" >&5 -$as_echo "external" >&6; } + { echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6; } SYSTEM_HYPH=YES if test "${ac_cv_header_hyphen_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for hyphen.h" >&5 -$as_echo_n "checking for hyphen.h... " >&6; } + { echo "$as_me:$LINENO: checking for hyphen.h" >&5 +echo $ECHO_N "checking for hyphen.h... $ECHO_C" >&6; } if test "${ac_cv_header_hyphen_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_hyphen_h" >&5 -$as_echo "$ac_cv_header_hyphen_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_hyphen_h" >&5 +echo "${ECHO_T}$ac_cv_header_hyphen_h" >&6; } else # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking hyphen.h usability" >&5 -$as_echo_n "checking hyphen.h usability... " >&6; } +{ echo "$as_me:$LINENO: checking hyphen.h usability" >&5 +echo $ECHO_N "checking hyphen.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -23097,33 +22419,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_header_compiler=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ $as_echo "$as_me:$LINENO: checking hyphen.h presence" >&5 -$as_echo_n "checking hyphen.h presence... " >&6; } +{ echo "$as_me:$LINENO: checking hyphen.h presence" >&5 +echo $ECHO_N "checking hyphen.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -23137,79 +22458,78 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: hyphen.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: hyphen.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: hyphen.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: hyphen.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: hyphen.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: hyphen.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: hyphen.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: hyphen.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: hyphen.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: hyphen.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: hyphen.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: hyphen.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: hyphen.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: hyphen.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: hyphen.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: hyphen.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: hyphen.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: hyphen.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: hyphen.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: hyphen.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: hyphen.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: hyphen.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: hyphen.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: hyphen.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: hyphen.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: hyphen.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: hyphen.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: hyphen.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: hyphen.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: hyphen.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: hyphen.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: hyphen.h: in the future, the compiler will take precedence" >&2;} ;; esac -{ $as_echo "$as_me:$LINENO: checking for hyphen.h" >&5 -$as_echo_n "checking for hyphen.h... " >&6; } +{ echo "$as_me:$LINENO: checking for hyphen.h" >&5 +echo $ECHO_N "checking for hyphen.h... $ECHO_C" >&6; } if test "${ac_cv_header_hyphen_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_hyphen_h=$ac_header_preproc fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_hyphen_h" >&5 -$as_echo "$ac_cv_header_hyphen_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_hyphen_h" >&5 +echo "${ECHO_T}$ac_cv_header_hyphen_h" >&6; } fi -if test "x$ac_cv_header_hyphen_h" = x""yes; then +if test $ac_cv_header_hyphen_h = yes; then : else - { { $as_echo "$as_me:$LINENO: error: altlinuxhyph headers not found." >&5 -$as_echo "$as_me: error: altlinuxhyph headers not found." >&2;} + { { echo "$as_me:$LINENO: error: altlinuxhyph headers not found." >&5 +echo "$as_me: error: altlinuxhyph headers not found." >&2;} { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:$LINENO: checking for struct _HyphenDict.cset" >&5 -$as_echo_n "checking for struct _HyphenDict.cset... " >&6; } + { echo "$as_me:$LINENO: checking for struct _HyphenDict.cset" >&5 +echo $ECHO_N "checking for struct _HyphenDict.cset... $ECHO_C" >&6; } if test "${ac_cv_member_struct__HyphenDict_cset+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -23235,21 +22555,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_cv_member_struct__HyphenDict_cset=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF @@ -23276,21 +22595,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_cv_member_struct__HyphenDict_cset=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_member_struct__HyphenDict_cset=no @@ -23301,20 +22619,20 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct__HyphenDict_cset" >&5 -$as_echo "$ac_cv_member_struct__HyphenDict_cset" >&6; } -if test "x$ac_cv_member_struct__HyphenDict_cset" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct__HyphenDict_cset" >&5 +echo "${ECHO_T}$ac_cv_member_struct__HyphenDict_cset" >&6; } +if test $ac_cv_member_struct__HyphenDict_cset = yes; then : else - { { $as_echo "$as_me:$LINENO: error: no. You are sure you have altlinuyhyph headers?" >&5 -$as_echo "$as_me: error: no. You are sure you have altlinuyhyph headers?" >&2;} + { { echo "$as_me:$LINENO: error: no. You are sure you have altlinuyhyph headers?" >&5 +echo "$as_me: error: no. You are sure you have altlinuyhyph headers?" >&2;} { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:$LINENO: checking for hnj_hyphen_hyphenate2 in -lhyphen" >&5 -$as_echo_n "checking for hnj_hyphen_hyphenate2 in -lhyphen... " >&6; } + { echo "$as_me:$LINENO: checking for hnj_hyphen_hyphenate2 in -lhyphen" >&5 +echo $ECHO_N "checking for hnj_hyphen_hyphenate2 in -lhyphen... $ECHO_C" >&6; } if test "${ac_cv_lib_hyphen_hnj_hyphen_hyphenate2+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lhyphen $LIBS" @@ -23346,49 +22664,45 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_hyphen_hnj_hyphen_hyphenate2=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_hyphen_hnj_hyphen_hyphenate2=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" >&5 -$as_echo "$ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" >&6; } -if test "x$ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" >&5 +echo "${ECHO_T}$ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" >&6; } +if test $ac_cv_lib_hyphen_hnj_hyphen_hyphenate2 = yes; then HYPHEN_LIB=-lhyphen else - { { $as_echo "$as_me:$LINENO: error: altlinuxhyph library not found or too old." >&5 -$as_echo "$as_me: error: altlinuxhyph library not found or too old." >&2;} + { { echo "$as_me:$LINENO: error: altlinuxhyph library not found or too old." >&5 +echo "$as_me: error: altlinuxhyph library not found or too old." >&2;} { (exit 1); exit 1; }; } fi if test -z "$HYPHEN_LIB"; then - { $as_echo "$as_me:$LINENO: checking for hnj_hyphen_hyphenate2 in -lhyph" >&5 -$as_echo_n "checking for hnj_hyphen_hyphenate2 in -lhyph... " >&6; } + { echo "$as_me:$LINENO: checking for hnj_hyphen_hyphenate2 in -lhyph" >&5 +echo $ECHO_N "checking for hnj_hyphen_hyphenate2 in -lhyph... $ECHO_C" >&6; } if test "${ac_cv_lib_hyph_hnj_hyphen_hyphenate2+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lhyph $LIBS" @@ -23420,50 +22734,46 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_hyph_hnj_hyphen_hyphenate2=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_hyph_hnj_hyphen_hyphenate2=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_hyph_hnj_hyphen_hyphenate2" >&5 -$as_echo "$ac_cv_lib_hyph_hnj_hyphen_hyphenate2" >&6; } -if test "x$ac_cv_lib_hyph_hnj_hyphen_hyphenate2" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_hyph_hnj_hyphen_hyphenate2" >&5 +echo "${ECHO_T}$ac_cv_lib_hyph_hnj_hyphen_hyphenate2" >&6; } +if test $ac_cv_lib_hyph_hnj_hyphen_hyphenate2 = yes; then HYPHEN_LIB=-lhyph else - { { $as_echo "$as_me:$LINENO: error: altlinuxhyph library not found or too old." >&5 -$as_echo "$as_me: error: altlinuxhyph library not found or too old." >&2;} + { { echo "$as_me:$LINENO: error: altlinuxhyph library not found or too old." >&5 +echo "$as_me: error: altlinuxhyph library not found or too old." >&2;} { (exit 1); exit 1; }; } fi fi if test -z "$HYPHEN_LIB"; then - { $as_echo "$as_me:$LINENO: checking for hnj_hyphen_hyphenate2 in -lhnj" >&5 -$as_echo_n "checking for hnj_hyphen_hyphenate2 in -lhnj... " >&6; } + { echo "$as_me:$LINENO: checking for hnj_hyphen_hyphenate2 in -lhnj" >&5 +echo $ECHO_N "checking for hnj_hyphen_hyphenate2 in -lhnj... $ECHO_C" >&6; } if test "${ac_cv_lib_hnj_hnj_hyphen_hyphenate2+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lhnj $LIBS" @@ -23495,71 +22805,67 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_hnj_hnj_hyphen_hyphenate2=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_hnj_hnj_hyphen_hyphenate2=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_hnj_hnj_hyphen_hyphenate2" >&5 -$as_echo "$ac_cv_lib_hnj_hnj_hyphen_hyphenate2" >&6; } -if test "x$ac_cv_lib_hnj_hnj_hyphen_hyphenate2" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_hnj_hnj_hyphen_hyphenate2" >&5 +echo "${ECHO_T}$ac_cv_lib_hnj_hnj_hyphen_hyphenate2" >&6; } +if test $ac_cv_lib_hnj_hnj_hyphen_hyphenate2 = yes; then HYPHEN_LIB=-lhnj else - { { $as_echo "$as_me:$LINENO: error: altlinuxhyph library not found or too old." >&5 -$as_echo "$as_me: error: altlinuxhyph library not found or too old." >&2;} + { { echo "$as_me:$LINENO: error: altlinuxhyph library not found or too old." >&5 +echo "$as_me: error: altlinuxhyph library not found or too old." >&2;} { (exit 1); exit 1; }; } fi fi else - { $as_echo "$as_me:$LINENO: result: internal" >&5 -$as_echo "internal" >&6; } + { echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6; } SYSTEM_HYPH=NO fi -{ $as_echo "$as_me:$LINENO: checking which mythes to use" >&5 -$as_echo_n "checking which mythes to use... " >&6; } +{ echo "$as_me:$LINENO: checking which mythes to use" >&5 +echo $ECHO_N "checking which mythes to use... $ECHO_C" >&6; } if test -n "$with_system_mythes" && test "$with_system_mythes" != "no"; then - { $as_echo "$as_me:$LINENO: result: external" >&5 -$as_echo "external" >&6; } + { echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6; } SYSTEM_MYTHES=YES if test "${ac_cv_header_mythes_hxx+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for mythes.hxx" >&5 -$as_echo_n "checking for mythes.hxx... " >&6; } + { echo "$as_me:$LINENO: checking for mythes.hxx" >&5 +echo $ECHO_N "checking for mythes.hxx... $ECHO_C" >&6; } if test "${ac_cv_header_mythes_hxx+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_mythes_hxx" >&5 -$as_echo "$ac_cv_header_mythes_hxx" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_mythes_hxx" >&5 +echo "${ECHO_T}$ac_cv_header_mythes_hxx" >&6; } else # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking mythes.hxx usability" >&5 -$as_echo_n "checking mythes.hxx usability... " >&6; } +{ echo "$as_me:$LINENO: checking mythes.hxx usability" >&5 +echo $ECHO_N "checking mythes.hxx usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -23575,33 +22881,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_header_compiler=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ $as_echo "$as_me:$LINENO: checking mythes.hxx presence" >&5 -$as_echo_n "checking mythes.hxx presence... " >&6; } +{ echo "$as_me:$LINENO: checking mythes.hxx presence" >&5 +echo $ECHO_N "checking mythes.hxx presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -23615,80 +22920,79 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: mythes.hxx: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: mythes.hxx: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: mythes.hxx: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: mythes.hxx: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: mythes.hxx: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: mythes.hxx: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: mythes.hxx: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: mythes.hxx: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: mythes.hxx: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: mythes.hxx: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: mythes.hxx: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: mythes.hxx: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: mythes.hxx: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: mythes.hxx: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: mythes.hxx: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: mythes.hxx: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: mythes.hxx: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: mythes.hxx: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: mythes.hxx: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: mythes.hxx: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: mythes.hxx: present but cannot be compiled" >&5 +echo "$as_me: WARNING: mythes.hxx: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: mythes.hxx: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: mythes.hxx: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: mythes.hxx: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: mythes.hxx: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: mythes.hxx: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: mythes.hxx: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: mythes.hxx: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: mythes.hxx: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: mythes.hxx: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: mythes.hxx: in the future, the compiler will take precedence" >&2;} ;; esac -{ $as_echo "$as_me:$LINENO: checking for mythes.hxx" >&5 -$as_echo_n "checking for mythes.hxx... " >&6; } +{ echo "$as_me:$LINENO: checking for mythes.hxx" >&5 +echo $ECHO_N "checking for mythes.hxx... $ECHO_C" >&6; } if test "${ac_cv_header_mythes_hxx+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_mythes_hxx=$ac_header_preproc fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_mythes_hxx" >&5 -$as_echo "$ac_cv_header_mythes_hxx" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_mythes_hxx" >&5 +echo "${ECHO_T}$ac_cv_header_mythes_hxx" >&6; } fi -if test "x$ac_cv_header_mythes_hxx" = x""yes; then +if test $ac_cv_header_mythes_hxx = yes; then : else - { { $as_echo "$as_me:$LINENO: error: mythes.hxx headers not found." >&5 -$as_echo "$as_me: error: mythes.hxx headers not found." >&2;} + { { echo "$as_me:$LINENO: error: mythes.hxx headers not found." >&5 +echo "$as_me: error: mythes.hxx headers not found." >&2;} { (exit 1); exit 1; }; } fi -{ $as_echo "$as_me:$LINENO: checking for main in -lmythes" >&5 -$as_echo_n "checking for main in -lmythes... " >&6; } +{ echo "$as_me:$LINENO: checking for main in -lmythes" >&5 +echo $ECHO_N "checking for main in -lmythes... $ECHO_C" >&6; } if test "${ac_cv_lib_mythes_main+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lmythes $LIBS" @@ -23714,37 +23018,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_mythes_main=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_mythes_main=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mythes_main" >&5 -$as_echo "$ac_cv_lib_mythes_main" >&6; } -if test "x$ac_cv_lib_mythes_main" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_mythes_main" >&5 +echo "${ECHO_T}$ac_cv_lib_mythes_main" >&6; } +if test $ac_cv_lib_mythes_main = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBMYTHES 1 _ACEOF @@ -23752,37 +23052,37 @@ _ACEOF LIBS="-lmythes $LIBS" else - { { $as_echo "$as_me:$LINENO: error: mythes library not found." >&5 -$as_echo "$as_me: error: mythes library not found." >&2;} + { { echo "$as_me:$LINENO: error: mythes library not found." >&5 +echo "$as_me: error: mythes library not found." >&2;} { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:$LINENO: result: internal" >&5 -$as_echo "internal" >&6; } + { echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6; } SYSTEM_MYTHES=NO fi -{ $as_echo "$as_me:$LINENO: checking which lpsolve to use" >&5 -$as_echo_n "checking which lpsolve to use... " >&6; } +{ echo "$as_me:$LINENO: checking which lpsolve to use" >&5 +echo $ECHO_N "checking which lpsolve to use... $ECHO_C" >&6; } if test -n "$with_system_lpsolve" -o -n "$with_system_libs" && \ test "$with_system_lpsolve" != "no"; then - { $as_echo "$as_me:$LINENO: result: external" >&5 -$as_echo "external" >&6; } + { echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6; } SYSTEM_LPSOLVE=YES if test "${ac_cv_header_lpsolve_lp_lib_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for lpsolve/lp_lib.h" >&5 -$as_echo_n "checking for lpsolve/lp_lib.h... " >&6; } + { echo "$as_me:$LINENO: checking for lpsolve/lp_lib.h" >&5 +echo $ECHO_N "checking for lpsolve/lp_lib.h... $ECHO_C" >&6; } if test "${ac_cv_header_lpsolve_lp_lib_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_lpsolve_lp_lib_h" >&5 -$as_echo "$ac_cv_header_lpsolve_lp_lib_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_lpsolve_lp_lib_h" >&5 +echo "${ECHO_T}$ac_cv_header_lpsolve_lp_lib_h" >&6; } else # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking lpsolve/lp_lib.h usability" >&5 -$as_echo_n "checking lpsolve/lp_lib.h usability... " >&6; } +{ echo "$as_me:$LINENO: checking lpsolve/lp_lib.h usability" >&5 +echo $ECHO_N "checking lpsolve/lp_lib.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -23798,33 +23098,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_header_compiler=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ $as_echo "$as_me:$LINENO: checking lpsolve/lp_lib.h presence" >&5 -$as_echo_n "checking lpsolve/lp_lib.h presence... " >&6; } +{ echo "$as_me:$LINENO: checking lpsolve/lp_lib.h presence" >&5 +echo $ECHO_N "checking lpsolve/lp_lib.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -23838,80 +23137,79 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: lpsolve/lp_lib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: lpsolve/lp_lib.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: lpsolve/lp_lib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: lpsolve/lp_lib.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: lpsolve/lp_lib.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: lpsolve/lp_lib.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: lpsolve/lp_lib.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: lpsolve/lp_lib.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: lpsolve/lp_lib.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: lpsolve/lp_lib.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: lpsolve/lp_lib.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: lpsolve/lp_lib.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: lpsolve/lp_lib.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: lpsolve/lp_lib.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: lpsolve/lp_lib.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: lpsolve/lp_lib.h: in the future, the compiler will take precedence" >&2;} ;; esac -{ $as_echo "$as_me:$LINENO: checking for lpsolve/lp_lib.h" >&5 -$as_echo_n "checking for lpsolve/lp_lib.h... " >&6; } +{ echo "$as_me:$LINENO: checking for lpsolve/lp_lib.h" >&5 +echo $ECHO_N "checking for lpsolve/lp_lib.h... $ECHO_C" >&6; } if test "${ac_cv_header_lpsolve_lp_lib_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_lpsolve_lp_lib_h=$ac_header_preproc fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_lpsolve_lp_lib_h" >&5 -$as_echo "$ac_cv_header_lpsolve_lp_lib_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_lpsolve_lp_lib_h" >&5 +echo "${ECHO_T}$ac_cv_header_lpsolve_lp_lib_h" >&6; } fi -if test "x$ac_cv_header_lpsolve_lp_lib_h" = x""yes; then +if test $ac_cv_header_lpsolve_lp_lib_h = yes; then : else - { { $as_echo "$as_me:$LINENO: error: lpsolve headers not found." >&5 -$as_echo "$as_me: error: lpsolve headers not found." >&2;} + { { echo "$as_me:$LINENO: error: lpsolve headers not found." >&5 +echo "$as_me: error: lpsolve headers not found." >&2;} { (exit 1); exit 1; }; } fi -{ $as_echo "$as_me:$LINENO: checking for make_lp in -llpsolve55" >&5 -$as_echo_n "checking for make_lp in -llpsolve55... " >&6; } +{ echo "$as_me:$LINENO: checking for make_lp in -llpsolve55" >&5 +echo $ECHO_N "checking for make_lp in -llpsolve55... $ECHO_C" >&6; } if test "${ac_cv_lib_lpsolve55_make_lp+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-llpsolve55 $LIBS" @@ -23943,37 +23241,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_lpsolve55_make_lp=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_lpsolve55_make_lp=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lpsolve55_make_lp" >&5 -$as_echo "$ac_cv_lib_lpsolve55_make_lp" >&6; } -if test "x$ac_cv_lib_lpsolve55_make_lp" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_lpsolve55_make_lp" >&5 +echo "${ECHO_T}$ac_cv_lib_lpsolve55_make_lp" >&6; } +if test $ac_cv_lib_lpsolve55_make_lp = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBLPSOLVE55 1 _ACEOF @@ -23981,27 +23275,27 @@ _ACEOF LIBS="-llpsolve55 $LIBS" else - { { $as_echo "$as_me:$LINENO: error: lpsolve library not found or too old." >&5 -$as_echo "$as_me: error: lpsolve library not found or too old." >&2;} + { { echo "$as_me:$LINENO: error: lpsolve library not found or too old." >&5 +echo "$as_me: error: lpsolve library not found or too old." >&2;} { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:$LINENO: result: internal" >&5 -$as_echo "internal" >&6; } + { echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6; } SYSTEM_LPSOLVE=NO BUILD_TYPE="$BUILD_TYPE LPSOLVE" fi if test "$_os" = "Linux"; then - { $as_echo "$as_me:$LINENO: checking whether libc is >= 2.1.1" >&5 -$as_echo_n "checking whether libc is >= 2.1.1... " >&6; } + { echo "$as_me:$LINENO: checking whether libc is >= 2.1.1" >&5 +echo $ECHO_N "checking whether libc is >= 2.1.1... $ECHO_C" >&6; } exec 6>/dev/null # no output - { $as_echo "$as_me:$LINENO: checking for gnu_get_libc_version in -lc" >&5 -$as_echo_n "checking for gnu_get_libc_version in -lc... " >&6; } + { echo "$as_me:$LINENO: checking for gnu_get_libc_version in -lc" >&5 +echo $ECHO_N "checking for gnu_get_libc_version in -lc... $ECHO_C" >&6; } if test "${ac_cv_lib_c_gnu_get_libc_version+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lc $LIBS" @@ -24033,54 +23327,50 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_c_gnu_get_libc_version=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_c_gnu_get_libc_version=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_c_gnu_get_libc_version" >&5 -$as_echo "$ac_cv_lib_c_gnu_get_libc_version" >&6; } -if test "x$ac_cv_lib_c_gnu_get_libc_version" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_gnu_get_libc_version" >&5 +echo "${ECHO_T}$ac_cv_lib_c_gnu_get_libc_version" >&6; } +if test $ac_cv_lib_c_gnu_get_libc_version = yes; then HAVE_LIBC=yes; export HAVE_LIBC fi exec 6>&1 # output on again if test "$HAVE_LIBC"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - { { $as_echo "$as_me:$LINENO: error: no, upgrade libc" >&5 -$as_echo "$as_me: error: no, upgrade libc" >&2;} + { { echo "$as_me:$LINENO: error: no, upgrade libc" >&5 +echo "$as_me: error: no, upgrade libc" >&2;} { (exit 1); exit 1; }; } fi fi if test \( "$_os" = "WINNT" \) ; then - { $as_echo "$as_me:$LINENO: checking for PSDK files" >&5 -$as_echo_n "checking for PSDK files... " >&6; } + { echo "$as_me:$LINENO: checking for PSDK files" >&5 +echo $ECHO_N "checking for PSDK files... $ECHO_C" >&6; } if test -z "$with_psdk_home"; then # This first line will detect a February 2003 Microsoft Platform SDK PSDK_HOME=`./oowintool --psdk-home` @@ -24101,13 +23391,13 @@ $as_echo_n "checking for PSDK files... " >&6; } PSDK_HOME=`echo $PSDK_HOME | $SED 's/\/$//'` # Problem with current PSDK (iz 49865) if test -f "$PSDK_HOME/Lib/libcp.lib"; then - { { $as_echo "$as_me:$LINENO: error: + { { echo "$as_me:$LINENO: error: Some modules do not build correctly with MS Platform SDK - April 2005 Edition if the library ($PSDK_HOME/Lib/libcp.lib) is found. Remove/rename/backup that file and restart configure. Details about this problem can be found in issue 49856." >&5 -$as_echo "$as_me: error: +echo "$as_me: error: Some modules do not build correctly with MS Platform SDK - April 2005 Edition if the library ($PSDK_HOME/Lib/libcp.lib) is found. @@ -24129,9 +23419,9 @@ problem can be found in issue 49856." >&2;} HAVE_PSDK_LIB="no" fi if test "$HAVE_PSDK_H" = "no" -o "$HAVE_PSDK_LIB" = "no"; then - { { $as_echo "$as_me:$LINENO: error: Some (all?) PSDK files not found, please check if all needed Platform SDKs + { { echo "$as_me:$LINENO: error: Some (all?) PSDK files not found, please check if all needed Platform SDKs are installed or use --with-psdk-home ." >&5 -$as_echo "$as_me: error: Some (all?) PSDK files not found, please check if all needed Platform SDKs +echo "$as_me: error: Some (all?) PSDK files not found, please check if all needed Platform SDKs are installed or use --with-psdk-home ." >&2;} { (exit 1); exit 1; }; } fi @@ -24139,31 +23429,31 @@ are installed or use --with-psdk-home ." >&2;} -o ! -x "$PSDK_HOME/bin/msidb.exe" \ -o ! -x "$PSDK_HOME/bin/uuidgen.exe" \ -o ! -x "$PSDK_HOME/bin/msitran.exe" ; then - { { $as_echo "$as_me:$LINENO: error: Some (all) files of the Windows Installer SDK are missing, please install." >&5 -$as_echo "$as_me: error: Some (all) files of the Windows Installer SDK are missing, please install." >&2;} + { { echo "$as_me:$LINENO: error: Some (all) files of the Windows Installer SDK are missing, please install." >&5 +echo "$as_me: error: Some (all) files of the Windows Installer SDK are missing, please install." >&2;} { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:$LINENO: result: SDK files found ...)" >&5 -$as_echo "SDK files found ...)" >&6; } + { echo "$as_me:$LINENO: result: SDK files found ...)" >&5 +echo "${ECHO_T}SDK files found ...)" >&6; } if echo $PSDK_HOME | grep "v6.1" >/dev/null 2>/dev/null; then - { $as_echo "$as_me:$LINENO: result: Found Windows SDK 6.1 ($PSDK_HOME)" >&5 -$as_echo "Found Windows SDK 6.1 ($PSDK_HOME)" >&6; } + { echo "$as_me:$LINENO: result: Found Windows SDK 6.1 ($PSDK_HOME)" >&5 +echo "${ECHO_T}Found Windows SDK 6.1 ($PSDK_HOME)" >&6; } WINDOWS_VISTA_PSDK=TRUE elif echo $PSDK_HOME | grep "v6.0" >/dev/null 2>/dev/null; then - { $as_echo "$as_me:$LINENO: result: Found Windows SDK 6.0 ($PSDK_HOME)" >&5 -$as_echo "Found Windows SDK 6.0 ($PSDK_HOME)" >&6; } + { echo "$as_me:$LINENO: result: Found Windows SDK 6.0 ($PSDK_HOME)" >&5 +echo "${ECHO_T}Found Windows SDK 6.0 ($PSDK_HOME)" >&6; } WINDOWS_VISTA_PSDK=TRUE else - { $as_echo "$as_me:$LINENO: result: Found Legacy Windows Platform SDK ($PSDK_HOME)" >&5 -$as_echo "Found Legacy Windows Platform SDK ($PSDK_HOME)" >&6; } + { echo "$as_me:$LINENO: result: Found Legacy Windows Platform SDK ($PSDK_HOME)" >&5 +echo "${ECHO_T}Found Legacy Windows Platform SDK ($PSDK_HOME)" >&6; } fi fi if test \( "$_os" = "WINNT" \) ; then - { $as_echo "$as_me:$LINENO: checking for DirectX SDK files" >&5 -$as_echo_n "checking for DirectX SDK files... " >&6; } + { echo "$as_me:$LINENO: checking for DirectX SDK files" >&5 +echo $ECHO_N "checking for DirectX SDK files... $ECHO_C" >&6; } if test -z "$with_directx_home"; then if test -n "$DXSDK_DIR"; then DIRECTXSDK_HOME=`cygpath -d "$DXSDK_DIR"` @@ -24195,17 +23485,17 @@ $as_echo_n "checking for DirectX SDK files... " >&6; } fi if test -n "$ENABLE_DIRECTX"; then if test "$HAVE_DIRECTXSDK_H" = "yes" -a "$HAVE_DIRECTXSDK_LIB" = "yes"; then - { $as_echo "$as_me:$LINENO: result: found" >&5 -$as_echo "found" >&6; } + { echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6; } else - { { $as_echo "$as_me:$LINENO: error: DirectX SDK files not found, please use --with-directx-home or -disable-directx." >&5 -$as_echo "$as_me: error: DirectX SDK files not found, please use --with-directx-home or -disable-directx." >&2;} + { { echo "$as_me:$LINENO: error: DirectX SDK files not found, please use --with-directx-home or -disable-directx." >&5 +echo "$as_me: error: DirectX SDK files not found, please use --with-directx-home or -disable-directx." >&2;} { (exit 1); exit 1; }; } fi else DIRECTXSDK_HOME="" - { $as_echo "$as_me:$LINENO: result: disabled" >&5 -$as_echo "disabled" >&6; } + { echo "$as_me:$LINENO: result: disabled" >&5 +echo "${ECHO_T}disabled" >&6; } fi fi @@ -24213,14 +23503,14 @@ fi NSIS_PATH="" if test "$_os" = "WINNT" ; then - { $as_echo "$as_me:$LINENO: checking for NSIS" >&5 -$as_echo_n "checking for NSIS... " >&6; } + { echo "$as_me:$LINENO: checking for NSIS" >&5 +echo $ECHO_N "checking for NSIS... $ECHO_C" >&6; } # Extract the first word of "nsis.exe", so it can be a program name with args. set dummy nsis.exe; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_NSIS_PATH+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $NSIS_PATH in [\\/]* | ?:[\\/]*) @@ -24235,7 +23525,7 @@ do 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_path_NSIS_PATH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -24247,11 +23537,11 @@ esac fi NSIS_PATH=$ac_cv_path_NSIS_PATH if test -n "$NSIS_PATH"; then - { $as_echo "$as_me:$LINENO: result: $NSIS_PATH" >&5 -$as_echo "$NSIS_PATH" >&6; } + { echo "$as_me:$LINENO: result: $NSIS_PATH" >&5 +echo "${ECHO_T}$NSIS_PATH" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -24269,24 +23559,24 @@ fi NSIS_PATH="$nsistest" fi if test -z "$NSIS_PATH"; then - { $as_echo "$as_me:$LINENO: WARNING: NSIS not found, no self contained installer will be build." >&5 -$as_echo "$as_me: WARNING: NSIS not found, no self contained installer will be build." >&2;} + { echo "$as_me:$LINENO: WARNING: NSIS not found, no self contained installer will be build." >&5 +echo "$as_me: WARNING: NSIS not found, no self contained installer will be build." >&2;} echo "NSIS not found, no self contained installer will be build." >> warn else NSIS_PATH=`cygpath -d "$NSIS_PATH"` NSIS_PATH=`cygpath -u "$NSIS_PATH"` - { $as_echo "$as_me:$LINENO: result: found ($NSIS_PATH)" >&5 -$as_echo "found ($NSIS_PATH)" >&6; } + { echo "$as_me:$LINENO: result: found ($NSIS_PATH)" >&5 +echo "${ECHO_T}found ($NSIS_PATH)" >&6; } fi fi # Extract the first word of "bison", so it can be a program name with args. set dummy bison; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_BISON+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $BISON in [\\/]* | ?:[\\/]*) @@ -24301,7 +23591,7 @@ do 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_path_BISON="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -24313,45 +23603,45 @@ esac fi BISON=$ac_cv_path_BISON if test -n "$BISON"; then - { $as_echo "$as_me:$LINENO: result: $BISON" >&5 -$as_echo "$BISON" >&6; } + { echo "$as_me:$LINENO: result: $BISON" >&5 +echo "${ECHO_T}$BISON" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi if test -z "$BISON"; then - { { $as_echo "$as_me:$LINENO: error: no bison found in \$PATH, install bison" >&5 -$as_echo "$as_me: error: no bison found in \$PATH, install bison" >&2;} + { { echo "$as_me:$LINENO: error: no bison found in \$PATH, install bison" >&5 +echo "$as_me: error: no bison found in \$PATH, install bison" >&2;} { (exit 1); exit 1; }; } else - { $as_echo "$as_me:$LINENO: checking the bison version" >&5 -$as_echo_n "checking the bison version... " >&6; } + { echo "$as_me:$LINENO: checking the bison version" >&5 +echo $ECHO_N "checking the bison version... $ECHO_C" >&6; } _bison_version=`$BISON --version | grep GNU | $SED -e 's@^[^0-9]*@@' -e 's@ .*@@' -e 's@,.*@@'`; _bison_longver=`echo $_bison_version | $AWK -F. '{ print \$1*1000+\$2}'` # Accept newer than 1.875 or older(equal) than 1.75 if test "$_bison_longver" -ge 1875 -o "$_bison_longver" -le 1075; then if test "$_bison_version" = "1.875" ; then - { $as_echo "$as_me:$LINENO: WARNING: suspect ($BISON $_bison_version)" >&5 -$as_echo "$as_me: WARNING: suspect ($BISON $_bison_version)" >&2;} + { echo "$as_me:$LINENO: WARNING: suspect ($BISON $_bison_version)" >&5 +echo "$as_me: WARNING: suspect ($BISON $_bison_version)" >&2;} echo "Suspect ($BISON $_bison_version) suggest upgrade" >> warn else - { $as_echo "$as_me:$LINENO: result: checked ($BISON $_bison_version)" >&5 -$as_echo "checked ($BISON $_bison_version)" >&6; } + { echo "$as_me:$LINENO: result: checked ($BISON $_bison_version)" >&5 +echo "${ECHO_T}checked ($BISON $_bison_version)" >&6; } fi else - { { $as_echo "$as_me:$LINENO: error: failed ($BISON $_bison_version need 1.875+ (or 1.75 and older))" >&5 -$as_echo "$as_me: error: failed ($BISON $_bison_version need 1.875+ (or 1.75 and older))" >&2;} + { { echo "$as_me:$LINENO: error: failed ($BISON $_bison_version need 1.875+ (or 1.75 and older))" >&5 +echo "$as_me: error: failed ($BISON $_bison_version need 1.875+ (or 1.75 and older))" >&2;} { (exit 1); exit 1; }; } fi fi # Extract the first word of "flex", so it can be a program name with args. set dummy flex; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_FLEX+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $FLEX in [\\/]* | ?:[\\/]*) @@ -24366,7 +23656,7 @@ do 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_path_FLEX="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -24378,25 +23668,25 @@ esac fi FLEX=$ac_cv_path_FLEX if test -n "$FLEX"; then - { $as_echo "$as_me:$LINENO: result: $FLEX" >&5 -$as_echo "$FLEX" >&6; } + { echo "$as_me:$LINENO: result: $FLEX" >&5 +echo "${ECHO_T}$FLEX" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi if test -z "$FLEX"; then - { { $as_echo "$as_me:$LINENO: error: no flex found in \$PATH, install flex" >&5 -$as_echo "$as_me: error: no flex found in \$PATH, install flex" >&2;} + { { echo "$as_me:$LINENO: error: no flex found in \$PATH, install flex" >&5 +echo "$as_me: error: no flex found in \$PATH, install flex" >&2;} { (exit 1); exit 1; }; } fi # Extract the first word of "patch", so it can be a program name with args. set dummy patch; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PATCH+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PATCH in [\\/]* | ?:[\\/]*) @@ -24411,7 +23701,7 @@ do 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_path_PATCH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -24423,17 +23713,17 @@ esac fi PATCH=$ac_cv_path_PATCH if test -n "$PATCH"; then - { $as_echo "$as_me:$LINENO: result: $PATCH" >&5 -$as_echo "$PATCH" >&6; } + { echo "$as_me:$LINENO: result: $PATCH" >&5 +echo "${ECHO_T}$PATCH" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi if test -z "$PATCH"; then - { { $as_echo "$as_me:$LINENO: error: \\"patch\\" not found in \$PATH, install the development tool named\\"patch\"\" >&5 -$as_echo "$as_me: error: \\"patch\\" not found in \$PATH, install the development tool named\\"patch\"\" >&2;} + { { echo "$as_me:$LINENO: error: \\"patch\\" not found in \$PATH, install the development tool named\\"patch\"\" >&5 +echo "$as_me: error: \\"patch\\" not found in \$PATH, install the development tool named\\"patch\"\" >&2;} { (exit 1); exit 1; }; } fi @@ -24444,20 +23734,20 @@ if test "$_os" = "SunOS" -o "$_os" = "FreeBSD" -o "$_os" = "Darwin"; then if test -x "$with_gnu_patch"; then GNUPATCH=$with_gnu_patch else - { { $as_echo "$as_me:$LINENO: error: --with-gnu-patch did not point to an executable" >&5 -$as_echo "$as_me: error: --with-gnu-patch did not point to an executable" >&2;} + { { echo "$as_me:$LINENO: error: --with-gnu-patch did not point to an executable" >&5 +echo "$as_me: error: --with-gnu-patch did not point to an executable" >&2;} { (exit 1); exit 1; }; } fi fi - { $as_echo "$as_me:$LINENO: checking whether $GNUPATCH is GNU patch" >&5 -$as_echo_n "checking whether $GNUPATCH is GNU patch... " >&6; } + { echo "$as_me:$LINENO: checking whether $GNUPATCH is GNU patch" >&5 +echo $ECHO_N "checking whether $GNUPATCH is GNU patch... $ECHO_C" >&6; } if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/dev/null; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - { { $as_echo "$as_me:$LINENO: error: no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it" >&5 -$as_echo "$as_me: error: no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it" >&2;} + { { echo "$as_me:$LINENO: error: no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it" >&5 +echo "$as_me: error: no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it" >&2;} { (exit 1); exit 1; }; } fi @@ -24467,10 +23757,10 @@ $as_echo "$as_me: error: no, GNU patch needed. install or specify with --with-gn do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_GNUCP+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $GNUCP in [\\/]* | ?:[\\/]*) @@ -24485,7 +23775,7 @@ do 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_path_GNUCP="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -24497,11 +23787,11 @@ esac fi GNUCP=$ac_cv_path_GNUCP if test -n "$GNUCP"; then - { $as_echo "$as_me:$LINENO: result: $GNUCP" >&5 -$as_echo "$GNUCP" >&6; } + { echo "$as_me:$LINENO: result: $GNUCP" >&5 +echo "${ECHO_T}$GNUCP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -24509,37 +23799,37 @@ fi done if test -z $GNUCP; then - { { $as_echo "$as_me:$LINENO: error: Neither gnucp nor cp found. Install GNU cp and/or specify --with-gnu-cp=/path/to/it" >&5 -$as_echo "$as_me: error: Neither gnucp nor cp found. Install GNU cp and/or specify --with-gnu-cp=/path/to/it" >&2;} + { { echo "$as_me:$LINENO: error: Neither gnucp nor cp found. Install GNU cp and/or specify --with-gnu-cp=/path/to/it" >&5 +echo "$as_me: error: Neither gnucp nor cp found. Install GNU cp and/or specify --with-gnu-cp=/path/to/it" >&2;} { (exit 1); exit 1; }; } fi else if test -x "$with_gnu_cp"; then GNUCP=$with_gnu_cp else - { { $as_echo "$as_me:$LINENO: error: --with-gnu-cp did not point to an executable" >&5 -$as_echo "$as_me: error: --with-gnu-cp did not point to an executable" >&2;} + { { echo "$as_me:$LINENO: error: --with-gnu-cp did not point to an executable" >&5 +echo "$as_me: error: --with-gnu-cp did not point to an executable" >&2;} { (exit 1); exit 1; }; } fi fi - { $as_echo "$as_me:$LINENO: checking whether $GNUCP is GNU cp" >&5 -$as_echo_n "checking whether $GNUCP is GNU cp... " >&6; } + { echo "$as_me:$LINENO: checking whether $GNUCP is GNU cp" >&5 +echo $ECHO_N "checking whether $GNUCP is GNU cp... $ECHO_C" >&6; } if $GNUCP --version 2>/dev/null | grep "Free Software Foundation" >/dev/null 2>/dev/null; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else if $GNUCP --version 2>/dev/null | grep "GNU fileutils" >/dev/null 2>/dev/null; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else if test "$_os" = "Darwin"; then GNUCP='' - { $as_echo "$as_me:$LINENO: result: no gnucp found - using the system's cp command" >&5 -$as_echo "no gnucp found - using the system's cp command" >&6; } + { echo "$as_me:$LINENO: result: no gnucp found - using the system's cp command" >&5 +echo "${ECHO_T}no gnucp found - using the system's cp command" >&6; } else - { { $as_echo "$as_me:$LINENO: error: no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it" >&5 -$as_echo "$as_me: error: no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it" >&2;} + { { echo "$as_me:$LINENO: error: no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it" >&5 +echo "$as_me: error: no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it" >&2;} { (exit 1); exit 1; }; } fi fi @@ -24553,10 +23843,10 @@ if test "$_os" = "WINNT"; then CYGWIN_PATH="" # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_CYGWIN_PATH+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $CYGWIN_PATH in [\\/]* | ?:[\\/]*) @@ -24571,7 +23861,7 @@ do 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_path_CYGWIN_PATH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -24583,11 +23873,11 @@ esac fi CYGWIN_PATH=$ac_cv_path_CYGWIN_PATH if test -n "$CYGWIN_PATH"; then - { $as_echo "$as_me:$LINENO: result: $CYGWIN_PATH" >&5 -$as_echo "$CYGWIN_PATH" >&6; } + { echo "$as_me:$LINENO: result: $CYGWIN_PATH" >&5 +echo "${ECHO_T}$CYGWIN_PATH" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -24599,18 +23889,18 @@ fi if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then - { $as_echo "$as_me:$LINENO: checking ml.exe assembler path" >&5 -$as_echo_n "checking ml.exe assembler path... " >&6; } + { echo "$as_me:$LINENO: checking ml.exe assembler path" >&5 +echo $ECHO_N "checking ml.exe assembler path... $ECHO_C" >&6; } if test -n "$with_asm_home"; then with_asm_home=`cygpath -u "$with_asm_home"` fi if test ! -x "$with_asm_home/ml.exe"; then # Extract the first word of "ml.exe", so it can be a program name with args. set dummy ml.exe; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_ML_EXE+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $ML_EXE in [\\/]* | ?:[\\/]*) @@ -24625,7 +23915,7 @@ do 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_path_ML_EXE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -24637,22 +23927,22 @@ esac fi ML_EXE=$ac_cv_path_ML_EXE if test -n "$ML_EXE"; then - { $as_echo "$as_me:$LINENO: result: $ML_EXE" >&5 -$as_echo "$ML_EXE" >&6; } + { echo "$as_me:$LINENO: result: $ML_EXE" >&5 +echo "${ECHO_T}$ML_EXE" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi if test -z "$ML_EXE"; then if test -x "$with_cl_home/bin/ml.exe"; then with_asm_home=$with_cl_home/bin - { $as_echo "$as_me:$LINENO: result: found ($with_asm_home)" >&5 -$as_echo "found ($with_asm_home)" >&6; } + { echo "$as_me:$LINENO: result: found ($with_asm_home)" >&5 +echo "${ECHO_T}found ($with_asm_home)" >&6; } else - { { $as_echo "$as_me:$LINENO: error: Configure did not find ml.exe assembler." >&5 -$as_echo "$as_me: error: Configure did not find ml.exe assembler." >&2;} + { { echo "$as_me:$LINENO: error: Configure did not find ml.exe assembler." >&5 +echo "$as_me: error: Configure did not find ml.exe assembler." >&2;} { (exit 1); exit 1; }; } fi else @@ -24664,8 +23954,8 @@ else fi ASM_HOME="$with_asm_home" if test -n "$ASM_HOME"; then - { $as_echo "$as_me:$LINENO: result: $ASM_HOME" >&5 -$as_echo "$ASM_HOME" >&6; } + { echo "$as_me:$LINENO: result: $ASM_HOME" >&5 +echo "${ECHO_T}$ASM_HOME" >&6; } fi @@ -24682,10 +23972,10 @@ if test -n "$with_zip_home" ; then else # Extract the first word of "zip", so it can be a program name with args. set dummy zip; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_ZIP+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $ZIP in [\\/]* | ?:[\\/]*) @@ -24700,7 +23990,7 @@ do 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_path_ZIP="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -24712,20 +24002,20 @@ esac fi ZIP=$ac_cv_path_ZIP if test -n "$ZIP"; then - { $as_echo "$as_me:$LINENO: result: $ZIP" >&5 -$as_echo "$ZIP" >&6; } + { echo "$as_me:$LINENO: result: $ZIP" >&5 +echo "${ECHO_T}$ZIP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi # Extract the first word of "unzip", so it can be a program name with args. set dummy unzip; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_UNZIP+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $UNZIP in [\\/]* | ?:[\\/]*) @@ -24740,7 +24030,7 @@ do 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_path_UNZIP="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -24752,35 +24042,35 @@ esac fi UNZIP=$ac_cv_path_UNZIP if test -n "$UNZIP"; then - { $as_echo "$as_me:$LINENO: result: $UNZIP" >&5 -$as_echo "$UNZIP" >&6; } + { echo "$as_me:$LINENO: result: $UNZIP" >&5 +echo "${ECHO_T}$UNZIP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi ZIP_HOME=`dirname "$ZIP"` fi if test -z "$ZIP" -o -z "$UNZIP"; then - { { $as_echo "$as_me:$LINENO: error: Zip/Unzip are required to build, please install or use --with-zip-home" >&5 -$as_echo "$as_me: error: Zip/Unzip are required to build, please install or use --with-zip-home" >&2;} + { { echo "$as_me:$LINENO: error: Zip/Unzip are required to build, please install or use --with-zip-home" >&5 +echo "$as_me: error: Zip/Unzip are required to build, please install or use --with-zip-home" >&2;} { (exit 1); exit 1; }; } fi if test "$_os" = "WINNT"; then if test "$with_use_shell" = "4nt" ; then if test -z "`$ZIP -h | grep -i WinNT`" ; then -{ { $as_echo "$as_me:$LINENO: error: $ZIP found in the path is not the required native Windows Version 2.3 of Info-ZIPs zip.exe. +{ { echo "$as_me:$LINENO: error: $ZIP found in the path is not the required native Windows Version 2.3 of Info-ZIPs zip.exe. Probably there is a cygwin version in the path." >&5 -$as_echo "$as_me: error: $ZIP found in the path is not the required native Windows Version 2.3 of Info-ZIPs zip.exe. +echo "$as_me: error: $ZIP found in the path is not the required native Windows Version 2.3 of Info-ZIPs zip.exe. Probably there is a cygwin version in the path." >&2;} { (exit 1); exit 1; }; } fi else if test -n "`$ZIP -h | grep -i WinNT`" ; then -{ { $as_echo "$as_me:$LINENO: error: $ZIP found in the path is not the required cygwin version of Info-ZIPs zip.exe." >&5 -$as_echo "$as_me: error: $ZIP found in the path is not the required cygwin version of Info-ZIPs zip.exe." >&2;} +{ { echo "$as_me:$LINENO: error: $ZIP found in the path is not the required cygwin version of Info-ZIPs zip.exe." >&5 +echo "$as_me: error: $ZIP found in the path is not the required cygwin version of Info-ZIPs zip.exe." >&2;} { (exit 1); exit 1; }; } fi fi @@ -24788,18 +24078,18 @@ fi if test "$_os" = "WINNT"; then - { $as_echo "$as_me:$LINENO: checking for unicows.dll" >&5 -$as_echo_n "checking for unicows.dll... " >&6; } + { echo "$as_me:$LINENO: checking for unicows.dll" >&5 +echo $ECHO_N "checking for unicows.dll... $ECHO_C" >&6; } if test -x ./external/unicows/unicows.dll; then - { $as_echo "$as_me:$LINENO: result: found" >&5 -$as_echo "found" >&6; } + { echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6; } else - { { $as_echo "$as_me:$LINENO: error: The Microsoft Layer for Unicode (unicows.dll) is missing in external/unicows/. + { { echo "$as_me:$LINENO: error: The Microsoft Layer for Unicode (unicows.dll) is missing in external/unicows/. Get it from the Microsoft site and put it into external/unicows. (Note: Microsoft seems to enjoy changing the exact location of this file. You may have to search Microsoft's website.) Last time it was seen at: ." >&5 -$as_echo "$as_me: error: The Microsoft Layer for Unicode (unicows.dll) is missing in external/unicows/. +echo "$as_me: error: The Microsoft Layer for Unicode (unicows.dll) is missing in external/unicows/. Get it from the Microsoft site and put it into external/unicows. (Note: Microsoft seems to enjoy changing the exact location of this file. You may have to search Microsoft's website.) Last time it was seen at: @@ -24809,18 +24099,18 @@ may have to search Microsoft's website.) Last time it was seen at: fi if test "$_os" = "WINNT"; then - { $as_echo "$as_me:$LINENO: checking for dbghelp.dll" >&5 -$as_echo_n "checking for dbghelp.dll... " >&6; } + { echo "$as_me:$LINENO: checking for dbghelp.dll" >&5 +echo $ECHO_N "checking for dbghelp.dll... $ECHO_C" >&6; } if test -x ./external/dbghelp/dbghelp.dll; then - { $as_echo "$as_me:$LINENO: result: found" >&5 -$as_echo "found" >&6; } + { echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6; } else - { { $as_echo "$as_me:$LINENO: error: dbghelp.dll is missing in external/dbghelp/. + { { echo "$as_me:$LINENO: error: dbghelp.dll is missing in external/dbghelp/. Get it from the Microsoft site and put it into external/dbghelp. (Note: Microsoft seems to enjoy changing the exact location of this file. You may have to search Microsoft's website.) Last time it was seen at: ." >&5 -$as_echo "$as_me: error: dbghelp.dll is missing in external/dbghelp/. +echo "$as_me: error: dbghelp.dll is missing in external/dbghelp/. Get it from the Microsoft site and put it into external/dbghelp. (Note: Microsoft seems to enjoy changing the exact location of this file. You may have to search Microsoft's website.) Last time it was seen at: @@ -24833,24 +24123,24 @@ if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then if ./oowintool --msvc-copy-dlls ./external/msvcp ; then : else - { { $as_echo "$as_me:$LINENO: error: oowintool failed to copy CRT" >&5 -$as_echo "$as_me: error: oowintool failed to copy CRT" >&2;} + { { echo "$as_me:$LINENO: error: oowintool failed to copy CRT" >&5 +echo "$as_me: error: oowintool failed to copy CRT" >&2;} { (exit 1); exit 1; }; } fi fi if test "$_os" = "WINNT"; then - { $as_echo "$as_me:$LINENO: checking for gdiplus.dll" >&5 -$as_echo_n "checking for gdiplus.dll... " >&6; } + { echo "$as_me:$LINENO: checking for gdiplus.dll" >&5 +echo $ECHO_N "checking for gdiplus.dll... $ECHO_C" >&6; } if test -x ./external/gdiplus/gdiplus.dll; then - { $as_echo "$as_me:$LINENO: result: found" >&5 -$as_echo "found" >&6; } + { echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6; } else - { { $as_echo "$as_me:$LINENO: error: gdiplus.dll is missing in external/gdiplus/. + { { echo "$as_me:$LINENO: error: gdiplus.dll is missing in external/gdiplus/. Get it from the Microsoft site and put it into external/gdiplus. You may have to search Microsoft's website. Last time it was seen at: ." >&5 -$as_echo "$as_me: error: gdiplus.dll is missing in external/gdiplus/. +echo "$as_me: error: gdiplus.dll is missing in external/gdiplus/. Get it from the Microsoft site and put it into external/gdiplus. You may have to search Microsoft's website. Last time it was seen at: ." >&2;} @@ -24864,11 +24154,11 @@ fi if test "$_os" = "WINNT"; then if test "$WITH_MINGWIN" = "yes" || test "$COMEX" -ge "10"; then - { $as_echo "$as_me:$LINENO: checking for instmsia.exe/instmsiw.exe" >&5 -$as_echo_n "checking for instmsia.exe/instmsiw.exe... " >&6; } + { echo "$as_me:$LINENO: checking for instmsia.exe/instmsiw.exe" >&5 +echo $ECHO_N "checking for instmsia.exe/instmsiw.exe... $ECHO_C" >&6; } if test -x ./external/msi/instmsia.exe -a -x ./external/msi/instmsiw.exe; then - { $as_echo "$as_me:$LINENO: result: found" >&5 -$as_echo "found" >&6; } + { echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6; } else MSIAPATH=`/bin/find "$COMPATH/../.." -iname instmsia.exe | head -n 1` MSIWPATH=`/bin/find "$COMPATH/../.." -iname instmsiw.exe | head -n 1` @@ -24877,36 +24167,36 @@ $as_echo "found" >&6; } cp "$MSIWPATH" ./external/msi/ && chmod +x ./external/msi/instmsiw.exe && MSIWCOPY="OK" fi if test -z "$MSIACOPY" -o -z "$MSIWCOPY"; then - { { $as_echo "$as_me:$LINENO: error: instmsia.exe and/or instmsiw.exe are/is missing in the default location. + { { echo "$as_me:$LINENO: error: instmsia.exe and/or instmsiw.exe are/is missing in the default location. These programs are part of the Visual Studio installation and should be found in a directory similar to: \"c:\\Program Files\\Microsoft Visual Studio .NET 2003\\Common7\\Tools\\Deployment\\MsiRedist\\\" As the automatic detection fails please copy the files to external/msi/." >&5 -$as_echo "$as_me: error: instmsia.exe and/or instmsiw.exe are/is missing in the default location. +echo "$as_me: error: instmsia.exe and/or instmsiw.exe are/is missing in the default location. These programs are part of the Visual Studio installation and should be found in a directory similar to: \"c:\\Program Files\\Microsoft Visual Studio .NET 2003\\Common7\\Tools\\Deployment\\MsiRedist\\\" As the automatic detection fails please copy the files to external/msi/." >&2;} { (exit 1); exit 1; }; } else - { $as_echo "$as_me:$LINENO: result: found and copied" >&5 -$as_echo "found and copied" >&6; } + { echo "$as_me:$LINENO: result: found and copied" >&5 +echo "${ECHO_T}found and copied" >&6; } fi fi fi fi -{ $as_echo "$as_me:$LINENO: checking which polygon clipping code to use" >&5 -$as_echo_n "checking which polygon clipping code to use... " >&6; } +{ echo "$as_me:$LINENO: checking which polygon clipping code to use" >&5 +echo $ECHO_N "checking which polygon clipping code to use... $ECHO_C" >&6; } WITH_GPC=NO if test "$with_gpc" != "no" && test "$without_gpc" != "yes"; then WITH_GPC=YES - { $as_echo "$as_me:$LINENO: result: GPC" >&5 -$as_echo "GPC" >&6; } + { echo "$as_me:$LINENO: result: GPC" >&5 +echo "${ECHO_T}GPC" >&6; } - { $as_echo "$as_me:$LINENO: checking for GPC files" >&5 -$as_echo_n "checking for GPC files... " >&6; } + { echo "$as_me:$LINENO: checking for GPC files" >&5 +echo $ECHO_N "checking for GPC files... $ECHO_C" >&6; } if test -f ./external/gpc/gpc.h; then HAVE_GPC_H="yes" else @@ -24919,25 +24209,25 @@ $as_echo_n "checking for GPC files... " >&6; } fi if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then - { $as_echo "$as_me:$LINENO: result: GPC files found" >&5 -$as_echo "GPC files found" >&6; } + { echo "$as_me:$LINENO: result: GPC files found" >&5 +echo "${ECHO_T}GPC files found" >&6; } else - { { $as_echo "$as_me:$LINENO: error: GPC files not found + { { echo "$as_me:$LINENO: error: GPC files not found ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z and untar in external/gpc, or use basegfx' implementation using --without-gpc" >&5 -$as_echo "$as_me: error: GPC files not found +echo "$as_me: error: GPC files not found ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z and untar in external/gpc, or use basegfx' implementation using --without-gpc" >&2;} { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:$LINENO: result: internal" >&5 -$as_echo "internal" >&6; } + { echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6; } fi -{ $as_echo "$as_me:$LINENO: checking which VCLplugs shall be built" >&5 -$as_echo_n "checking which VCLplugs shall be built... " >&6; } +{ echo "$as_me:$LINENO: checking which VCLplugs shall be built" >&5 +echo $ECHO_N "checking which VCLplugs shall be built... $ECHO_C" >&6; } ENABLE_GTK="" if test "x$enable_gtk" = "xyes"; then ENABLE_GTK="TRUE" @@ -24953,31 +24243,31 @@ fi if test -z "$R"; then - { $as_echo "$as_me:$LINENO: result: none" >&5 -$as_echo "none" >&6; } + { echo "$as_me:$LINENO: result: none" >&5 +echo "${ECHO_T}none" >&6; } else - { $as_echo "$as_me:$LINENO: result: $R" >&5 -$as_echo "$R" >&6; } + { echo "$as_me:$LINENO: result: $R" >&5 +echo "${ECHO_T}$R" >&6; } fi ENABLE_GCONF="" -{ $as_echo "$as_me:$LINENO: checking whether to enable GConf support" >&5 -$as_echo_n "checking whether to enable GConf support... " >&6; } +{ echo "$as_me:$LINENO: checking whether to enable GConf support" >&5 +echo $ECHO_N "checking whether to enable GConf support... $ECHO_C" >&6; } if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$_os" != "OS2" -a "$enable_gconf" = "yes"; then ENABLE_GCONF="TRUE" - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=no if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -24992,7 +24282,7 @@ do 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -25005,11 +24295,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -25023,25 +24313,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:$LINENO: checking for gconf-2.0 " >&5 -$as_echo_n "checking for gconf-2.0 ... " >&6; } + { echo "$as_me:$LINENO: checking for gconf-2.0 " >&5 +echo $ECHO_N "checking for gconf-2.0 ... $ECHO_C" >&6; } if $PKG_CONFIG --exists "gconf-2.0 " ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=yes - { $as_echo "$as_me:$LINENO: checking GCONF_CFLAGS" >&5 -$as_echo_n "checking GCONF_CFLAGS... " >&6; } + { echo "$as_me:$LINENO: checking GCONF_CFLAGS" >&5 +echo $ECHO_N "checking GCONF_CFLAGS... $ECHO_C" >&6; } GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 "` - { $as_echo "$as_me:$LINENO: result: $GCONF_CFLAGS" >&5 -$as_echo "$GCONF_CFLAGS" >&6; } + { echo "$as_me:$LINENO: result: $GCONF_CFLAGS" >&5 +echo "${ECHO_T}$GCONF_CFLAGS" >&6; } - { $as_echo "$as_me:$LINENO: checking GCONF_LIBS" >&5 -$as_echo_n "checking GCONF_LIBS... " >&6; } + { echo "$as_me:$LINENO: checking GCONF_LIBS" >&5 +echo $ECHO_N "checking GCONF_LIBS... $ECHO_C" >&6; } GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0 "` - { $as_echo "$as_me:$LINENO: result: $GCONF_LIBS" >&5 -$as_echo "$GCONF_LIBS" >&6; } + { echo "$as_me:$LINENO: result: $GCONF_LIBS" >&5 +echo "${ECHO_T}$GCONF_LIBS" >&6; } else GCONF_CFLAGS="" GCONF_LIBS="" @@ -25062,35 +24352,35 @@ $as_echo "$GCONF_LIBS" >&6; } if test $succeeded = yes; then : else - { { $as_echo "$as_me:$LINENO: error: Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -$as_echo "$as_me: error: Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { { echo "$as_me:$LINENO: error: Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi ENABLE_GNOMEVFS="" -{ $as_echo "$as_me:$LINENO: checking whether to enable GNOME VFS support" >&5 -$as_echo_n "checking whether to enable GNOME VFS support... " >&6; } +{ echo "$as_me:$LINENO: checking whether to enable GNOME VFS support" >&5 +echo $ECHO_N "checking whether to enable GNOME VFS support... $ECHO_C" >&6; } if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gnome_vfs" = "yes"; then ENABLE_GNOMEVFS="TRUE" - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=no if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -25105,7 +24395,7 @@ do 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -25118,11 +24408,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -25136,25 +24426,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:$LINENO: checking for gnome-vfs-2.0 >= 2.6.0 " >&5 -$as_echo_n "checking for gnome-vfs-2.0 >= 2.6.0 ... " >&6; } + { echo "$as_me:$LINENO: checking for gnome-vfs-2.0 >= 2.6.0 " >&5 +echo $ECHO_N "checking for gnome-vfs-2.0 >= 2.6.0 ... $ECHO_C" >&6; } if $PKG_CONFIG --exists "gnome-vfs-2.0 >= 2.6.0 " ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=yes - { $as_echo "$as_me:$LINENO: checking GNOMEVFS_CFLAGS" >&5 -$as_echo_n "checking GNOMEVFS_CFLAGS... " >&6; } + { echo "$as_me:$LINENO: checking GNOMEVFS_CFLAGS" >&5 +echo $ECHO_N "checking GNOMEVFS_CFLAGS... $ECHO_C" >&6; } GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= 2.6.0 "` - { $as_echo "$as_me:$LINENO: result: $GNOMEVFS_CFLAGS" >&5 -$as_echo "$GNOMEVFS_CFLAGS" >&6; } + { echo "$as_me:$LINENO: result: $GNOMEVFS_CFLAGS" >&5 +echo "${ECHO_T}$GNOMEVFS_CFLAGS" >&6; } - { $as_echo "$as_me:$LINENO: checking GNOMEVFS_LIBS" >&5 -$as_echo_n "checking GNOMEVFS_LIBS... " >&6; } + { echo "$as_me:$LINENO: checking GNOMEVFS_LIBS" >&5 +echo $ECHO_N "checking GNOMEVFS_LIBS... $ECHO_C" >&6; } GNOMEVFS_LIBS=`$PKG_CONFIG --libs "gnome-vfs-2.0 >= 2.6.0 "` - { $as_echo "$as_me:$LINENO: result: $GNOMEVFS_LIBS" >&5 -$as_echo "$GNOMEVFS_LIBS" >&6; } + { echo "$as_me:$LINENO: result: $GNOMEVFS_LIBS" >&5 +echo "${ECHO_T}$GNOMEVFS_LIBS" >&6; } else GNOMEVFS_CFLAGS="" GNOMEVFS_LIBS="" @@ -25175,8 +24465,8 @@ $as_echo "$GNOMEVFS_LIBS" >&6; } if test $succeeded = yes; then : else - { { $as_echo "$as_me:$LINENO: error: Library requirements (gnome-vfs-2.0 >= 2.6.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -$as_echo "$as_me: error: Library requirements (gnome-vfs-2.0 >= 2.6.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { { echo "$as_me:$LINENO: error: Library requirements (gnome-vfs-2.0 >= 2.6.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (gnome-vfs-2.0 >= 2.6.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi @@ -25187,10 +24477,10 @@ $as_echo "$as_me: error: Library requirements (gnome-vfs-2.0 >= 2.6.0 ) not met; if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -25205,7 +24495,7 @@ do 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -25218,11 +24508,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -25236,25 +24526,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:$LINENO: checking for gconf-2.0 " >&5 -$as_echo_n "checking for gconf-2.0 ... " >&6; } + { echo "$as_me:$LINENO: checking for gconf-2.0 " >&5 +echo $ECHO_N "checking for gconf-2.0 ... $ECHO_C" >&6; } if $PKG_CONFIG --exists "gconf-2.0 " ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=yes - { $as_echo "$as_me:$LINENO: checking GCONF_CFLAGS" >&5 -$as_echo_n "checking GCONF_CFLAGS... " >&6; } + { echo "$as_me:$LINENO: checking GCONF_CFLAGS" >&5 +echo $ECHO_N "checking GCONF_CFLAGS... $ECHO_C" >&6; } GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 "` - { $as_echo "$as_me:$LINENO: result: $GCONF_CFLAGS" >&5 -$as_echo "$GCONF_CFLAGS" >&6; } + { echo "$as_me:$LINENO: result: $GCONF_CFLAGS" >&5 +echo "${ECHO_T}$GCONF_CFLAGS" >&6; } - { $as_echo "$as_me:$LINENO: checking GCONF_LIBS" >&5 -$as_echo_n "checking GCONF_LIBS... " >&6; } + { echo "$as_me:$LINENO: checking GCONF_LIBS" >&5 +echo $ECHO_N "checking GCONF_LIBS... $ECHO_C" >&6; } GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0 "` - { $as_echo "$as_me:$LINENO: result: $GCONF_LIBS" >&5 -$as_echo "$GCONF_LIBS" >&6; } + { echo "$as_me:$LINENO: result: $GCONF_LIBS" >&5 +echo "${ECHO_T}$GCONF_LIBS" >&6; } else GCONF_CFLAGS="" GCONF_LIBS="" @@ -25275,15 +24565,15 @@ $as_echo "$GCONF_LIBS" >&6; } if test $succeeded = yes; then : else - { { $as_echo "$as_me:$LINENO: error: Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -$as_echo "$as_me: error: Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { { echo "$as_me:$LINENO: error: Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi fi else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -25301,10 +24591,10 @@ if test "$test_gtk" = "yes"; then if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -25319,7 +24609,7 @@ do 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -25332,11 +24622,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -25350,25 +24640,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:$LINENO: checking for gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 " >&5 -$as_echo_n "checking for gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 ... " >&6; } + { echo "$as_me:$LINENO: checking for gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 " >&5 +echo $ECHO_N "checking for gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 ... $ECHO_C" >&6; } if $PKG_CONFIG --exists "gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 " ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=yes - { $as_echo "$as_me:$LINENO: checking GTK_CFLAGS" >&5 -$as_echo_n "checking GTK_CFLAGS... " >&6; } + { echo "$as_me:$LINENO: checking GTK_CFLAGS" >&5 +echo $ECHO_N "checking GTK_CFLAGS... $ECHO_C" >&6; } GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 "` - { $as_echo "$as_me:$LINENO: result: $GTK_CFLAGS" >&5 -$as_echo "$GTK_CFLAGS" >&6; } + { echo "$as_me:$LINENO: result: $GTK_CFLAGS" >&5 +echo "${ECHO_T}$GTK_CFLAGS" >&6; } - { $as_echo "$as_me:$LINENO: checking GTK_LIBS" >&5 -$as_echo_n "checking GTK_LIBS... " >&6; } + { echo "$as_me:$LINENO: checking GTK_LIBS" >&5 +echo $ECHO_N "checking GTK_LIBS... $ECHO_C" >&6; } GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 "` - { $as_echo "$as_me:$LINENO: result: $GTK_LIBS" >&5 -$as_echo "$GTK_LIBS" >&6; } + { echo "$as_me:$LINENO: result: $GTK_LIBS" >&5 +echo "${ECHO_T}$GTK_LIBS" >&6; } else GTK_CFLAGS="" GTK_LIBS="" @@ -25389,8 +24679,8 @@ $as_echo "$GTK_LIBS" >&6; } if test $succeeded = yes; then : else - { { $as_echo "$as_me:$LINENO: error: requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages" >&5 -$as_echo "$as_me: error: requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages" >&2;} + { { echo "$as_me:$LINENO: error: requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages" >&5 +echo "$as_me: error: requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages" >&2;} { (exit 1); exit 1; }; } fi @@ -25401,22 +24691,22 @@ $as_echo "$as_me: error: requirements to build the gtk-plugin not met. Use --dis BUILD_TYPE="$BUILD_TYPE SYSTRAY_GTK" fi - { $as_echo "$as_me:$LINENO: checking whether to enable DBUS support" >&5 -$as_echo_n "checking whether to enable DBUS support... " >&6; } + { echo "$as_me:$LINENO: checking whether to enable DBUS support" >&5 +echo $ECHO_N "checking whether to enable DBUS support... $ECHO_C" >&6; } if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_dbus" = "yes"; then ENABLE_DBUS="TRUE" - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=no if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -25431,7 +24721,7 @@ do 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -25444,11 +24734,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -25462,25 +24752,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:$LINENO: checking for dbus-glib-1 >= 0.70 " >&5 -$as_echo_n "checking for dbus-glib-1 >= 0.70 ... " >&6; } + { echo "$as_me:$LINENO: checking for dbus-glib-1 >= 0.70 " >&5 +echo $ECHO_N "checking for dbus-glib-1 >= 0.70 ... $ECHO_C" >&6; } if $PKG_CONFIG --exists "dbus-glib-1 >= 0.70 " ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=yes - { $as_echo "$as_me:$LINENO: checking DBUS_CFLAGS" >&5 -$as_echo_n "checking DBUS_CFLAGS... " >&6; } + { echo "$as_me:$LINENO: checking DBUS_CFLAGS" >&5 +echo $ECHO_N "checking DBUS_CFLAGS... $ECHO_C" >&6; } DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= 0.70 "` - { $as_echo "$as_me:$LINENO: result: $DBUS_CFLAGS" >&5 -$as_echo "$DBUS_CFLAGS" >&6; } + { echo "$as_me:$LINENO: result: $DBUS_CFLAGS" >&5 +echo "${ECHO_T}$DBUS_CFLAGS" >&6; } - { $as_echo "$as_me:$LINENO: checking DBUS_LIBS" >&5 -$as_echo_n "checking DBUS_LIBS... " >&6; } + { echo "$as_me:$LINENO: checking DBUS_LIBS" >&5 +echo $ECHO_N "checking DBUS_LIBS... $ECHO_C" >&6; } DBUS_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= 0.70 "` - { $as_echo "$as_me:$LINENO: result: $DBUS_LIBS" >&5 -$as_echo "$DBUS_LIBS" >&6; } + { echo "$as_me:$LINENO: result: $DBUS_LIBS" >&5 +echo "${ECHO_T}$DBUS_LIBS" >&6; } else DBUS_CFLAGS="" DBUS_LIBS="" @@ -25501,37 +24791,37 @@ $as_echo "$DBUS_LIBS" >&6; } if test $succeeded = yes; then : else - { { $as_echo "$as_me:$LINENO: error: Library requirements (dbus-glib-1 >= 0.70 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -$as_echo "$as_me: error: Library requirements (dbus-glib-1 >= 0.70 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { { echo "$as_me:$LINENO: error: Library requirements (dbus-glib-1 >= 0.70 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (dbus-glib-1 >= 0.70 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - { $as_echo "$as_me:$LINENO: checking whether to enable GIO support" >&5 -$as_echo_n "checking whether to enable GIO support... " >&6; } + { echo "$as_me:$LINENO: checking whether to enable GIO support" >&5 +echo $ECHO_N "checking whether to enable GIO support... $ECHO_C" >&6; } if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gio" = "yes"; then if test "$ENABLE_GNOMEVFS" = "TRUE" ; then - { { $as_echo "$as_me:$LINENO: error: please use --enable-gio only together with --disable-gnome-vfs." >&5 -$as_echo "$as_me: error: please use --enable-gio only together with --disable-gnome-vfs." >&2;} + { { echo "$as_me:$LINENO: error: please use --enable-gio only together with --disable-gnome-vfs." >&5 +echo "$as_me: error: please use --enable-gio only together with --disable-gnome-vfs." >&2;} { (exit 1); exit 1; }; } fi ENABLE_GIO="TRUE" - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=no if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -25546,7 +24836,7 @@ do 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -25559,11 +24849,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -25577,25 +24867,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:$LINENO: checking for gio-2.0 " >&5 -$as_echo_n "checking for gio-2.0 ... " >&6; } + { echo "$as_me:$LINENO: checking for gio-2.0 " >&5 +echo $ECHO_N "checking for gio-2.0 ... $ECHO_C" >&6; } if $PKG_CONFIG --exists "gio-2.0 " ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=yes - { $as_echo "$as_me:$LINENO: checking GIO_CFLAGS" >&5 -$as_echo_n "checking GIO_CFLAGS... " >&6; } + { echo "$as_me:$LINENO: checking GIO_CFLAGS" >&5 +echo $ECHO_N "checking GIO_CFLAGS... $ECHO_C" >&6; } GIO_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 "` - { $as_echo "$as_me:$LINENO: result: $GIO_CFLAGS" >&5 -$as_echo "$GIO_CFLAGS" >&6; } + { echo "$as_me:$LINENO: result: $GIO_CFLAGS" >&5 +echo "${ECHO_T}$GIO_CFLAGS" >&6; } - { $as_echo "$as_me:$LINENO: checking GIO_LIBS" >&5 -$as_echo_n "checking GIO_LIBS... " >&6; } + { echo "$as_me:$LINENO: checking GIO_LIBS" >&5 +echo $ECHO_N "checking GIO_LIBS... $ECHO_C" >&6; } GIO_LIBS=`$PKG_CONFIG --libs "gio-2.0 "` - { $as_echo "$as_me:$LINENO: result: $GIO_LIBS" >&5 -$as_echo "$GIO_LIBS" >&6; } + { echo "$as_me:$LINENO: result: $GIO_LIBS" >&5 +echo "${ECHO_T}$GIO_LIBS" >&6; } else GIO_CFLAGS="" GIO_LIBS="" @@ -25616,14 +24906,14 @@ $as_echo "$GIO_LIBS" >&6; } if test $succeeded = yes; then : else - { { $as_echo "$as_me:$LINENO: error: Library requirements (gio-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -$as_echo "$as_me: error: Library requirements (gio-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { { echo "$as_me:$LINENO: error: Library requirements (gio-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (gio-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi fi @@ -25642,18 +24932,18 @@ SYSTEM_CAIRO="" if test "$test_cairo" = "yes"; then - { $as_echo "$as_me:$LINENO: checking whether to use cairo" >&5 -$as_echo_n "checking whether to use cairo... " >&6; } + { echo "$as_me:$LINENO: checking whether to use cairo" >&5 +echo $ECHO_N "checking whether to use cairo... $ECHO_C" >&6; } if test "x$enable_cairo" != "xno" ; then ENABLE_CAIRO="TRUE" - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - { $as_echo "$as_me:$LINENO: checking which cairo to use" >&5 -$as_echo_n "checking which cairo to use... " >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + { echo "$as_me:$LINENO: checking which cairo to use" >&5 +echo $ECHO_N "checking which cairo to use... $ECHO_C" >&6; } if test -n "$with_system_cairo" -o -n "$with_system_libs" && \ test "$with_system_cairo" != "no"; then - { $as_echo "$as_me:$LINENO: result: external" >&5 -$as_echo "external" >&6; } + { echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6; } SYSTEM_CAIRO=YES @@ -25662,10 +24952,10 @@ $as_echo "external" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -25680,7 +24970,7 @@ do 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -25693,11 +24983,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -25711,25 +25001,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:$LINENO: checking for cairo >= 1.0.2 " >&5 -$as_echo_n "checking for cairo >= 1.0.2 ... " >&6; } + { echo "$as_me:$LINENO: checking for cairo >= 1.0.2 " >&5 +echo $ECHO_N "checking for cairo >= 1.0.2 ... $ECHO_C" >&6; } if $PKG_CONFIG --exists "cairo >= 1.0.2 " ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=yes - { $as_echo "$as_me:$LINENO: checking CAIRO_CFLAGS" >&5 -$as_echo_n "checking CAIRO_CFLAGS... " >&6; } + { echo "$as_me:$LINENO: checking CAIRO_CFLAGS" >&5 +echo $ECHO_N "checking CAIRO_CFLAGS... $ECHO_C" >&6; } CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= 1.0.2 "` - { $as_echo "$as_me:$LINENO: result: $CAIRO_CFLAGS" >&5 -$as_echo "$CAIRO_CFLAGS" >&6; } + { echo "$as_me:$LINENO: result: $CAIRO_CFLAGS" >&5 +echo "${ECHO_T}$CAIRO_CFLAGS" >&6; } - { $as_echo "$as_me:$LINENO: checking CAIRO_LIBS" >&5 -$as_echo_n "checking CAIRO_LIBS... " >&6; } + { echo "$as_me:$LINENO: checking CAIRO_LIBS" >&5 +echo $ECHO_N "checking CAIRO_LIBS... $ECHO_C" >&6; } CAIRO_LIBS=`$PKG_CONFIG --libs "cairo >= 1.0.2 "` - { $as_echo "$as_me:$LINENO: result: $CAIRO_LIBS" >&5 -$as_echo "$CAIRO_LIBS" >&6; } + { echo "$as_me:$LINENO: result: $CAIRO_LIBS" >&5 +echo "${ECHO_T}$CAIRO_LIBS" >&6; } else CAIRO_CFLAGS="" CAIRO_LIBS="" @@ -25750,27 +25040,25 @@ $as_echo "$CAIRO_LIBS" >&6; } if test $succeeded = yes; then : else - { { $as_echo "$as_me:$LINENO: error: Library requirements (cairo >= 1.0.2 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -$as_echo "$as_me: error: Library requirements (cairo >= 1.0.2 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { { echo "$as_me:$LINENO: error: Library requirements (cairo >= 1.0.2 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (cairo >= 1.0.2 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$ENABLE_FONTCONFIG" != "TRUE" ; then - { { $as_echo "$as_me:$LINENO: error: Cairo library requires fontconfig." >&5 -$as_echo "$as_me: error: Cairo library requires fontconfig." >&2;} + { { echo "$as_me:$LINENO: error: Cairo library requires fontconfig." >&5 +echo "$as_me: error: Cairo library requires fontconfig." >&2;} { (exit 1); exit 1; }; } fi if test "$with_system_xrender_headers" = "yes"; then - { $as_echo "$as_me:$LINENO: checking whether Xrender.h defines PictStandardA8" >&5 -$as_echo_n "checking whether Xrender.h defines PictStandardA8... " >&6; } + { echo "$as_me:$LINENO: checking whether Xrender.h defines PictStandardA8" >&5 +echo $ECHO_N "checking whether Xrender.h defines PictStandardA8... $ECHO_C" >&6; } if test "$cross_compiling" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot run test program while cross compiling +echo "$as_me: error: cannot run test program while cross compiling See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } + { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -25796,35 +25084,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' { (case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { $as_echo "$as_me:$LINENO: error: no, X headers too old." >&5 -$as_echo "$as_me: error: no, X headers too old." >&2;} +{ { echo "$as_me:$LINENO: error: no, X headers too old." >&5 +echo "$as_me: error: no, X headers too old." >&2;} { (exit 1); exit 1; }; } fi -rm -rf conftest.dSYM rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi @@ -25835,12 +25120,12 @@ fi if test "$build_cpu" != "x86_64"; then BUILD_PIXMAN=YES fi - { $as_echo "$as_me:$LINENO: result: internal" >&5 -$as_echo "internal" >&6; } + { echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6; } fi else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi fi @@ -25851,25 +25136,25 @@ fi -{ $as_echo "$as_me:$LINENO: checking whether to build the OpenGL Transitions component" >&5 -$as_echo_n "checking whether to build the OpenGL Transitions component... " >&6; } +{ echo "$as_me:$LINENO: checking whether to build the OpenGL Transitions component" >&5 +echo $ECHO_N "checking whether to build the OpenGL Transitions component... $ECHO_C" >&6; } ENABLE_OPENGL= if test "x$enable_opengl" != "xno" ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } if test "${ac_cv_header_GL_gl_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for GL/gl.h" >&5 -$as_echo_n "checking for GL/gl.h... " >&6; } + { echo "$as_me:$LINENO: checking for GL/gl.h" >&5 +echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6; } if test "${ac_cv_header_GL_gl_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5 -$as_echo "$ac_cv_header_GL_gl_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5 +echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6; } else # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking GL/gl.h usability" >&5 -$as_echo_n "checking GL/gl.h usability... " >&6; } +{ echo "$as_me:$LINENO: checking GL/gl.h usability" >&5 +echo $ECHO_N "checking GL/gl.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -25885,33 +25170,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_header_compiler=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ $as_echo "$as_me:$LINENO: checking GL/gl.h presence" >&5 -$as_echo_n "checking GL/gl.h presence... " >&6; } +{ echo "$as_me:$LINENO: checking GL/gl.h presence" >&5 +echo $ECHO_N "checking GL/gl.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -25925,80 +25209,79 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: GL/gl.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: GL/gl.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: GL/gl.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: GL/gl.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: GL/gl.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: GL/gl.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/gl.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: GL/gl.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/gl.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: GL/gl.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/gl.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: GL/gl.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/gl.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: GL/gl.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&2;} ;; esac -{ $as_echo "$as_me:$LINENO: checking for GL/gl.h" >&5 -$as_echo_n "checking for GL/gl.h... " >&6; } +{ echo "$as_me:$LINENO: checking for GL/gl.h" >&5 +echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6; } if test "${ac_cv_header_GL_gl_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_GL_gl_h=$ac_header_preproc fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5 -$as_echo "$ac_cv_header_GL_gl_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5 +echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6; } fi -if test "x$ac_cv_header_GL_gl_h" = x""yes; then +if test $ac_cv_header_GL_gl_h = yes; then : else - { { $as_echo "$as_me:$LINENO: error: OpenGL headers not found" >&5 -$as_echo "$as_me: error: OpenGL headers not found" >&2;} + { { echo "$as_me:$LINENO: error: OpenGL headers not found" >&5 +echo "$as_me: error: OpenGL headers not found" >&2;} { (exit 1); exit 1; }; } fi -{ $as_echo "$as_me:$LINENO: checking for main in -lGL" >&5 -$as_echo_n "checking for main in -lGL... " >&6; } +{ echo "$as_me:$LINENO: checking for main in -lGL" >&5 +echo $ECHO_N "checking for main in -lGL... $ECHO_C" >&6; } if test "${ac_cv_lib_GL_main+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lGL $LIBS" @@ -26024,37 +25307,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_GL_main=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_GL_main=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_GL_main" >&5 -$as_echo "$ac_cv_lib_GL_main" >&6; } -if test "x$ac_cv_lib_GL_main" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_GL_main" >&5 +echo "${ECHO_T}$ac_cv_lib_GL_main" >&6; } +if test $ac_cv_lib_GL_main = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBGL 1 _ACEOF @@ -26062,16 +25341,16 @@ _ACEOF LIBS="-lGL $LIBS" else - { { $as_echo "$as_me:$LINENO: error: libGL not installed or functional" >&5 -$as_echo "$as_me: error: libGL not installed or functional" >&2;} + { { echo "$as_me:$LINENO: error: libGL not installed or functional" >&5 +echo "$as_me: error: libGL not installed or functional" >&2;} { (exit 1); exit 1; }; } fi -{ $as_echo "$as_me:$LINENO: checking for main in -lGLU" >&5 -$as_echo_n "checking for main in -lGLU... " >&6; } +{ echo "$as_me:$LINENO: checking for main in -lGLU" >&5 +echo $ECHO_N "checking for main in -lGLU... $ECHO_C" >&6; } if test "${ac_cv_lib_GLU_main+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lGLU $LIBS" @@ -26097,37 +25376,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_GLU_main=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_GLU_main=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_GLU_main" >&5 -$as_echo "$ac_cv_lib_GLU_main" >&6; } -if test "x$ac_cv_lib_GLU_main" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_GLU_main" >&5 +echo "${ECHO_T}$ac_cv_lib_GLU_main" >&6; } +if test $ac_cv_lib_GLU_main = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBGLU 1 _ACEOF @@ -26135,58 +25410,58 @@ _ACEOF LIBS="-lGLU $LIBS" else - { { $as_echo "$as_me:$LINENO: error: libGLU not installed or functional" >&5 -$as_echo "$as_me: error: libGLU not installed or functional" >&2;} + { { echo "$as_me:$LINENO: error: libGLU not installed or functional" >&5 +echo "$as_me: error: libGLU not installed or functional" >&2;} { (exit 1); exit 1; }; } fi ENABLE_OPENGL=TRUE else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -{ $as_echo "$as_me:$LINENO: checking whether to build the Presentation Minimizer extension" >&5 -$as_echo_n "checking whether to build the Presentation Minimizer extension... " >&6; } +{ echo "$as_me:$LINENO: checking whether to build the Presentation Minimizer extension" >&5 +echo $ECHO_N "checking whether to build the Presentation Minimizer extension... $ECHO_C" >&6; } if test -n "$enable_minimizer" -a "$enable_minimizer" != "no"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } ENABLE_MINIMIZER=YES else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } ENABLE_MINIMIZER=NO fi -{ $as_echo "$as_me:$LINENO: checking whether to build the Presenter Screen extension" >&5 -$as_echo_n "checking whether to build the Presenter Screen extension... " >&6; } +{ echo "$as_me:$LINENO: checking whether to build the Presenter Screen extension" >&5 +echo $ECHO_N "checking whether to build the Presenter Screen extension... $ECHO_C" >&6; } if test -n "$enable_presenter_console" -a "$enable_presenter_screen" != "no"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } ENABLE_PRESENTER_SCREEN=YES else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } ENABLE_PRESENTER_SCREEN=NO fi -{ $as_echo "$as_me:$LINENO: checking whether to build the PDF Import extension" >&5 -$as_echo_n "checking whether to build the PDF Import extension... " >&6; } +{ echo "$as_me:$LINENO: checking whether to build the PDF Import extension" >&5 +echo $ECHO_N "checking whether to build the PDF Import extension... $ECHO_C" >&6; } if test -n "$enable_pdfimport" -a "$enable_pdfimport" != "no"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } ENABLE_PDFIMPORT=YES - { $as_echo "$as_me:$LINENO: checking which pdf backend to use" >&5 -$as_echo_n "checking which pdf backend to use... " >&6; } + { echo "$as_me:$LINENO: checking which pdf backend to use" >&5 +echo $ECHO_N "checking which pdf backend to use... $ECHO_C" >&6; } if test -n "$with_system_poppler" -o -n "$with_system_libs" && \ test "$with_system_poppler" != "no"; then - { $as_echo "$as_me:$LINENO: result: external" >&5 -$as_echo "external" >&6; } + { echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6; } SYSTEM_POPPLER=YES succeeded=no @@ -26194,10 +25469,10 @@ $as_echo "external" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -26212,7 +25487,7 @@ do 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -26225,11 +25500,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -26243,25 +25518,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:$LINENO: checking for poppler >= 0.8.0 " >&5 -$as_echo_n "checking for poppler >= 0.8.0 ... " >&6; } + { echo "$as_me:$LINENO: checking for poppler >= 0.8.0 " >&5 +echo $ECHO_N "checking for poppler >= 0.8.0 ... $ECHO_C" >&6; } if $PKG_CONFIG --exists "poppler >= 0.8.0 " ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=yes - { $as_echo "$as_me:$LINENO: checking POPPLER_CFLAGS" >&5 -$as_echo_n "checking POPPLER_CFLAGS... " >&6; } + { echo "$as_me:$LINENO: checking POPPLER_CFLAGS" >&5 +echo $ECHO_N "checking POPPLER_CFLAGS... $ECHO_C" >&6; } POPPLER_CFLAGS=`$PKG_CONFIG --cflags "poppler >= 0.8.0 "` - { $as_echo "$as_me:$LINENO: result: $POPPLER_CFLAGS" >&5 -$as_echo "$POPPLER_CFLAGS" >&6; } + { echo "$as_me:$LINENO: result: $POPPLER_CFLAGS" >&5 +echo "${ECHO_T}$POPPLER_CFLAGS" >&6; } - { $as_echo "$as_me:$LINENO: checking POPPLER_LIBS" >&5 -$as_echo_n "checking POPPLER_LIBS... " >&6; } + { echo "$as_me:$LINENO: checking POPPLER_LIBS" >&5 +echo $ECHO_N "checking POPPLER_LIBS... $ECHO_C" >&6; } POPPLER_LIBS=`$PKG_CONFIG --libs "poppler >= 0.8.0 "` - { $as_echo "$as_me:$LINENO: result: $POPPLER_LIBS" >&5 -$as_echo "$POPPLER_LIBS" >&6; } + { echo "$as_me:$LINENO: result: $POPPLER_LIBS" >&5 +echo "${ECHO_T}$POPPLER_LIBS" >&6; } else POPPLER_CFLAGS="" POPPLER_LIBS="" @@ -26282,30 +25557,30 @@ $as_echo "$POPPLER_LIBS" >&6; } if test $succeeded = yes; then : else - { { $as_echo "$as_me:$LINENO: error: Library requirements (poppler >= 0.8.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -$as_echo "$as_me: error: Library requirements (poppler >= 0.8.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { { echo "$as_me:$LINENO: error: Library requirements (poppler >= 0.8.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (poppler >= 0.8.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:$LINENO: result: internal" >&5 -$as_echo "internal" >&6; } + { echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6; } SYSTEM_POPPLER=NO BUILD_TYPE="$BUILD_TYPE XPDF" - { $as_echo "$as_me:$LINENO: checking for xpdf module" >&5 -$as_echo_n "checking for xpdf module... " >&6; } + { echo "$as_me:$LINENO: checking for xpdf module" >&5 +echo $ECHO_N "checking for xpdf module... $ECHO_C" >&6; } if test -d ./xpdf; then - { $as_echo "$as_me:$LINENO: result: OK" >&5 -$as_echo "OK" >&6; } + { echo "$as_me:$LINENO: result: OK" >&5 +echo "${ECHO_T}OK" >&6; } else - { { $as_echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5 -$as_echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;} + { { echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5 +echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;} { (exit 1); exit 1; }; } fi fi else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } ENABLE_PDFIMPORT=NO fi @@ -26314,62 +25589,62 @@ fi if test "$ENABLE_PRESENTER_SCREEN" = "YES" -o "$ENABLE_MINIMIZER" = "YES" -o "$ENABLE_PDFIMPORT" = "YES"; then - { $as_echo "$as_me:$LINENO: checking for sdext module" >&5 -$as_echo_n "checking for sdext module... " >&6; } + { echo "$as_me:$LINENO: checking for sdext module" >&5 +echo $ECHO_N "checking for sdext module... $ECHO_C" >&6; } if test -d ./sdext; then - { $as_echo "$as_me:$LINENO: result: OK" >&5 -$as_echo "OK" >&6; } + { echo "$as_me:$LINENO: result: OK" >&5 +echo "${ECHO_T}OK" >&6; } else - { { $as_echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5 -$as_echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;} + { { echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5 +echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;} { (exit 1); exit 1; }; } fi BUILD_TYPE="$BUILD_TYPE SDEXT" fi -{ $as_echo "$as_me:$LINENO: checking whether to build the Wiki Publisher extension" >&5 -$as_echo_n "checking whether to build the Wiki Publisher extension... " >&6; } +{ echo "$as_me:$LINENO: checking whether to build the Wiki Publisher extension" >&5 +echo $ECHO_N "checking whether to build the Wiki Publisher extension... $ECHO_C" >&6; } if test -n "$enable_wiki_publisher" -a "$enable_wiki_publisher" != "no" && test "$WITH_JAVA" != "no"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - { $as_echo "$as_me:$LINENO: checking for swext module" >&5 -$as_echo_n "checking for swext module... " >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + { echo "$as_me:$LINENO: checking for swext module" >&5 +echo $ECHO_N "checking for swext module... $ECHO_C" >&6; } if test -d ./swext; then - { $as_echo "$as_me:$LINENO: result: OK" >&5 -$as_echo "OK" >&6; } + { echo "$as_me:$LINENO: result: OK" >&5 +echo "${ECHO_T}OK" >&6; } else - { { $as_echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5 -$as_echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;} + { { echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5 +echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;} { (exit 1); exit 1; }; } fi ENABLE_MEDIAWIKI=YES BUILD_TYPE="$BUILD_TYPE SWEXT" else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } ENABLE_MEDIAWIKI=NO fi if test "$ENABLE_MEDIAWIKI" == "YES"; then - { $as_echo "$as_me:$LINENO: checking which Servlet API Jar to use" >&5 -$as_echo_n "checking which Servlet API Jar to use... " >&6; } + { echo "$as_me:$LINENO: checking which Servlet API Jar to use" >&5 +echo $ECHO_N "checking which Servlet API Jar to use... $ECHO_C" >&6; } if test -n "$with_system_servlet_api"; then - { $as_echo "$as_me:$LINENO: result: external" >&5 -$as_echo "external" >&6; } + { echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6; } SYSTEM_SERVLETAPI=YES if test -z "$SERVLETAPI_JAR"; then SERVLETAPI_JAR=/usr/share/java/servlet-api.jar fi - as_ac_File=`$as_echo "ac_cv_file_$SERVLETAPI_JAR" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $SERVLETAPI_JAR" >&5 -$as_echo_n "checking for $SERVLETAPI_JAR... " >&6; } + as_ac_File=`echo "ac_cv_file_$SERVLETAPI_JAR" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $SERVLETAPI_JAR" >&5 +echo $ECHO_N "checking for $SERVLETAPI_JAR... $ECHO_C" >&6; } if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$SERVLETAPI_JAR"; then eval "$as_ac_File=yes" @@ -26377,23 +25652,20 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_File'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_File'}'` = yes; then : else - { { $as_echo "$as_me:$LINENO: error: servlet-api.jar not found." >&5 -$as_echo "$as_me: error: servlet-api.jar not found." >&2;} + { { echo "$as_me:$LINENO: error: servlet-api.jar not found." >&5 +echo "$as_me: error: servlet-api.jar not found." >&2;} { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:$LINENO: result: internal" >&5 -$as_echo "internal" >&6; } + { echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6; } SYSTEM_SERVLETAPI=NO BUILD_TYPE="$BUILD_TYPE TOMCAT" fi @@ -26401,40 +25673,40 @@ fi -{ $as_echo "$as_me:$LINENO: checking whether to build the Report Builder extension" >&5 -$as_echo_n "checking whether to build the Report Builder extension... " >&6; } +{ echo "$as_me:$LINENO: checking whether to build the Report Builder extension" >&5 +echo $ECHO_N "checking whether to build the Report Builder extension... $ECHO_C" >&6; } if test -n "$enable_report_builder" -a "$enable_report_builder" != "no" && test "$WITH_JAVA" != "no"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } ENABLE_REPORTBUILDER=YES - { $as_echo "$as_me:$LINENO: checking for reportbuilder module" >&5 -$as_echo_n "checking for reportbuilder module... " >&6; } + { echo "$as_me:$LINENO: checking for reportbuilder module" >&5 +echo $ECHO_N "checking for reportbuilder module... $ECHO_C" >&6; } if test -d ./reportbuilder; then - { $as_echo "$as_me:$LINENO: result: OK" >&5 -$as_echo "OK" >&6; } + { echo "$as_me:$LINENO: result: OK" >&5 +echo "${ECHO_T}OK" >&6; } else - { { $as_echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5 -$as_echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;} + { { echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5 +echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;} { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:$LINENO: checking which jfreereport libs to use" >&5 -$as_echo_n "checking which jfreereport libs to use... " >&6; } + { echo "$as_me:$LINENO: checking which jfreereport libs to use" >&5 +echo $ECHO_N "checking which jfreereport libs to use... $ECHO_C" >&6; } if test "$with_system_jfreereport" == "yes"; then SYSTEM_JFREEREPORT=YES - { $as_echo "$as_me:$LINENO: result: external" >&5 -$as_echo "external" >&6; } + { echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6; } if test -z $SAC_JAR; then SAC_JAR=/usr/share/java/sac.jar fi - as_ac_File=`$as_echo "ac_cv_file_$SAC_JAR" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $SAC_JAR" >&5 -$as_echo_n "checking for $SAC_JAR... " >&6; } + as_ac_File=`echo "ac_cv_file_$SAC_JAR" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $SAC_JAR" >&5 +echo $ECHO_N "checking for $SAC_JAR... $ECHO_C" >&6; } if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$SAC_JAR"; then eval "$as_ac_File=yes" @@ -26442,30 +25714,27 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_File'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_File'}'` = yes; then : else - { { $as_echo "$as_me:$LINENO: error: sac.jar not found." >&5 -$as_echo "$as_me: error: sac.jar not found." >&2;} + { { echo "$as_me:$LINENO: error: sac.jar not found." >&5 +echo "$as_me: error: sac.jar not found." >&2;} { (exit 1); exit 1; }; } fi if test -z $LIBXML_JAR; then - { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libxml-1.0.0.jar" >&5 -$as_echo_n "checking for /usr/share/java/libxml-1.0.0.jar... " >&6; } + { echo "$as_me:$LINENO: checking for /usr/share/java/libxml-1.0.0.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libxml-1.0.0.jar... $ECHO_C" >&6; } if test "${ac_cv_file__usr_share_java_libxml_1_0_0_jar+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/libxml-1.0.0.jar"; then ac_cv_file__usr_share_java_libxml_1_0_0_jar=yes @@ -26473,20 +25742,20 @@ else ac_cv_file__usr_share_java_libxml_1_0_0_jar=no fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libxml_1_0_0_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_libxml_1_0_0_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_libxml_1_0_0_jar" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libxml_1_0_0_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libxml_1_0_0_jar" >&6; } +if test $ac_cv_file__usr_share_java_libxml_1_0_0_jar = yes; then LIBXML_JAR=/usr/share/java/libxml-1.0.0.jar else - { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libxml.jar" >&5 -$as_echo_n "checking for /usr/share/java/libxml.jar... " >&6; } + { echo "$as_me:$LINENO: checking for /usr/share/java/libxml.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libxml.jar... $ECHO_C" >&6; } if test "${ac_cv_file__usr_share_java_libxml_jar+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/libxml.jar"; then ac_cv_file__usr_share_java_libxml_jar=yes @@ -26494,13 +25763,13 @@ else ac_cv_file__usr_share_java_libxml_jar=no fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libxml_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_libxml_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_libxml_jar" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libxml_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libxml_jar" >&6; } +if test $ac_cv_file__usr_share_java_libxml_jar = yes; then LIBXML_JAR=/usr/share/java/libxml.jar else - { { $as_echo "$as_me:$LINENO: error: libxml.jar replacement not found." >&5 -$as_echo "$as_me: error: libxml.jar replacement not found." >&2;} + { { echo "$as_me:$LINENO: error: libxml.jar replacement not found." >&5 +echo "$as_me: error: libxml.jar replacement not found." >&2;} { (exit 1); exit 1; }; } fi @@ -26510,15 +25779,15 @@ fi fi else - as_ac_File=`$as_echo "ac_cv_file_$LIBXML_JAR" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $LIBXML_JAR" >&5 -$as_echo_n "checking for $LIBXML_JAR... " >&6; } + as_ac_File=`echo "ac_cv_file_$LIBXML_JAR" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $LIBXML_JAR" >&5 +echo $ECHO_N "checking for $LIBXML_JAR... $ECHO_C" >&6; } if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$LIBXML_JAR"; then eval "$as_ac_File=yes" @@ -26526,31 +25795,28 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_File'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_File'}'` = yes; then : else - { { $as_echo "$as_me:$LINENO: error: libxml.jar not found." >&5 -$as_echo "$as_me: error: libxml.jar not found." >&2;} + { { echo "$as_me:$LINENO: error: libxml.jar not found." >&5 +echo "$as_me: error: libxml.jar not found." >&2;} { (exit 1); exit 1; }; } fi fi if test -z $FLUTE_JAR; then - { $as_echo "$as_me:$LINENO: checking for /usr/share/java/flute-1.3.0.jar" >&5 -$as_echo_n "checking for /usr/share/java/flute-1.3.0.jar... " >&6; } + { echo "$as_me:$LINENO: checking for /usr/share/java/flute-1.3.0.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/flute-1.3.0.jar... $ECHO_C" >&6; } if test "${ac_cv_file__usr_share_java_flute_1_3_0_jar+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/flute-1.3.0.jar"; then ac_cv_file__usr_share_java_flute_1_3_0_jar=yes @@ -26558,20 +25824,20 @@ else ac_cv_file__usr_share_java_flute_1_3_0_jar=no fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flute_1_3_0_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_flute_1_3_0_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_flute_1_3_0_jar" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flute_1_3_0_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_flute_1_3_0_jar" >&6; } +if test $ac_cv_file__usr_share_java_flute_1_3_0_jar = yes; then FLUTE_JAR=/usr/share/java/flute-1.3.0.jar else - { $as_echo "$as_me:$LINENO: checking for /usr/share/java/flute.jar" >&5 -$as_echo_n "checking for /usr/share/java/flute.jar... " >&6; } + { echo "$as_me:$LINENO: checking for /usr/share/java/flute.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/flute.jar... $ECHO_C" >&6; } if test "${ac_cv_file__usr_share_java_flute_jar+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/flute.jar"; then ac_cv_file__usr_share_java_flute_jar=yes @@ -26579,13 +25845,13 @@ else ac_cv_file__usr_share_java_flute_jar=no fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flute_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_flute_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_flute_jar" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flute_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_flute_jar" >&6; } +if test $ac_cv_file__usr_share_java_flute_jar = yes; then FLUTE_JAR=/usr/share/java/flute.jar else - { { $as_echo "$as_me:$LINENO: error: flute-1.3.0.jar replacement not found." >&5 -$as_echo "$as_me: error: flute-1.3.0.jar replacement not found." >&2;} + { { echo "$as_me:$LINENO: error: flute-1.3.0.jar replacement not found." >&5 +echo "$as_me: error: flute-1.3.0.jar replacement not found." >&2;} { (exit 1); exit 1; }; } fi @@ -26595,15 +25861,15 @@ fi fi else - as_ac_File=`$as_echo "ac_cv_file_$FLUTE_JAR" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $FLUTE_JAR" >&5 -$as_echo_n "checking for $FLUTE_JAR... " >&6; } + as_ac_File=`echo "ac_cv_file_$FLUTE_JAR" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $FLUTE_JAR" >&5 +echo $ECHO_N "checking for $FLUTE_JAR... $ECHO_C" >&6; } if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$FLUTE_JAR"; then eval "$as_ac_File=yes" @@ -26611,31 +25877,28 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_File'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_File'}'` = yes; then : else - { { $as_echo "$as_me:$LINENO: error: flute-1.3.0.jar not found." >&5 -$as_echo "$as_me: error: flute-1.3.0.jar not found." >&2;} + { { echo "$as_me:$LINENO: error: flute-1.3.0.jar not found." >&5 +echo "$as_me: error: flute-1.3.0.jar not found." >&2;} { (exit 1); exit 1; }; } fi fi if test -z $JFREEREPORT_JAR; then - { $as_echo "$as_me:$LINENO: checking for /usr/share/java/flow-engine-0.9.2.jar" >&5 -$as_echo_n "checking for /usr/share/java/flow-engine-0.9.2.jar... " >&6; } + { echo "$as_me:$LINENO: checking for /usr/share/java/flow-engine-0.9.2.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/flow-engine-0.9.2.jar... $ECHO_C" >&6; } if test "${ac_cv_file__usr_share_java_flow_engine_0_9_2_jar+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/flow-engine-0.9.2.jar"; then ac_cv_file__usr_share_java_flow_engine_0_9_2_jar=yes @@ -26643,20 +25906,20 @@ else ac_cv_file__usr_share_java_flow_engine_0_9_2_jar=no fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flow_engine_0_9_2_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_flow_engine_0_9_2_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_flow_engine_0_9_2_jar" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flow_engine_0_9_2_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_flow_engine_0_9_2_jar" >&6; } +if test $ac_cv_file__usr_share_java_flow_engine_0_9_2_jar = yes; then JFREEREPORT_JAR=/usr/share/java/flow-engine-0.9.2.jar else - { $as_echo "$as_me:$LINENO: checking for /usr/share/java/flow-engine.jar" >&5 -$as_echo_n "checking for /usr/share/java/flow-engine.jar... " >&6; } + { echo "$as_me:$LINENO: checking for /usr/share/java/flow-engine.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/flow-engine.jar... $ECHO_C" >&6; } if test "${ac_cv_file__usr_share_java_flow_engine_jar+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/flow-engine.jar"; then ac_cv_file__usr_share_java_flow_engine_jar=yes @@ -26664,13 +25927,13 @@ else ac_cv_file__usr_share_java_flow_engine_jar=no fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flow_engine_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_flow_engine_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_flow_engine_jar" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flow_engine_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_flow_engine_jar" >&6; } +if test $ac_cv_file__usr_share_java_flow_engine_jar = yes; then JFREEREPORT_JAR=/usr/share/java/flow-engine.jar else - { { $as_echo "$as_me:$LINENO: error: jfreereport.jar replacement not found." >&5 -$as_echo "$as_me: error: jfreereport.jar replacement not found." >&2;} + { { echo "$as_me:$LINENO: error: jfreereport.jar replacement not found." >&5 +echo "$as_me: error: jfreereport.jar replacement not found." >&2;} { (exit 1); exit 1; }; } fi @@ -26680,15 +25943,15 @@ fi fi else - as_ac_File=`$as_echo "ac_cv_file_$JFREEREPORT_JAR" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $JFREEREPORT_JAR" >&5 -$as_echo_n "checking for $JFREEREPORT_JAR... " >&6; } + as_ac_File=`echo "ac_cv_file_$JFREEREPORT_JAR" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $JFREEREPORT_JAR" >&5 +echo $ECHO_N "checking for $JFREEREPORT_JAR... $ECHO_C" >&6; } if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$JFREEREPORT_JAR"; then eval "$as_ac_File=yes" @@ -26696,31 +25959,28 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_File'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_File'}'` = yes; then : else - { { $as_echo "$as_me:$LINENO: error: jfreereport.jar not found." >&5 -$as_echo "$as_me: error: jfreereport.jar not found." >&2;} + { { echo "$as_me:$LINENO: error: jfreereport.jar not found." >&5 +echo "$as_me: error: jfreereport.jar not found." >&2;} { (exit 1); exit 1; }; } fi fi if test -z $LIBLAYOUT_JAR; then - { $as_echo "$as_me:$LINENO: checking for /usr/share/java/liblayout-0.2.9.jar" >&5 -$as_echo_n "checking for /usr/share/java/liblayout-0.2.9.jar... " >&6; } + { echo "$as_me:$LINENO: checking for /usr/share/java/liblayout-0.2.9.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/liblayout-0.2.9.jar... $ECHO_C" >&6; } if test "${ac_cv_file__usr_share_java_liblayout_0_2_9_jar+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/liblayout-0.2.9.jar"; then ac_cv_file__usr_share_java_liblayout_0_2_9_jar=yes @@ -26728,20 +25988,20 @@ else ac_cv_file__usr_share_java_liblayout_0_2_9_jar=no fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_liblayout_0_2_9_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_liblayout_0_2_9_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_liblayout_0_2_9_jar" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_liblayout_0_2_9_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_liblayout_0_2_9_jar" >&6; } +if test $ac_cv_file__usr_share_java_liblayout_0_2_9_jar = yes; then LIBLAYOUT_JAR=/usr/share/java/liblayout-0.2.9.jar else - { $as_echo "$as_me:$LINENO: checking for /usr/share/java/liblayout.jar" >&5 -$as_echo_n "checking for /usr/share/java/liblayout.jar... " >&6; } + { echo "$as_me:$LINENO: checking for /usr/share/java/liblayout.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/liblayout.jar... $ECHO_C" >&6; } if test "${ac_cv_file__usr_share_java_liblayout_jar+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/liblayout.jar"; then ac_cv_file__usr_share_java_liblayout_jar=yes @@ -26749,13 +26009,13 @@ else ac_cv_file__usr_share_java_liblayout_jar=no fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_liblayout_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_liblayout_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_liblayout_jar" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_liblayout_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_liblayout_jar" >&6; } +if test $ac_cv_file__usr_share_java_liblayout_jar = yes; then LIBLAYOUT_JAR=/usr/share/java/liblayout.jar else - { { $as_echo "$as_me:$LINENO: error: liblayout.jar replacement not found." >&5 -$as_echo "$as_me: error: liblayout.jar replacement not found." >&2;} + { { echo "$as_me:$LINENO: error: liblayout.jar replacement not found." >&5 +echo "$as_me: error: liblayout.jar replacement not found." >&2;} { (exit 1); exit 1; }; } fi @@ -26765,15 +26025,15 @@ fi fi else - as_ac_File=`$as_echo "ac_cv_file_$LIBLAYOUT_JAR" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $LIBLAYOUT_JAR" >&5 -$as_echo_n "checking for $LIBLAYOUT_JAR... " >&6; } + as_ac_File=`echo "ac_cv_file_$LIBLAYOUT_JAR" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $LIBLAYOUT_JAR" >&5 +echo $ECHO_N "checking for $LIBLAYOUT_JAR... $ECHO_C" >&6; } if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$LIBLAYOUT_JAR"; then eval "$as_ac_File=yes" @@ -26781,31 +26041,28 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_File'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_File'}'` = yes; then : else - { { $as_echo "$as_me:$LINENO: error: liblayout.jar not found." >&5 -$as_echo "$as_me: error: liblayout.jar not found." >&2;} + { { echo "$as_me:$LINENO: error: liblayout.jar not found." >&5 +echo "$as_me: error: liblayout.jar not found." >&2;} { (exit 1); exit 1; }; } fi fi if test -z $LIBLOADER_JAR; then - { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libloader-1.0.0.jar" >&5 -$as_echo_n "checking for /usr/share/java/libloader-1.0.0.jar... " >&6; } + { echo "$as_me:$LINENO: checking for /usr/share/java/libloader-1.0.0.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libloader-1.0.0.jar... $ECHO_C" >&6; } if test "${ac_cv_file__usr_share_java_libloader_1_0_0_jar+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/libloader-1.0.0.jar"; then ac_cv_file__usr_share_java_libloader_1_0_0_jar=yes @@ -26813,20 +26070,20 @@ else ac_cv_file__usr_share_java_libloader_1_0_0_jar=no fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libloader_1_0_0_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_libloader_1_0_0_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_libloader_1_0_0_jar" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libloader_1_0_0_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libloader_1_0_0_jar" >&6; } +if test $ac_cv_file__usr_share_java_libloader_1_0_0_jar = yes; then LIBLOADER_JAR=/usr/share/java/libloader-1.0.0.jar else - { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libloader.jar" >&5 -$as_echo_n "checking for /usr/share/java/libloader.jar... " >&6; } + { echo "$as_me:$LINENO: checking for /usr/share/java/libloader.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libloader.jar... $ECHO_C" >&6; } if test "${ac_cv_file__usr_share_java_libloader_jar+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/libloader.jar"; then ac_cv_file__usr_share_java_libloader_jar=yes @@ -26834,13 +26091,13 @@ else ac_cv_file__usr_share_java_libloader_jar=no fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libloader_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_libloader_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_libloader_jar" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libloader_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libloader_jar" >&6; } +if test $ac_cv_file__usr_share_java_libloader_jar = yes; then LIBLOADER_JAR=/usr/share/java/libloader.jar else - { { $as_echo "$as_me:$LINENO: error: libloader.jar replacement not found." >&5 -$as_echo "$as_me: error: libloader.jar replacement not found." >&2;} + { { echo "$as_me:$LINENO: error: libloader.jar replacement not found." >&5 +echo "$as_me: error: libloader.jar replacement not found." >&2;} { (exit 1); exit 1; }; } fi @@ -26850,15 +26107,15 @@ fi fi else - as_ac_File=`$as_echo "ac_cv_file_$LIBLOADER_JAR" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $LIBLOADER_JAR" >&5 -$as_echo_n "checking for $LIBLOADER_JAR... " >&6; } + as_ac_File=`echo "ac_cv_file_$LIBLOADER_JAR" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $LIBLOADER_JAR" >&5 +echo $ECHO_N "checking for $LIBLOADER_JAR... $ECHO_C" >&6; } if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$LIBLOADER_JAR"; then eval "$as_ac_File=yes" @@ -26866,31 +26123,28 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_File'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_File'}'` = yes; then : else - { { $as_echo "$as_me:$LINENO: error: libloader.jar not found." >&5 -$as_echo "$as_me: error: libloader.jar not found." >&2;} + { { echo "$as_me:$LINENO: error: libloader.jar not found." >&5 +echo "$as_me: error: libloader.jar not found." >&2;} { (exit 1); exit 1; }; } fi fi if test -z $LIBFORMULA_JAR; then - { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libformula-0.2.0.jar" >&5 -$as_echo_n "checking for /usr/share/java/libformula-0.2.0.jar... " >&6; } + { echo "$as_me:$LINENO: checking for /usr/share/java/libformula-0.2.0.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libformula-0.2.0.jar... $ECHO_C" >&6; } if test "${ac_cv_file__usr_share_java_libformula_0_2_0_jar+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/libformula-0.2.0.jar"; then ac_cv_file__usr_share_java_libformula_0_2_0_jar=yes @@ -26898,20 +26152,20 @@ else ac_cv_file__usr_share_java_libformula_0_2_0_jar=no fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libformula_0_2_0_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_libformula_0_2_0_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_libformula_0_2_0_jar" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libformula_0_2_0_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libformula_0_2_0_jar" >&6; } +if test $ac_cv_file__usr_share_java_libformula_0_2_0_jar = yes; then LIBFORMULA_JAR=/usr/share/java/libformula-0.2.0.jar else - { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libformula.jar" >&5 -$as_echo_n "checking for /usr/share/java/libformula.jar... " >&6; } + { echo "$as_me:$LINENO: checking for /usr/share/java/libformula.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libformula.jar... $ECHO_C" >&6; } if test "${ac_cv_file__usr_share_java_libformula_jar+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/libformula.jar"; then ac_cv_file__usr_share_java_libformula_jar=yes @@ -26919,13 +26173,13 @@ else ac_cv_file__usr_share_java_libformula_jar=no fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libformula_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_libformula_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_libformula_jar" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libformula_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libformula_jar" >&6; } +if test $ac_cv_file__usr_share_java_libformula_jar = yes; then LIBFORMULA_JAR=/usr/share/java/libformula.jar else - { { $as_echo "$as_me:$LINENO: error: libformula.jar replacement not found." >&5 -$as_echo "$as_me: error: libformula.jar replacement not found." >&2;} + { { echo "$as_me:$LINENO: error: libformula.jar replacement not found." >&5 +echo "$as_me: error: libformula.jar replacement not found." >&2;} { (exit 1); exit 1; }; } fi @@ -26935,15 +26189,15 @@ fi fi else - as_ac_File=`$as_echo "ac_cv_file_$LIBFORMULA_JAR" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $LIBFORMULA_JAR" >&5 -$as_echo_n "checking for $LIBFORMULA_JAR... " >&6; } + as_ac_File=`echo "ac_cv_file_$LIBFORMULA_JAR" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $LIBFORMULA_JAR" >&5 +echo $ECHO_N "checking for $LIBFORMULA_JAR... $ECHO_C" >&6; } if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$LIBFORMULA_JAR"; then eval "$as_ac_File=yes" @@ -26951,31 +26205,28 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_File'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_File'}'` = yes; then : else - { { $as_echo "$as_me:$LINENO: error: libformula.jar not found." >&5 -$as_echo "$as_me: error: libformula.jar not found." >&2;} + { { echo "$as_me:$LINENO: error: libformula.jar not found." >&5 +echo "$as_me: error: libformula.jar not found." >&2;} { (exit 1); exit 1; }; } fi fi if test -z $LIBREPOSITORY_JAR; then - { $as_echo "$as_me:$LINENO: checking for /usr/share/java/librepository-1.0.0.jar" >&5 -$as_echo_n "checking for /usr/share/java/librepository-1.0.0.jar... " >&6; } + { echo "$as_me:$LINENO: checking for /usr/share/java/librepository-1.0.0.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/librepository-1.0.0.jar... $ECHO_C" >&6; } if test "${ac_cv_file__usr_share_java_librepository_1_0_0_jar+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/librepository-1.0.0.jar"; then ac_cv_file__usr_share_java_librepository_1_0_0_jar=yes @@ -26983,20 +26234,20 @@ else ac_cv_file__usr_share_java_librepository_1_0_0_jar=no fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_librepository_1_0_0_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_librepository_1_0_0_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_librepository_1_0_0_jar" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_librepository_1_0_0_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_librepository_1_0_0_jar" >&6; } +if test $ac_cv_file__usr_share_java_librepository_1_0_0_jar = yes; then LIBREPOSITORY_JAR=/usr/share/java/librepository-1.0.0.jar else - { $as_echo "$as_me:$LINENO: checking for /usr/share/java/librepository.jar" >&5 -$as_echo_n "checking for /usr/share/java/librepository.jar... " >&6; } + { echo "$as_me:$LINENO: checking for /usr/share/java/librepository.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/librepository.jar... $ECHO_C" >&6; } if test "${ac_cv_file__usr_share_java_librepository_jar+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/librepository.jar"; then ac_cv_file__usr_share_java_librepository_jar=yes @@ -27004,13 +26255,13 @@ else ac_cv_file__usr_share_java_librepository_jar=no fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_librepository_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_librepository_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_librepository_jar" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_librepository_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_librepository_jar" >&6; } +if test $ac_cv_file__usr_share_java_librepository_jar = yes; then LIBREPOSITORY_JAR=/usr/share/java/librepository.jar else - { { $as_echo "$as_me:$LINENO: error: librepository.jar replacement not found." >&5 -$as_echo "$as_me: error: librepository.jar replacement not found." >&2;} + { { echo "$as_me:$LINENO: error: librepository.jar replacement not found." >&5 +echo "$as_me: error: librepository.jar replacement not found." >&2;} { (exit 1); exit 1; }; } fi @@ -27020,15 +26271,15 @@ fi fi else - as_ac_File=`$as_echo "ac_cv_file_$LIBREPOSITORY_JAR" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $LIBREPOSITORY_JAR" >&5 -$as_echo_n "checking for $LIBREPOSITORY_JAR... " >&6; } + as_ac_File=`echo "ac_cv_file_$LIBREPOSITORY_JAR" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $LIBREPOSITORY_JAR" >&5 +echo $ECHO_N "checking for $LIBREPOSITORY_JAR... $ECHO_C" >&6; } if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$LIBREPOSITORY_JAR"; then eval "$as_ac_File=yes" @@ -27036,31 +26287,28 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_File'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_File'}'` = yes; then : else - { { $as_echo "$as_me:$LINENO: error: librepository.jar not found." >&5 -$as_echo "$as_me: error: librepository.jar not found." >&2;} + { { echo "$as_me:$LINENO: error: librepository.jar not found." >&5 +echo "$as_me: error: librepository.jar not found." >&2;} { (exit 1); exit 1; }; } fi fi if test -z $LIBFONTS_JAR; then - { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libfonts-1.0.0.jar" >&5 -$as_echo_n "checking for /usr/share/java/libfonts-1.0.0.jar... " >&6; } + { echo "$as_me:$LINENO: checking for /usr/share/java/libfonts-1.0.0.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libfonts-1.0.0.jar... $ECHO_C" >&6; } if test "${ac_cv_file__usr_share_java_libfonts_1_0_0_jar+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/libfonts-1.0.0.jar"; then ac_cv_file__usr_share_java_libfonts_1_0_0_jar=yes @@ -27068,20 +26316,20 @@ else ac_cv_file__usr_share_java_libfonts_1_0_0_jar=no fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libfonts_1_0_0_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_libfonts_1_0_0_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_libfonts_1_0_0_jar" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libfonts_1_0_0_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libfonts_1_0_0_jar" >&6; } +if test $ac_cv_file__usr_share_java_libfonts_1_0_0_jar = yes; then LIBFONTS_JAR=/usr/share/java/libfonts-1.0.0.jar else - { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libfonts.jar" >&5 -$as_echo_n "checking for /usr/share/java/libfonts.jar... " >&6; } + { echo "$as_me:$LINENO: checking for /usr/share/java/libfonts.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libfonts.jar... $ECHO_C" >&6; } if test "${ac_cv_file__usr_share_java_libfonts_jar+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/libfonts.jar"; then ac_cv_file__usr_share_java_libfonts_jar=yes @@ -27089,13 +26337,13 @@ else ac_cv_file__usr_share_java_libfonts_jar=no fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libfonts_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_libfonts_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_libfonts_jar" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libfonts_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libfonts_jar" >&6; } +if test $ac_cv_file__usr_share_java_libfonts_jar = yes; then LIBFONTS_JAR=/usr/share/java/libfonts.jar else - { { $as_echo "$as_me:$LINENO: error: libfonts.jar replacement not found." >&5 -$as_echo "$as_me: error: libfonts.jar replacement not found." >&2;} + { { echo "$as_me:$LINENO: error: libfonts.jar replacement not found." >&5 +echo "$as_me: error: libfonts.jar replacement not found." >&2;} { (exit 1); exit 1; }; } fi @@ -27105,15 +26353,15 @@ fi fi else - as_ac_File=`$as_echo "ac_cv_file_$LIBFONTS_JAR" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $LIBFONTS_JAR" >&5 -$as_echo_n "checking for $LIBFONTS_JAR... " >&6; } + as_ac_File=`echo "ac_cv_file_$LIBFONTS_JAR" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $LIBFONTS_JAR" >&5 +echo $ECHO_N "checking for $LIBFONTS_JAR... $ECHO_C" >&6; } if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$LIBFONTS_JAR"; then eval "$as_ac_File=yes" @@ -27121,31 +26369,28 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_File'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_File'}'` = yes; then : else - { { $as_echo "$as_me:$LINENO: error: libfonts.jar not found." >&5 -$as_echo "$as_me: error: libfonts.jar not found." >&2;} + { { echo "$as_me:$LINENO: error: libfonts.jar not found." >&5 +echo "$as_me: error: libfonts.jar not found." >&2;} { (exit 1); exit 1; }; } fi fi if test -z $LIBSERIALIZER_JAR; then - { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libserializer-1.0.0.jar" >&5 -$as_echo_n "checking for /usr/share/java/libserializer-1.0.0.jar... " >&6; } + { echo "$as_me:$LINENO: checking for /usr/share/java/libserializer-1.0.0.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libserializer-1.0.0.jar... $ECHO_C" >&6; } if test "${ac_cv_file__usr_share_java_libserializer_1_0_0_jar+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/libserializer-1.0.0.jar"; then ac_cv_file__usr_share_java_libserializer_1_0_0_jar=yes @@ -27153,20 +26398,20 @@ else ac_cv_file__usr_share_java_libserializer_1_0_0_jar=no fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libserializer_1_0_0_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_libserializer_1_0_0_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_libserializer_1_0_0_jar" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libserializer_1_0_0_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libserializer_1_0_0_jar" >&6; } +if test $ac_cv_file__usr_share_java_libserializer_1_0_0_jar = yes; then LIBSERIALIZER_JAR=/usr/share/java/libserializer-1.0.0.jar else - { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libserializer.jar" >&5 -$as_echo_n "checking for /usr/share/java/libserializer.jar... " >&6; } + { echo "$as_me:$LINENO: checking for /usr/share/java/libserializer.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libserializer.jar... $ECHO_C" >&6; } if test "${ac_cv_file__usr_share_java_libserializer_jar+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/libserializer.jar"; then ac_cv_file__usr_share_java_libserializer_jar=yes @@ -27174,13 +26419,13 @@ else ac_cv_file__usr_share_java_libserializer_jar=no fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libserializer_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_libserializer_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_libserializer_jar" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libserializer_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libserializer_jar" >&6; } +if test $ac_cv_file__usr_share_java_libserializer_jar = yes; then LIBSERIALIZER_JAR=/usr/share/java/libserializer.jar else - { { $as_echo "$as_me:$LINENO: error: libserializer.jar replacement not found." >&5 -$as_echo "$as_me: error: libserializer.jar replacement not found." >&2;} + { { echo "$as_me:$LINENO: error: libserializer.jar replacement not found." >&5 +echo "$as_me: error: libserializer.jar replacement not found." >&2;} { (exit 1); exit 1; }; } fi @@ -27190,15 +26435,15 @@ fi fi else - as_ac_File=`$as_echo "ac_cv_file_$LIBSERIALIZER_JAR" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $LIBSERIALIZER_JAR" >&5 -$as_echo_n "checking for $LIBSERIALIZER_JAR... " >&6; } + as_ac_File=`echo "ac_cv_file_$LIBSERIALIZER_JAR" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $LIBSERIALIZER_JAR" >&5 +echo $ECHO_N "checking for $LIBSERIALIZER_JAR... $ECHO_C" >&6; } if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$LIBSERIALIZER_JAR"; then eval "$as_ac_File=yes" @@ -27206,17 +26451,14 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_File'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_File'}'` = yes; then : else - { { $as_echo "$as_me:$LINENO: error: libserializer.jar not found." >&5 -$as_echo "$as_me: error: libserializer.jar not found." >&2;} + { { echo "$as_me:$LINENO: error: libserializer.jar not found." >&5 +echo "$as_me: error: libserializer.jar not found." >&2;} { (exit 1); exit 1; }; } fi @@ -27224,14 +26466,14 @@ fi if test -z $LIBBASE_JAR; then - { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libbase-1.0.0.jar" >&5 -$as_echo_n "checking for /usr/share/java/libbase-1.0.0.jar... " >&6; } + { echo "$as_me:$LINENO: checking for /usr/share/java/libbase-1.0.0.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libbase-1.0.0.jar... $ECHO_C" >&6; } if test "${ac_cv_file__usr_share_java_libbase_1_0_0_jar+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/libbase-1.0.0.jar"; then ac_cv_file__usr_share_java_libbase_1_0_0_jar=yes @@ -27239,20 +26481,20 @@ else ac_cv_file__usr_share_java_libbase_1_0_0_jar=no fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libbase_1_0_0_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_libbase_1_0_0_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_libbase_1_0_0_jar" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libbase_1_0_0_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libbase_1_0_0_jar" >&6; } +if test $ac_cv_file__usr_share_java_libbase_1_0_0_jar = yes; then LIBBASE_JAR=/usr/share/java/libbase-1.0.0.jar else - { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libbase.jar" >&5 -$as_echo_n "checking for /usr/share/java/libbase.jar... " >&6; } + { echo "$as_me:$LINENO: checking for /usr/share/java/libbase.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libbase.jar... $ECHO_C" >&6; } if test "${ac_cv_file__usr_share_java_libbase_jar+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/libbase.jar"; then ac_cv_file__usr_share_java_libbase_jar=yes @@ -27260,13 +26502,13 @@ else ac_cv_file__usr_share_java_libbase_jar=no fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libbase_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_libbase_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_libbase_jar" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libbase_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libbase_jar" >&6; } +if test $ac_cv_file__usr_share_java_libbase_jar = yes; then LIBBASE_JAR=/usr/share/java/libbase.jar else - { { $as_echo "$as_me:$LINENO: error: libbase.jar replacement not found." >&5 -$as_echo "$as_me: error: libbase.jar replacement not found." >&2;} + { { echo "$as_me:$LINENO: error: libbase.jar replacement not found." >&5 +echo "$as_me: error: libbase.jar replacement not found." >&2;} { (exit 1); exit 1; }; } fi @@ -27276,15 +26518,15 @@ fi fi else - as_ac_File=`$as_echo "ac_cv_file_$LIBBASE_JAR" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $LIBBASE_JAR" >&5 -$as_echo_n "checking for $LIBBASE_JAR... " >&6; } + as_ac_File=`echo "ac_cv_file_$LIBBASE_JAR" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $LIBBASE_JAR" >&5 +echo $ECHO_N "checking for $LIBBASE_JAR... $ECHO_C" >&6; } if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$LIBBASE_JAR"; then eval "$as_ac_File=yes" @@ -27292,33 +26534,30 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_File'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_File'}'` = yes; then : else - { { $as_echo "$as_me:$LINENO: error: libbase.jar not found." >&5 -$as_echo "$as_me: error: libbase.jar not found." >&2;} + { { echo "$as_me:$LINENO: error: libbase.jar not found." >&5 +echo "$as_me: error: libbase.jar not found." >&2;} { (exit 1); exit 1; }; } fi fi else - { $as_echo "$as_me:$LINENO: result: internal" >&5 -$as_echo "internal" >&6; } - { $as_echo "$as_me:$LINENO: checking for jfreereport module" >&5 -$as_echo_n "checking for jfreereport module... " >&6; } + { echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6; } + { echo "$as_me:$LINENO: checking for jfreereport module" >&5 +echo $ECHO_N "checking for jfreereport module... $ECHO_C" >&6; } if test -d ./jfreereport; then - { $as_echo "$as_me:$LINENO: result: OK" >&5 -$as_echo "OK" >&6; } + { echo "$as_me:$LINENO: result: OK" >&5 +echo "${ECHO_T}OK" >&6; } else - { { $as_echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5 -$as_echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;} + { { echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5 +echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;} { (exit 1); exit 1; }; } fi SYSTEM_JFREEREPORT=NO @@ -27326,8 +26565,8 @@ $as_echo "$as_me: error: not existing. get it (did you get the -extensions tarba fi BUILD_TYPE="$BUILD_TYPE REPORTBUILDER" else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } ENABLE_REPORTBUILDER=NO SYSTEM_JFREEREPORT=NO fi @@ -27348,25 +26587,25 @@ fi # this has to be here because both the wiki publisher and the SRB use # commons-logging if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then - { $as_echo "$as_me:$LINENO: checking which Apache commons-* libs to use" >&5 -$as_echo_n "checking which Apache commons-* libs to use... " >&6; } + { echo "$as_me:$LINENO: checking which Apache commons-* libs to use" >&5 +echo $ECHO_N "checking which Apache commons-* libs to use... $ECHO_C" >&6; } if test "$with_system_apache_commons" = "yes"; then SYSTEM_APACHE_COMMONS=YES - { $as_echo "$as_me:$LINENO: result: external" >&5 -$as_echo "external" >&6; } + { echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6; } if test "$ENABLE_MEDIAWIKI" = "YES"; then if test -z "$COMMONS_CODEC_JAR"; then COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar fi - as_ac_File=`$as_echo "ac_cv_file_$COMMONS_CODEC_JAR" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $COMMONS_CODEC_JAR" >&5 -$as_echo_n "checking for $COMMONS_CODEC_JAR... " >&6; } + as_ac_File=`echo "ac_cv_file_$COMMONS_CODEC_JAR" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $COMMONS_CODEC_JAR" >&5 +echo $ECHO_N "checking for $COMMONS_CODEC_JAR... $ECHO_C" >&6; } if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$COMMONS_CODEC_JAR"; then eval "$as_ac_File=yes" @@ -27374,32 +26613,29 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_File'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_File'}'` = yes; then : else - { { $as_echo "$as_me:$LINENO: error: commons-codec.jar not found." >&5 -$as_echo "$as_me: error: commons-codec.jar not found." >&2;} + { { echo "$as_me:$LINENO: error: commons-codec.jar not found." >&5 +echo "$as_me: error: commons-codec.jar not found." >&2;} { (exit 1); exit 1; }; } fi if test -z "$COMMONS_LANG_JAR"; then COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.3.jar fi - as_ac_File=`$as_echo "ac_cv_file_$COMMONS_LANG_JAR" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $COMMONS_LANG_JAR" >&5 -$as_echo_n "checking for $COMMONS_LANG_JAR... " >&6; } + as_ac_File=`echo "ac_cv_file_$COMMONS_LANG_JAR" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $COMMONS_LANG_JAR" >&5 +echo $ECHO_N "checking for $COMMONS_LANG_JAR... $ECHO_C" >&6; } if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$COMMONS_LANG_JAR"; then eval "$as_ac_File=yes" @@ -27407,32 +26643,29 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_File'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_File'}'` = yes; then : else - { { $as_echo "$as_me:$LINENO: error: commons-lang.jar not found." >&5 -$as_echo "$as_me: error: commons-lang.jar not found." >&2;} + { { echo "$as_me:$LINENO: error: commons-lang.jar not found." >&5 +echo "$as_me: error: commons-lang.jar not found." >&2;} { (exit 1); exit 1; }; } fi if test -z "$COMMONS_HTTPCLIENT_JAR"; then COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient-3.1.jar fi - as_ac_File=`$as_echo "ac_cv_file_$COMMONS_HTTPCLIENT_JAR" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $COMMONS_HTTPCLIENT_JAR" >&5 -$as_echo_n "checking for $COMMONS_HTTPCLIENT_JAR... " >&6; } + as_ac_File=`echo "ac_cv_file_$COMMONS_HTTPCLIENT_JAR" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $COMMONS_HTTPCLIENT_JAR" >&5 +echo $ECHO_N "checking for $COMMONS_HTTPCLIENT_JAR... $ECHO_C" >&6; } if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$COMMONS_HTTPCLIENT_JAR"; then eval "$as_ac_File=yes" @@ -27440,17 +26673,14 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_File'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_File'}'` = yes; then : else - { { $as_echo "$as_me:$LINENO: error: commons-httpclient.jar not found." >&5 -$as_echo "$as_me: error: commons-httpclient.jar not found." >&2;} + { { echo "$as_me:$LINENO: error: commons-httpclient.jar not found." >&5 +echo "$as_me: error: commons-httpclient.jar not found." >&2;} { (exit 1); exit 1; }; } fi @@ -27459,15 +26689,15 @@ fi if test -z "$COMMONS_LOGGING_JAR"; then COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar fi - as_ac_File=`$as_echo "ac_cv_file_$COMMONS_LOGGING_JAR" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $COMMONS_LOGGING_JAR" >&5 -$as_echo_n "checking for $COMMONS_LOGGING_JAR... " >&6; } + as_ac_File=`echo "ac_cv_file_$COMMONS_LOGGING_JAR" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $COMMONS_LOGGING_JAR" >&5 +echo $ECHO_N "checking for $COMMONS_LOGGING_JAR... $ECHO_C" >&6; } if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$COMMONS_LOGGING_JAR"; then eval "$as_ac_File=yes" @@ -27475,25 +26705,22 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_File'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_File'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_File'}'` = yes; then : else - { { $as_echo "$as_me:$LINENO: error: commons-logging.jar not found." >&5 -$as_echo "$as_me: error: commons-logging.jar not found." >&2;} + { { echo "$as_me:$LINENO: error: commons-logging.jar not found." >&5 +echo "$as_me: error: commons-logging.jar not found." >&2;} { (exit 1); exit 1; }; } fi fi else - { $as_echo "$as_me:$LINENO: result: internal" >&5 -$as_echo "internal" >&6; } + { echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6; } SYSTEM_APACHE_COMMONS=NO BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT" fi @@ -27545,8 +26772,8 @@ if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE" ; then kde_test_include="ksharedptr.h" kde_test_library="libkdeui.so" - { $as_echo "$as_me:$LINENO: checking for Qt headers" >&5 -$as_echo_n "checking for Qt headers... " >&6; } + { echo "$as_me:$LINENO: checking for Qt headers" >&5 +echo $ECHO_N "checking for Qt headers... $ECHO_C" >&6; } qt_incdir="no" for kde_check in $qt_incdirs ; do if test -r "$kde_check/$qt_test_include" ; then @@ -27554,18 +26781,18 @@ $as_echo_n "checking for Qt headers... " >&6; } break fi done - { $as_echo "$as_me:$LINENO: result: $qt_incdir" >&5 -$as_echo "$qt_incdir" >&6; } + { echo "$as_me:$LINENO: result: $qt_incdir" >&5 +echo "${ECHO_T}$qt_incdir" >&6; } if test "x$qt_incdir" = "xno" ; then - { { $as_echo "$as_me:$LINENO: error: Qt headers not found. Please specify the root of + { { echo "$as_me:$LINENO: error: Qt headers not found. Please specify the root of your Qt installation by exporting QTDIR before running \"configure\"." >&5 -$as_echo "$as_me: error: Qt headers not found. Please specify the root of +echo "$as_me: error: Qt headers not found. Please specify the root of your Qt installation by exporting QTDIR before running \"configure\"." >&2;} { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:$LINENO: checking for Qt libraries" >&5 -$as_echo_n "checking for Qt libraries... " >&6; } + { echo "$as_me:$LINENO: checking for Qt libraries" >&5 +echo $ECHO_N "checking for Qt libraries... $ECHO_C" >&6; } qt_libdir="no" for qt_check in $qt_libdirs ; do if test -r "$qt_check/$qt_test_library" ; then @@ -27573,22 +26800,22 @@ $as_echo_n "checking for Qt libraries... " >&6; } break fi done - { $as_echo "$as_me:$LINENO: result: $qt_libdir" >&5 -$as_echo "$qt_libdir" >&6; } + { echo "$as_me:$LINENO: result: $qt_libdir" >&5 +echo "${ECHO_T}$qt_libdir" >&6; } if test "x$qt_libdir" = "xno" ; then - { { $as_echo "$as_me:$LINENO: error: Qt libraries not found. Please specify the root of + { { echo "$as_me:$LINENO: error: Qt libraries not found. Please specify the root of your Qt installation by exporting QTDIR before running \"configure\"." >&5 -$as_echo "$as_me: error: Qt libraries not found. Please specify the root of +echo "$as_me: error: Qt libraries not found. Please specify the root of your Qt installation by exporting QTDIR before running \"configure\"." >&2;} { (exit 1); exit 1; }; } fi # Extract the first word of "moc", so it can be a program name with args. set dummy moc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_MOC+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $MOC in [\\/]* | ?:[\\/]*) @@ -27604,7 +26831,7 @@ do 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_path_MOC="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -27617,24 +26844,24 @@ esac fi MOC=$ac_cv_path_MOC if test -n "$MOC"; then - { $as_echo "$as_me:$LINENO: result: $MOC" >&5 -$as_echo "$MOC" >&6; } + { echo "$as_me:$LINENO: result: $MOC" >&5 +echo "${ECHO_T}$MOC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi if test "$MOC" = "no" ; then - { { $as_echo "$as_me:$LINENO: error: Qt Meta Object Compiler not found. Please specify + { { echo "$as_me:$LINENO: error: Qt Meta Object Compiler not found. Please specify the root of your Qt installation by exporting QTDIR before running \"configure\"." >&5 -$as_echo "$as_me: error: Qt Meta Object Compiler not found. Please specify +echo "$as_me: error: Qt Meta Object Compiler not found. Please specify the root of your Qt installation by exporting QTDIR before running \"configure\"." >&2;} { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:$LINENO: checking for KDE headers" >&5 -$as_echo_n "checking for KDE headers... " >&6; } + { echo "$as_me:$LINENO: checking for KDE headers" >&5 +echo $ECHO_N "checking for KDE headers... $ECHO_C" >&6; } kde_incdir="no" for kde_check in $kde_incdirs ; do if test -r "$kde_check/$kde_test_include" ; then @@ -27642,18 +26869,18 @@ $as_echo_n "checking for KDE headers... " >&6; } break fi done - { $as_echo "$as_me:$LINENO: result: $kde_incdir" >&5 -$as_echo "$kde_incdir" >&6; } + { echo "$as_me:$LINENO: result: $kde_incdir" >&5 +echo "${ECHO_T}$kde_incdir" >&6; } if test "x$kde_incdir" = "xno" ; then - { { $as_echo "$as_me:$LINENO: error: KDE headers not found. Please specify the root of + { { echo "$as_me:$LINENO: error: KDE headers not found. Please specify the root of your KDE installation by exporting KDEDIR before running \"configure\"." >&5 -$as_echo "$as_me: error: KDE headers not found. Please specify the root of +echo "$as_me: error: KDE headers not found. Please specify the root of your KDE installation by exporting KDEDIR before running \"configure\"." >&2;} { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:$LINENO: checking for KDE libraries" >&5 -$as_echo_n "checking for KDE libraries... " >&6; } + { echo "$as_me:$LINENO: checking for KDE libraries" >&5 +echo $ECHO_N "checking for KDE libraries... $ECHO_C" >&6; } kde_libdir="no" for kde_check in $kde_libdirs ; do if test -r "$kde_check/$kde_test_library" ; then @@ -27661,12 +26888,12 @@ $as_echo_n "checking for KDE libraries... " >&6; } break fi done - { $as_echo "$as_me:$LINENO: result: $kde_libdir" >&5 -$as_echo "$kde_libdir" >&6; } + { echo "$as_me:$LINENO: result: $kde_libdir" >&5 +echo "${ECHO_T}$kde_libdir" >&6; } if test "x$kde_libdir" = "xno" ; then - { { $as_echo "$as_me:$LINENO: error: KDE libraries not found. Please specify the root of + { { echo "$as_me:$LINENO: error: KDE libraries not found. Please specify the root of your KDE installation by exporting KDEDIR before running \"configure\"." >&5 -$as_echo "$as_me: error: KDE libraries not found. Please specify the root of +echo "$as_me: error: KDE libraries not found. Please specify the root of your KDE installation by exporting KDEDIR before running \"configure\"." >&2;} { (exit 1); exit 1; }; } fi @@ -27678,34 +26905,34 @@ fi -{ $as_echo "$as_me:$LINENO: checking whether to enable the lockdown pieces" >&5 -$as_echo_n "checking whether to enable the lockdown pieces... " >&6; } +{ echo "$as_me:$LINENO: checking whether to enable the lockdown pieces" >&5 +echo $ECHO_N "checking whether to enable the lockdown pieces... $ECHO_C" >&6; } ENABLE_LOCKDOWN="" if test -n "$enable_lockdown" && test "$enable_lockdown" != "no"; then ENABLE_LOCKDOWN=YES - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -{ $as_echo "$as_me:$LINENO: checking whether to enable evolution 2 support" >&5 -$as_echo_n "checking whether to enable evolution 2 support... " >&6; } +{ echo "$as_me:$LINENO: checking whether to enable evolution 2 support" >&5 +echo $ECHO_N "checking whether to enable evolution 2 support... $ECHO_C" >&6; } if test "$enable_evolution2" = "yes" -o "$enable_evolution2" = "TRUE"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=no if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -27720,7 +26947,7 @@ do 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -27733,11 +26960,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -27751,25 +26978,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:$LINENO: checking for gobject-2.0" >&5 -$as_echo_n "checking for gobject-2.0... " >&6; } + { echo "$as_me:$LINENO: checking for gobject-2.0" >&5 +echo $ECHO_N "checking for gobject-2.0... $ECHO_C" >&6; } if $PKG_CONFIG --exists "gobject-2.0" ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=yes - { $as_echo "$as_me:$LINENO: checking GOBJECT_CFLAGS" >&5 -$as_echo_n "checking GOBJECT_CFLAGS... " >&6; } + { echo "$as_me:$LINENO: checking GOBJECT_CFLAGS" >&5 +echo $ECHO_N "checking GOBJECT_CFLAGS... $ECHO_C" >&6; } GOBJECT_CFLAGS=`$PKG_CONFIG --cflags "gobject-2.0"` - { $as_echo "$as_me:$LINENO: result: $GOBJECT_CFLAGS" >&5 -$as_echo "$GOBJECT_CFLAGS" >&6; } + { echo "$as_me:$LINENO: result: $GOBJECT_CFLAGS" >&5 +echo "${ECHO_T}$GOBJECT_CFLAGS" >&6; } - { $as_echo "$as_me:$LINENO: checking GOBJECT_LIBS" >&5 -$as_echo_n "checking GOBJECT_LIBS... " >&6; } + { echo "$as_me:$LINENO: checking GOBJECT_LIBS" >&5 +echo $ECHO_N "checking GOBJECT_LIBS... $ECHO_C" >&6; } GOBJECT_LIBS=`$PKG_CONFIG --libs "gobject-2.0"` - { $as_echo "$as_me:$LINENO: result: $GOBJECT_LIBS" >&5 -$as_echo "$GOBJECT_LIBS" >&6; } + { echo "$as_me:$LINENO: result: $GOBJECT_LIBS" >&5 +echo "${ECHO_T}$GOBJECT_LIBS" >&6; } else GOBJECT_CFLAGS="" GOBJECT_LIBS="" @@ -27790,26 +27017,26 @@ $as_echo "$GOBJECT_LIBS" >&6; } if test $succeeded = yes; then : else - { { $as_echo "$as_me:$LINENO: error: Library requirements (gobject-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -$as_echo "$as_me: error: Library requirements (gobject-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { { echo "$as_me:$LINENO: error: Library requirements (gobject-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (gobject-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi ENABLE_EVOAB2="TRUE" else ENABLE_EVOAB2="" - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -{ $as_echo "$as_me:$LINENO: checking whether to enable KDE address book support" >&5 -$as_echo_n "checking whether to enable KDE address book support... " >&6; } +{ echo "$as_me:$LINENO: checking whether to enable KDE address book support" >&5 +echo $ECHO_N "checking whether to enable KDE address book support... $ECHO_C" >&6; } if test "$enable_kdeab" = "yes" && test "$enable_kde" = "yes"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -27818,16 +27045,14 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu save_CXXFLAGS=$CXXFLAGS CXXFLAGS="$CXXFLAGS $KDE_CFLAGS" - { $as_echo "$as_me:$LINENO: checking whether KDE is between 3.2 and 3.6" >&5 -$as_echo_n "checking whether KDE is between 3.2 and 3.6... " >&6; } + { echo "$as_me:$LINENO: checking whether KDE is between 3.2 and 3.6" >&5 +echo $ECHO_N "checking whether KDE is between 3.2 and 3.6... $ECHO_C" >&6; } if test "$cross_compiling" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot run test program while cross compiling +echo "$as_me: error: cannot run test program while cross compiling See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } + { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -27850,35 +27075,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' { (case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { $as_echo "$as_me:$LINENO: error: KDE version too old or too recent, please use another version of KDE or disable KDE address book support" >&5 -$as_echo "$as_me: error: KDE version too old or too recent, please use another version of KDE or disable KDE address book support" >&2;} +{ { echo "$as_me:$LINENO: error: KDE version too old or too recent, please use another version of KDE or disable KDE address book support" >&5 +echo "$as_me: error: KDE version too old or too recent, please use another version of KDE or disable KDE address book support" >&2;} { (exit 1); exit 1; }; } fi -rm -rf conftest.dSYM rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi @@ -27892,54 +27114,54 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ENABLE_KAB=TRUE else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } ENABLE_KAB= fi -{ $as_echo "$as_me:$LINENO: checking whether to include FontOOo" >&5 -$as_echo_n "checking whether to include FontOOo... " >&6; } +{ echo "$as_me:$LINENO: checking whether to include FontOOo" >&5 +echo $ECHO_N "checking whether to include FontOOo... $ECHO_C" >&6; } if test -n "$enable_fontooo"; then if test "$enable_fontooo" = "no"; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } WITH_FONTOOO=NO SCPDEFS="$SCPDEFS -DWITHOUT_FONTOOO" else - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } WITH_FONTOOO=YES BUILD_TYPE="$BUILD_TYPE MSFONTEXTRACT" fi else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } WITH_FONTOOO=NO SCPDEFS="$SCPDEFS -DWITHOUT_FONTOOO" fi if test "$WITH_FONTOOO" = "YES"; then - { $as_echo "$as_me:$LINENO: checking whether to use system libmspack" >&5 -$as_echo_n "checking whether to use system libmspack... " >&6; } + { echo "$as_me:$LINENO: checking whether to use system libmspack" >&5 +echo $ECHO_N "checking whether to use system libmspack... $ECHO_C" >&6; } if test -n "$with_system_mspack" -o -n "$with_system_libs" && \ test "$with_system_mspack" != "no"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } SYSTEM_MSPACK=YES if test "${ac_cv_header_mspack_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for mspack.h" >&5 -$as_echo_n "checking for mspack.h... " >&6; } + { echo "$as_me:$LINENO: checking for mspack.h" >&5 +echo $ECHO_N "checking for mspack.h... $ECHO_C" >&6; } if test "${ac_cv_header_mspack_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_mspack_h" >&5 -$as_echo "$ac_cv_header_mspack_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_mspack_h" >&5 +echo "${ECHO_T}$ac_cv_header_mspack_h" >&6; } else # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking mspack.h usability" >&5 -$as_echo_n "checking mspack.h usability... " >&6; } +{ echo "$as_me:$LINENO: checking mspack.h usability" >&5 +echo $ECHO_N "checking mspack.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -27955,33 +27177,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_header_compiler=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ $as_echo "$as_me:$LINENO: checking mspack.h presence" >&5 -$as_echo_n "checking mspack.h presence... " >&6; } +{ echo "$as_me:$LINENO: checking mspack.h presence" >&5 +echo $ECHO_N "checking mspack.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -27995,80 +27216,79 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: mspack.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: mspack.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: mspack.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: mspack.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: mspack.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: mspack.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: mspack.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: mspack.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: mspack.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: mspack.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: mspack.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: mspack.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: mspack.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: mspack.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: mspack.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: mspack.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: mspack.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: mspack.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: mspack.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: mspack.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: mspack.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: mspack.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: mspack.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: mspack.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: mspack.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: mspack.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: mspack.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: mspack.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: mspack.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: mspack.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: mspack.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: mspack.h: in the future, the compiler will take precedence" >&2;} ;; esac -{ $as_echo "$as_me:$LINENO: checking for mspack.h" >&5 -$as_echo_n "checking for mspack.h... " >&6; } +{ echo "$as_me:$LINENO: checking for mspack.h" >&5 +echo $ECHO_N "checking for mspack.h... $ECHO_C" >&6; } if test "${ac_cv_header_mspack_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_mspack_h=$ac_header_preproc fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_mspack_h" >&5 -$as_echo "$ac_cv_header_mspack_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_mspack_h" >&5 +echo "${ECHO_T}$ac_cv_header_mspack_h" >&6; } fi -if test "x$ac_cv_header_mspack_h" = x""yes; then +if test $ac_cv_header_mspack_h = yes; then : else - { { $as_echo "$as_me:$LINENO: error: mspack.h not found, install libmspack" >&5 -$as_echo "$as_me: error: mspack.h not found, install libmspack" >&2;} + { { echo "$as_me:$LINENO: error: mspack.h not found, install libmspack" >&5 +echo "$as_me: error: mspack.h not found, install libmspack" >&2;} { (exit 1); exit 1; }; } fi -{ $as_echo "$as_me:$LINENO: checking for mspack_create_cab_decompressor in -lmspack" >&5 -$as_echo_n "checking for mspack_create_cab_decompressor in -lmspack... " >&6; } +{ echo "$as_me:$LINENO: checking for mspack_create_cab_decompressor in -lmspack" >&5 +echo $ECHO_N "checking for mspack_create_cab_decompressor in -lmspack... $ECHO_C" >&6; } if test "${ac_cv_lib_mspack_mspack_create_cab_decompressor+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lmspack $LIBS" @@ -28100,37 +27320,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_mspack_mspack_create_cab_decompressor=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_mspack_mspack_create_cab_decompressor=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mspack_mspack_create_cab_decompressor" >&5 -$as_echo "$ac_cv_lib_mspack_mspack_create_cab_decompressor" >&6; } -if test "x$ac_cv_lib_mspack_mspack_create_cab_decompressor" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_mspack_mspack_create_cab_decompressor" >&5 +echo "${ECHO_T}$ac_cv_lib_mspack_mspack_create_cab_decompressor" >&6; } +if test $ac_cv_lib_mspack_mspack_create_cab_decompressor = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBMSPACK 1 _ACEOF @@ -28138,73 +27354,73 @@ _ACEOF LIBS="-lmspack $LIBS" else - { { $as_echo "$as_me:$LINENO: error: libmspack not installed or functional" >&5 -$as_echo "$as_me: error: libmspack not installed or functional" >&2;} + { { echo "$as_me:$LINENO: error: libmspack not installed or functional" >&5 +echo "$as_me: error: libmspack not installed or functional" >&2;} { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } SYSTEM_MSPACK=NO fi fi -{ $as_echo "$as_me:$LINENO: checking whether to include MathMLDTD" >&5 -$as_echo_n "checking whether to include MathMLDTD... " >&6; } +{ echo "$as_me:$LINENO: checking whether to include MathMLDTD" >&5 +echo $ECHO_N "checking whether to include MathMLDTD... $ECHO_C" >&6; } if test -n "$enable_mathmldtd"; then if test "$enable_mathmldtd" = "no"; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } SCPDEFS="$SCPDEFS -DWITHOUT_MATHMLDTD" else - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } BUILD_TYPE="$BUILD_TYPE MATHMLDTD" fi else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } SCPDEFS="$SCPDEFS -DWITHOUT_MATHMLDTD" fi -{ $as_echo "$as_me:$LINENO: checking whether to include Bitstream Vera fonts" >&5 -$as_echo_n "checking whether to include Bitstream Vera fonts... " >&6; } +{ echo "$as_me:$LINENO: checking whether to include Bitstream Vera fonts" >&5 +echo $ECHO_N "checking whether to include Bitstream Vera fonts... $ECHO_C" >&6; } if test "$with_fonts" != "no" ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } WITH_FONTS=YES BUILD_TYPE="$BUILD_TYPE BITSTREAM_VERA_FONTS" else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } WITH_FONTS=NO SCPDEFS="$SCPDEFS -DWITHOUT_FONTS" fi -{ $as_echo "$as_me:$LINENO: checking whether to include PPDs" >&5 -$as_echo_n "checking whether to include PPDs... " >&6; } +{ echo "$as_me:$LINENO: checking whether to include PPDs" >&5 +echo $ECHO_N "checking whether to include PPDs... $ECHO_C" >&6; } if test "$with_ppds" != "no"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } WITHOUT_PPDS=YES SCPDEFS="$SCPDEFS -DWITHOUT_PPDS" fi -{ $as_echo "$as_me:$LINENO: checking whether to include AFMs" >&5 -$as_echo_n "checking whether to include AFMs... " >&6; } +{ echo "$as_me:$LINENO: checking whether to include AFMs" >&5 +echo $ECHO_N "checking whether to include AFMs... $ECHO_C" >&6; } if test "$with_afms" != "no"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } WITHOUT_AFMS=YES SCPDEFS="$SCPDEFS -DWITHOUT_AFMS" fi @@ -28212,13 +27428,13 @@ fi -{ $as_echo "$as_me:$LINENO: checking whether and how to use Xinerama" >&5 -$as_echo_n "checking whether and how to use Xinerama... " >&6; } +{ echo "$as_me:$LINENO: checking whether and how to use Xinerama" >&5 +echo $ECHO_N "checking whether and how to use Xinerama... $ECHO_C" >&6; } if test "$_os" = "Darwin"; then USE_XINERAMA=YES XINERAMA_LINK=dynamic - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } elif test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then if test -e "$XLIB/libXinerama.so" -a -e "$XLIB/libXinerama.a"; then # we have both versions, let the user decide but use the dynamic one @@ -28248,20 +27464,20 @@ elif test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then XINERAMA_LINK=none fi if test "$USE_XINERAMA" = "YES"; then - { $as_echo "$as_me:$LINENO: result: yes, with $XINERAMA_LINK linking" >&5 -$as_echo "yes, with $XINERAMA_LINK linking" >&6; } + { echo "$as_me:$LINENO: result: yes, with $XINERAMA_LINK linking" >&5 +echo "${ECHO_T}yes, with $XINERAMA_LINK linking" >&6; } if test "${ac_cv_header_X11_extensions_Xinerama_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5 -$as_echo_n "checking for X11/extensions/Xinerama.h... " >&6; } + { echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5 +echo $ECHO_N "checking for X11/extensions/Xinerama.h... $ECHO_C" >&6; } if test "${ac_cv_header_X11_extensions_Xinerama_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5 -$as_echo "$ac_cv_header_X11_extensions_Xinerama_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_Xinerama_h" >&6; } else # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking X11/extensions/Xinerama.h usability" >&5 -$as_echo_n "checking X11/extensions/Xinerama.h usability... " >&6; } +{ echo "$as_me:$LINENO: checking X11/extensions/Xinerama.h usability" >&5 +echo $ECHO_N "checking X11/extensions/Xinerama.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -28277,33 +27493,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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_objext; then ac_header_compiler=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ $as_echo "$as_me:$LINENO: checking X11/extensions/Xinerama.h presence" >&5 -$as_echo_n "checking X11/extensions/Xinerama.h presence... " >&6; } +{ echo "$as_me:$LINENO: checking X11/extensions/Xinerama.h presence" >&5 +echo $ECHO_N "checking X11/extensions/Xinerama.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -28317,71 +27532,70 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: X11/extensions/Xinerama.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: X11/extensions/Xinerama.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: X11/extensions/Xinerama.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: X11/extensions/Xinerama.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: X11/extensions/Xinerama.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: X11/extensions/Xinerama.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: X11/extensions/Xinerama.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: X11/extensions/Xinerama.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: X11/extensions/Xinerama.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: X11/extensions/Xinerama.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: X11/extensions/Xinerama.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: X11/extensions/Xinerama.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: X11/extensions/Xinerama.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: X11/extensions/Xinerama.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: X11/extensions/Xinerama.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: X11/extensions/Xinerama.h: in the future, the compiler will take precedence" >&2;} ;; esac -{ $as_echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5 -$as_echo_n "checking for X11/extensions/Xinerama.h... " >&6; } +{ echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5 +echo $ECHO_N "checking for X11/extensions/Xinerama.h... $ECHO_C" >&6; } if test "${ac_cv_header_X11_extensions_Xinerama_h+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_X11_extensions_Xinerama_h=$ac_header_preproc fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5 -$as_echo "$ac_cv_header_X11_extensions_Xinerama_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_Xinerama_h" >&6; } fi -if test "x$ac_cv_header_X11_extensions_Xinerama_h" = x""yes; then +if test $ac_cv_header_X11_extensions_Xinerama_h = yes; then : else - { { $as_echo "$as_me:$LINENO: error: Xinerama header not found." >&5 -$as_echo "$as_me: error: Xinerama header not found." >&2;} + { { echo "$as_me:$LINENO: error: Xinerama header not found." >&5 +echo "$as_me: error: Xinerama header not found." >&2;} { (exit 1); exit 1; }; } fi @@ -28394,10 +27608,10 @@ fi XINERAMA_EXTRA_LIBS="$XINERAMA_EXTRA_LIBS -ldl" fi -{ $as_echo "$as_me:$LINENO: checking for XineramaIsActive in -lXinerama" >&5 -$as_echo_n "checking for XineramaIsActive in -lXinerama... " >&6; } +{ echo "$as_me:$LINENO: checking for XineramaIsActive in -lXinerama" >&5 +echo $ECHO_N "checking for XineramaIsActive in -lXinerama... $ECHO_C" >&6; } if test "${ac_cv_lib_Xinerama_XineramaIsActive+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lXinerama $XINERAMA_EXTRA_LIBS $LIBS" @@ -28429,37 +27643,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&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 && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_Xinerama_XineramaIsActive=yes else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_Xinerama_XineramaIsActive=no fi -rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaIsActive" >&5 -$as_echo "$ac_cv_lib_Xinerama_XineramaIsActive" >&6; } -if test "x$ac_cv_lib_Xinerama_XineramaIsActive" = x""yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaIsActive" >&5 +echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaIsActive" >&6; } +if test $ac_cv_lib_Xinerama_XineramaIsActive = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBXINERAMA 1 _ACEOF @@ -28467,18 +27677,18 @@ _ACEOF LIBS="-lXinerama $LIBS" else - { { $as_echo "$as_me:$LINENO: error: Xinerama not functional?" >&5 -$as_echo "$as_me: error: Xinerama not functional?" >&2;} + { { echo "$as_me:$LINENO: error: Xinerama not functional?" >&5 +echo "$as_me: error: Xinerama not functional?" >&2;} { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:$LINENO: result: no, libXinerama not found or wrong architecture." >&5 -$as_echo "no, libXinerama not found or wrong architecture." >&6; } + { echo "$as_me:$LINENO: result: no, libXinerama not found or wrong architecture." >&5 +echo "${ECHO_T}no, libXinerama not found or wrong architecture." >&6; } fi else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -28492,10 +27702,10 @@ if test -z "$with_ant_home"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_ANT+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $ANT in [\\/]* | ?:[\\/]*) @@ -28510,7 +27720,7 @@ do 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_path_ANT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -28522,11 +27732,11 @@ esac fi ANT=$ac_cv_path_ANT if test -n "$ANT"; then - { $as_echo "$as_me:$LINENO: result: $ANT" >&5 -$as_echo "$ANT" >&6; } + { echo "$as_me:$LINENO: result: $ANT" >&5 +echo "${ECHO_T}$ANT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -28541,10 +27751,10 @@ else do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_ANT+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $ANT in [\\/]* | ?:[\\/]*) @@ -28560,7 +27770,7 @@ do 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_path_ANT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -28572,11 +27782,11 @@ esac fi ANT=$ac_cv_path_ANT if test -n "$ANT"; then - { $as_echo "$as_me:$LINENO: result: $ANT" >&5 -$as_echo "$ANT" >&6; } + { echo "$as_me:$LINENO: result: $ANT" >&5 +echo "${ECHO_T}$ANT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -28588,8 +27798,8 @@ done fi if test -z "$ANT"; then - { { $as_echo "$as_me:$LINENO: error: Ant not found - Make sure it's in the path or use --with-ant-home" >&5 -$as_echo "$as_me: error: Ant not found - Make sure it's in the path or use --with-ant-home" >&2;} + { { echo "$as_me:$LINENO: error: Ant not found - Make sure it's in the path or use --with-ant-home" >&5 +echo "$as_me: error: Ant not found - Make sure it's in the path or use --with-ant-home" >&2;} { (exit 1); exit 1; }; } else # resolve relative or absolute symlink @@ -28615,8 +27825,8 @@ else fi ant_minminor1=`echo $ant_minver | cut -d"." -f2` - { $as_echo "$as_me:$LINENO: checking whether ant is >= $ant_minver" >&5 -$as_echo_n "checking whether ant is >= $ant_minver... " >&6; } + { echo "$as_me:$LINENO: checking whether ant is >= $ant_minver" >&5 +echo $ECHO_N "checking whether ant is >= $ant_minver... $ECHO_C" >&6; } ant_version=`$ANT -version | $AWK '{ print $4; }'` ant_version_major=`echo $ant_version | cut -d. -f1` ant_version_minor=`echo $ant_version | cut -d. -f2` @@ -28624,18 +27834,18 @@ echo "configure: ant_version $ant_version " >&5 echo "configure: ant_version_major $ant_version_major " >&5 echo "configure: ant_version_minor $ant_version_minor " >&5 if test "$ant_version_major" -ge "2"; then - { $as_echo "$as_me:$LINENO: result: yes, $ant_version" >&5 -$as_echo "yes, $ant_version" >&6; } + { echo "$as_me:$LINENO: result: yes, $ant_version" >&5 +echo "${ECHO_T}yes, $ant_version" >&6; } elif test "$ant_version_major" = "1" && test "$ant_version_minor" -ge "$ant_minminor1"; then - { $as_echo "$as_me:$LINENO: result: yes, $ant_version" >&5 -$as_echo "yes, $ant_version" >&6; } + { echo "$as_me:$LINENO: result: yes, $ant_version" >&5 +echo "${ECHO_T}yes, $ant_version" >&6; } else - { { $as_echo "$as_me:$LINENO: error: no, you need at least ant >= $ant_minver" >&5 -$as_echo "$as_me: error: no, you need at least ant >= $ant_minver" >&2;} + { { echo "$as_me:$LINENO: error: no, you need at least ant >= $ant_minver" >&5 +echo "$as_me: error: no, you need at least ant >= $ant_minver" >&2;} { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:$LINENO: checking if $ANT works" >&5 -$as_echo_n "checking if $ANT works... " >&6; } + { echo "$as_me:$LINENO: checking if $ANT works" >&5 +echo $ECHO_N "checking if $ANT works... $ECHO_C" >&6; } cat > conftest.java << EOF public class conftest { int testmethod(int a, int b) { @@ -28662,11 +27872,11 @@ EOF { (eval echo "$as_me:$LINENO: \"$ant_cmd\"") >&5 (eval $ant_cmd) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } if test $? = 0 && test -f ./conftest.class ; then - { $as_echo "$as_me:$LINENO: result: Ant works" >&5 -$as_echo "Ant works" >&6; } + { echo "$as_me:$LINENO: result: Ant works" >&5 +echo "${ECHO_T}Ant works" >&6; } if test -z "$WITH_ANT_HOME"; then ANT_HOME=`$ANT -diagnostics | $EGREP "ant.home :" | $SED -e "s#ant.home : ##g"` if test -z "$ANT_HOME"; then @@ -28679,8 +27889,8 @@ $as_echo "Ant works" >&6; } echo "configure: Ant test failed" >&5 cat conftest.java >&5 cat conftest.xml >&5 - { $as_echo "$as_me:$LINENO: WARNING: Ant does not work - Some Java projects will not build!" >&5 -$as_echo "$as_me: WARNING: Ant does not work - Some Java projects will not build!" >&2;} + { echo "$as_me:$LINENO: WARNING: Ant does not work - Some Java projects will not build!" >&5 +echo "$as_me: WARNING: Ant does not work - Some Java projects will not build!" >&2;} ANT_HOME="" echo "Ant does not work - Some Java projects will not build!" >>warn fi @@ -28693,8 +27903,8 @@ fi if test "$ANT_HOME" != "NO_ANT_HOME"; then - { $as_echo "$as_me:$LINENO: checking Ant lib directory" >&5 -$as_echo_n "checking Ant lib directory... " >&6; } + { echo "$as_me:$LINENO: checking Ant lib directory" >&5 +echo $ECHO_N "checking Ant lib directory... $ECHO_C" >&6; } if test -f $ANT_HOME/lib/ant.jar; then ANT_LIB="$ANT_HOME/lib" else @@ -28710,23 +27920,23 @@ $as_echo_n "checking Ant lib directory... " >&6; } if test -f $ANT_HOME/lib/ant/ant.jar; then ANT_LIB="$ANT_HOME/lib/ant" else - { { $as_echo "$as_me:$LINENO: error: Ant libraries not found!" >&5 -$as_echo "$as_me: error: Ant libraries not found!" >&2;} + { { echo "$as_me:$LINENO: error: Ant libraries not found!" >&5 +echo "$as_me: error: Ant libraries not found!" >&2;} { (exit 1); exit 1; }; } fi fi fi fi fi - { $as_echo "$as_me:$LINENO: result: Ant lib directory found." >&5 -$as_echo "Ant lib directory found." >&6; } + { echo "$as_me:$LINENO: result: Ant lib directory found." >&5 +echo "${ECHO_T}Ant lib directory found." >&6; } fi fi if test "$ENABLE_MEDIAWIKI" = "YES"; then -{ $as_echo "$as_me:$LINENO: checking whether ant supports mapper type=\"regexp\"" >&5 -$as_echo_n "checking whether ant supports mapper type=\"regexp\"... " >&6; } +{ echo "$as_me:$LINENO: checking whether ant supports mapper type=\"regexp\"" >&5 +echo $ECHO_N "checking whether ant supports mapper type=\"regexp\"... $ECHO_C" >&6; } rm -rf confdir mkdir confdir cat > conftest.java << EOF @@ -28761,178 +27971,178 @@ EOF { (eval echo "$as_me:$LINENO: \"$ant_cmd\"") >&5 (eval $ant_cmd) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } if test $? = 0 && test -f ./conftest.class ; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } rm -rf confdir else echo "configure: Ant test failed" >&5 cat conftest.java >&5 cat conftest.xml >&5 rm -rf confdir - { { $as_echo "$as_me:$LINENO: error: no. Did you install ant-apache-regexp?" >&5 -$as_echo "$as_me: error: no. Did you install ant-apache-regexp?" >&2;} + { { echo "$as_me:$LINENO: error: no. Did you install ant-apache-regexp?" >&5 +echo "$as_me: error: no. Did you install ant-apache-regexp?" >&2;} { (exit 1); exit 1; }; } fi fi rm -f conftest* core core.* *.core -{ $as_echo "$as_me:$LINENO: checking which languages to be built" >&5 -$as_echo_n "checking which languages to be built... " >&6; } +{ echo "$as_me:$LINENO: checking which languages to be built" >&5 +echo $ECHO_N "checking which languages to be built... $ECHO_C" >&6; } WITH_LANG="$with_lang" if test -z "$WITH_LANG"; then - { $as_echo "$as_me:$LINENO: result: en-US" >&5 -$as_echo "en-US" >&6; } + { echo "$as_me:$LINENO: result: en-US" >&5 +echo "${ECHO_T}en-US" >&6; } else - { $as_echo "$as_me:$LINENO: result: $WITH_LANG" >&5 -$as_echo "$WITH_LANG" >&6; } + { echo "$as_me:$LINENO: result: $WITH_LANG" >&5 +echo "${ECHO_T}$WITH_LANG" >&6; } fi -{ $as_echo "$as_me:$LINENO: checking which languages have poor help localizations" >&5 -$as_echo_n "checking which languages have poor help localizations... " >&6; } +{ echo "$as_me:$LINENO: checking which languages have poor help localizations" >&5 +echo $ECHO_N "checking which languages have poor help localizations... $ECHO_C" >&6; } WITH_POOR_HELP_LOCALIZATIONS="$with_poor_help_localizations" if test -z "$WITH_POOR_HELP_LOCALIZATIONS"; then - { $as_echo "$as_me:$LINENO: result: none" >&5 -$as_echo "none" >&6; } + { echo "$as_me:$LINENO: result: none" >&5 +echo "${ECHO_T}none" >&6; } else - { $as_echo "$as_me:$LINENO: result: $WITH_POOR_HELP_LOCALIZATIONS" >&5 -$as_echo "$WITH_POOR_HELP_LOCALIZATIONS" >&6; } + { echo "$as_me:$LINENO: result: $WITH_POOR_HELP_LOCALIZATIONS" >&5 +echo "${ECHO_T}$WITH_POOR_HELP_LOCALIZATIONS" >&6; } fi -{ $as_echo "$as_me:$LINENO: checking which dictionaries to include" >&5 -$as_echo_n "checking which dictionaries to include... " >&6; } +{ echo "$as_me:$LINENO: checking which dictionaries to include" >&5 +echo $ECHO_N "checking which dictionaries to include... $ECHO_C" >&6; } if test -z "$with_dict"; then WITH_DICT=,ALL, - { $as_echo "$as_me:$LINENO: result: ALL" >&5 -$as_echo "ALL" >&6; } + { echo "$as_me:$LINENO: result: ALL" >&5 +echo "${ECHO_T}ALL" >&6; } else WITH_DICT=","$with_dict"," - { $as_echo "$as_me:$LINENO: result: $with_dict" >&5 -$as_echo "$with_dict" >&6; } + { echo "$as_me:$LINENO: result: $with_dict" >&5 +echo "${ECHO_T}$with_dict" >&6; } fi -{ $as_echo "$as_me:$LINENO: checking for additional 'intro' bitmaps" >&5 -$as_echo_n "checking for additional 'intro' bitmaps... " >&6; } +{ echo "$as_me:$LINENO: checking for additional 'intro' bitmaps" >&5 +echo $ECHO_N "checking for additional 'intro' bitmaps... $ECHO_C" >&6; } INTRO_BITMAPS= if test -z "$with_intro_bitmaps" -o "$with_intro_bitmaps" = "no" ; then INTRO_BITMAPS= - { $as_echo "$as_me:$LINENO: result: none" >&5 -$as_echo "none" >&6; } + { echo "$as_me:$LINENO: result: none" >&5 +echo "${ECHO_T}none" >&6; } else for bitmap in `echo $with_intro_bitmaps | tr ',' ' '` ; do case "$bitmap" in *.bmp) ;; - *) bitmap= ; { $as_echo "$as_me:$LINENO: WARNING: Intro bitmaps should be .bmp files!" >&5 -$as_echo "$as_me: WARNING: Intro bitmaps should be .bmp files!" >&2;} ;; + *) bitmap= ; { echo "$as_me:$LINENO: WARNING: Intro bitmaps should be .bmp files!" >&5 +echo "$as_me: WARNING: Intro bitmaps should be .bmp files!" >&2;} ;; esac if test -n "$bitmap" ; then INTRO_BITMAPS="$INTRO_BITMAPS $bitmap" fi done - { $as_echo "$as_me:$LINENO: result: $INTRO_BITMAPS" >&5 -$as_echo "$INTRO_BITMAPS" >&6; } + { echo "$as_me:$LINENO: result: $INTRO_BITMAPS" >&5 +echo "${ECHO_T}$INTRO_BITMAPS" >&6; } fi -{ $as_echo "$as_me:$LINENO: checking for additional 'about' bitmaps" >&5 -$as_echo_n "checking for additional 'about' bitmaps... " >&6; } +{ echo "$as_me:$LINENO: checking for additional 'about' bitmaps" >&5 +echo $ECHO_N "checking for additional 'about' bitmaps... $ECHO_C" >&6; } ABOUT_BITMAPS= if test -z "$with_about_bitmaps" -o "$with_about_bitmaps" = "no" ; then ABOUT_BITMAPS= - { $as_echo "$as_me:$LINENO: result: none" >&5 -$as_echo "none" >&6; } + { echo "$as_me:$LINENO: result: none" >&5 +echo "${ECHO_T}none" >&6; } else for bitmap in `echo $with_about_bitmaps | tr ',' ' '` ; do case "$bitmap" in *.bmp) ;; - *) bitmap= ; { $as_echo "$as_me:$LINENO: WARNING: About bitmaps should be .bmp files!" >&5 -$as_echo "$as_me: WARNING: About bitmaps should be .bmp files!" >&2;} ;; + *) bitmap= ; { echo "$as_me:$LINENO: WARNING: About bitmaps should be .bmp files!" >&5 +echo "$as_me: WARNING: About bitmaps should be .bmp files!" >&2;} ;; esac if test -n "$bitmap" ; then ABOUT_BITMAPS="$ABOUT_BITMAPS $bitmap" fi done - { $as_echo "$as_me:$LINENO: result: $ABOUT_BITMAPS" >&5 -$as_echo "$ABOUT_BITMAPS" >&6; } + { echo "$as_me:$LINENO: result: $ABOUT_BITMAPS" >&5 +echo "${ECHO_T}$ABOUT_BITMAPS" >&6; } fi OOO_VENDOR= -{ $as_echo "$as_me:$LINENO: checking for vendor" >&5 -$as_echo_n "checking for vendor... " >&6; } +{ echo "$as_me:$LINENO: checking for vendor" >&5 +echo $ECHO_N "checking for vendor... $ECHO_C" >&6; } if test -z "$with_vendor" -o "$with_vendor" = "no" ; then - { $as_echo "$as_me:$LINENO: result: not set" >&5 -$as_echo "not set" >&6; } + { echo "$as_me:$LINENO: result: not set" >&5 +echo "${ECHO_T}not set" >&6; } else OOO_VENDOR="$with_vendor" - { $as_echo "$as_me:$LINENO: result: $OOO_VENDOR" >&5 -$as_echo "$OOO_VENDOR" >&6; } + { echo "$as_me:$LINENO: result: $OOO_VENDOR" >&5 +echo "${ECHO_T}$OOO_VENDOR" >&6; } fi UNIXWRAPPERNAME= -{ $as_echo "$as_me:$LINENO: checking for UNIX wrapper name" >&5 -$as_echo_n "checking for UNIX wrapper name... " >&6; } +{ echo "$as_me:$LINENO: checking for UNIX wrapper name" >&5 +echo $ECHO_N "checking for UNIX wrapper name... $ECHO_C" >&6; } if test -z "$with_unix_wrapper" -o "$with_unix_wrapper" = "no" -o "$with_unix_wrapper" = "yes" ; then - { $as_echo "$as_me:$LINENO: result: not set" >&5 -$as_echo "not set" >&6; } + { echo "$as_me:$LINENO: result: not set" >&5 +echo "${ECHO_T}not set" >&6; } else UNIXWRAPPERNAME="$with_unix_wrapper" - { $as_echo "$as_me:$LINENO: result: $UNIXWRAPPERNAME" >&5 -$as_echo "$UNIXWRAPPERNAME" >&6; } + { echo "$as_me:$LINENO: result: $UNIXWRAPPERNAME" >&5 +echo "${ECHO_T}$UNIXWRAPPERNAME" >&6; } fi -{ $as_echo "$as_me:$LINENO: checking whether to statically link to Gtk" >&5 -$as_echo_n "checking whether to statically link to Gtk... " >&6; } +{ echo "$as_me:$LINENO: checking whether to statically link to Gtk" >&5 +echo $ECHO_N "checking whether to statically link to Gtk... $ECHO_C" >&6; } if test -n "$enable_static_gtk" && test "$enable_static_gtk" != "no"; then ENABLE_STATIC_GTK="TRUE" - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else ENABLE_STATIC_GTK="FALSE" - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -{ $as_echo "$as_me:$LINENO: checking whether to use layout dialogs" >&5 -$as_echo_n "checking whether to use layout dialogs... " >&6; } +{ echo "$as_me:$LINENO: checking whether to use layout dialogs" >&5 +echo $ECHO_N "checking whether to use layout dialogs... $ECHO_C" >&6; } if test -n "$enable_layout" && test "$enable_layout" != "no"; then ENABLE_LAYOUT="TRUE" - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else ENABLE_LAYOUT="FALSE" - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi # =================================================================== # De- or increase default verbosity of build process # =================================================================== -{ $as_echo "$as_me:$LINENO: checking build verbosity" >&5 -$as_echo_n "checking build verbosity... " >&6; } +{ echo "$as_me:$LINENO: checking build verbosity" >&5 +echo $ECHO_N "checking build verbosity... $ECHO_C" >&6; } if test -n "$enable_verbose"; then if test "$enable_verbose" == "yes"; then VERBOSE="TRUE" - { $as_echo "$as_me:$LINENO: result: high" >&5 -$as_echo "high" >&6; } + { echo "$as_me:$LINENO: result: high" >&5 +echo "${ECHO_T}high" >&6; } fi if test "$enable_verbose" == "no"; then VERBOSE="FALSE" - { $as_echo "$as_me:$LINENO: result: low" >&5 -$as_echo "low" >&6; } + { echo "$as_me:$LINENO: result: low" >&5 +echo "${ECHO_T}low" >&6; } fi else - { $as_echo "$as_me:$LINENO: result: not set" >&5 -$as_echo "not set" >&6; } + { echo "$as_me:$LINENO: result: not set" >&5 +echo "${ECHO_T}not set" >&6; } fi @@ -28943,22 +28153,22 @@ echo "* *" echo "********************************************************************" if test -z "$COMPATH"; then - { { $as_echo "$as_me:$LINENO: error: No compiler found." >&5 -$as_echo "$as_me: error: No compiler found." >&2;} + { { echo "$as_me:$LINENO: error: No compiler found." >&5 +echo "$as_me: error: No compiler found." >&2;} { (exit 1); exit 1; }; } fi -{ $as_echo "$as_me:$LINENO: checking solver path" >&5 -$as_echo_n "checking solver path... " >&6; } +{ echo "$as_me:$LINENO: checking solver path" >&5 +echo $ECHO_N "checking solver path... $ECHO_C" >&6; } if test -z "$with_local_solver"; then LOCAL_SOLVER="DEFAULT" - { $as_echo "$as_me:$LINENO: result: default" >&5 -$as_echo "default" >&6; } + { echo "$as_me:$LINENO: result: default" >&5 +echo "${ECHO_T}default" >&6; } else LOCAL_SOLVER=$with_local_solver - { $as_echo "$as_me:$LINENO: result: $with_local_solver" >&5 -$as_echo "$with_local_solver" >&6; } + { echo "$as_me:$LINENO: result: $with_local_solver" >&5 +echo "${ECHO_T}$with_local_solver" >&6; } fi @@ -28996,12 +28206,11 @@ _ACEOF case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( *) $as_unset $ac_var ;; esac ;; esac @@ -29034,12 +28243,12 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then test "x$cache_file" != "x/dev/null" && - { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 -$as_echo "$as_me: updating cache $cache_file" >&6;} + { echo "$as_me:$LINENO: updating cache $cache_file" >&5 +echo "$as_me: updating cache $cache_file" >&6;} cat confcache >$cache_file else - { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 -$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 +echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -29056,12 +28265,6 @@ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' # take arguments), then branch to the quote section. Otherwise, # look for a macro that doesn't take arguments. ac_script=' -:mline -/\\$/{ - N - s,\\\n,, - b mline -} t clear :clear s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g @@ -29091,7 +28294,7 @@ ac_ltlibobjs= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + ac_i=`echo "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" @@ -29103,14 +28306,12 @@ LTLIBOBJS=$ac_ltlibobjs - : ${CONFIG_STATUS=./config.status} -ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 +echo "$as_me: creating $CONFIG_STATUS" >&6;} +cat >$CONFIG_STATUS <<_ACEOF #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. @@ -29123,7 +28324,7 @@ ac_cs_silent=false SHELL=\${CONFIG_SHELL-$SHELL} _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<\_ACEOF ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## @@ -29133,7 +28334,7 @@ DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST @@ -29155,45 +28356,17 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits -as_nl=' -' -export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi - # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then - PATH_SEPARATOR=: - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { - (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || - PATH_SEPARATOR=';' - } + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh fi # Support unset when possible. @@ -29209,6 +28382,8 @@ fi # there to prevent editors from complaining about space-tab. # (If _AS_PATH_WALK were called with IFS unset, it would disable word # splitting by setting IFS to empty value.) +as_nl=' +' IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. @@ -29231,7 +28406,7 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 { (exit 1); exit 1; } fi @@ -29244,10 +28419,17 @@ PS2='> ' PS4='+ ' # NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + fi +done # Required to use basename. if expr a : '\(a\)' >/dev/null 2>&1 && @@ -29269,7 +28451,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | +echo X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -29320,7 +28502,7 @@ $as_unset CDPATH s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems @@ -29348,6 +28530,7 @@ case `echo -n x` in *) ECHO_N='-n';; esac + if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -29360,22 +28543,19 @@ if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file else rm -f conf$$.dir - mkdir conf$$.dir 2>/dev/null -fi -if (echo >conf$$.file) 2>/dev/null; then - if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else + mkdir conf$$.dir +fi +echo >conf$$.file +if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -p' - fi +elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln else as_ln_s='cp -p' fi @@ -29400,10 +28580,10 @@ else as_test_x=' eval sh -c '\'' if test -d "$1"; then - test -d "$1/."; + test -d "$1/."; else case $1 in - -*)set "./$1";; + -*)set "./$1";; esac; case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ???[sx]*):;;*)false;;esac;fi @@ -29426,7 +28606,7 @@ exec 6>&1 # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.63. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -29439,33 +28619,26 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q` _ACEOF -case $ac_config_files in *" -"*) set x $ac_config_files; shift; ac_config_files=$*;; -esac - - - -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<_ACEOF # Files that config.status was made for. config_files="$ac_config_files" _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<\_ACEOF ac_cs_usage="\ \`$as_me' instantiates files from templates according to the current configuration. -Usage: $0 [OPTION]... [FILE]... +Usage: $0 [OPTIONS] [FILE]... -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit - -q, --quiet, --silent - do not print progress messages + -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE Configuration files: $config_files @@ -29473,24 +28646,23 @@ $config_files Report bugs to ." _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.63, - with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +configured by $0, generated by GNU Autoconf 2.61, + with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -Copyright (C) 2008 Free Software Foundation, Inc. +Copyright (C) 2006 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." ac_pwd='$ac_pwd' srcdir='$srcdir' -AWK='$AWK' -test -n "\$AWK" || AWK=awk _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# The default lists apply if the user does not specify any file. +cat >>$CONFIG_STATUS <<\_ACEOF +# If no file are specified by the user, then we need to provide default +# value. By we need to know if files were specified by the user. ac_need_defaults=: while test $# != 0 do @@ -29512,24 +28684,21 @@ do -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - $as_echo "$ac_cs_version"; exit ;; + echo "$ac_cs_version"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift - case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" + CONFIG_FILES="$CONFIG_FILES $ac_optarg" ac_need_defaults=false;; --he | --h | --help | --hel | -h ) - $as_echo "$ac_cs_usage"; exit ;; + echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; # This is an error. - -*) { $as_echo "$as_me: error: unrecognized option: $1 + -*) { echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } ;; @@ -29548,32 +28717,30 @@ if $ac_cs_silent; then fi _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<_ACEOF if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion - shift - \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 - CONFIG_SHELL='$SHELL' + echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 + CONFIG_SHELL=$SHELL export CONFIG_SHELL - exec "\$@" + exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion fi _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<\_ACEOF exec 5>>config.log { echo sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX - $as_echo "$ac_log" + echo "$ac_log" } >&5 _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<_ACEOF _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<\_ACEOF # Handling of arguments. for ac_config_target in $ac_config_targets @@ -29582,8 +28749,8 @@ do "set_soenv") CONFIG_FILES="$CONFIG_FILES set_soenv" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 +echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac done @@ -29622,144 +28789,561 @@ $debug || (umask 077 && mkdir "$tmp") } || { - $as_echo "$as_me: cannot create a temporary directory in ." >&2 + echo "$me: cannot create a temporary directory in ." >&2 { (exit 1); exit 1; } } -# Set up the scripts for CONFIG_FILES section. -# No need to generate them if there are no CONFIG_FILES. -# This happens for instance with `./config.status config.h'. +# +# Set up the sed scripts for CONFIG_FILES section. +# + +# No need to generate the scripts if there are no CONFIG_FILES. +# This happens for instance when ./config.status config.h if test -n "$CONFIG_FILES"; then +_ACEOF -ac_cr=' ' -ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` -if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\\r' -else - ac_cs_awk_cr=$ac_cr + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +SHELL!$SHELL$ac_delim +PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim +PACKAGE_NAME!$PACKAGE_NAME$ac_delim +PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim +PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim +PACKAGE_STRING!$PACKAGE_STRING$ac_delim +PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim +exec_prefix!$exec_prefix$ac_delim +prefix!$prefix$ac_delim +program_transform_name!$program_transform_name$ac_delim +bindir!$bindir$ac_delim +sbindir!$sbindir$ac_delim +libexecdir!$libexecdir$ac_delim +datarootdir!$datarootdir$ac_delim +datadir!$datadir$ac_delim +sysconfdir!$sysconfdir$ac_delim +sharedstatedir!$sharedstatedir$ac_delim +localstatedir!$localstatedir$ac_delim +includedir!$includedir$ac_delim +oldincludedir!$oldincludedir$ac_delim +docdir!$docdir$ac_delim +infodir!$infodir$ac_delim +htmldir!$htmldir$ac_delim +dvidir!$dvidir$ac_delim +pdfdir!$pdfdir$ac_delim +psdir!$psdir$ac_delim +libdir!$libdir$ac_delim +localedir!$localedir$ac_delim +mandir!$mandir$ac_delim +DEFS!$DEFS$ac_delim +ECHO_C!$ECHO_C$ac_delim +ECHO_N!$ECHO_N$ac_delim +ECHO_T!$ECHO_T$ac_delim +LIBS!$LIBS$ac_delim +build_alias!$build_alias$ac_delim +host_alias!$host_alias$ac_delim +target_alias!$target_alias$ac_delim +GREP!$GREP$ac_delim +EGREP!$EGREP$ac_delim +AWK!$AWK$ac_delim +SED!$SED$ac_delim +LOCAL_SOLENV!$LOCAL_SOLENV$ac_delim +_solenv!$_solenv$ac_delim +UPD!$UPD$ac_delim +SOURCEVERSION!$SOURCEVERSION$ac_delim +build!$build$ac_delim +build_cpu!$build_cpu$ac_delim +build_vendor!$build_vendor$ac_delim +build_os!$build_os$ac_delim +host!$host$ac_delim +host_cpu!$host_cpu$ac_delim +host_vendor!$host_vendor$ac_delim +host_os!$host_os$ac_delim +target!$target$ac_delim +target_cpu!$target_cpu$ac_delim +target_vendor!$target_vendor$ac_delim +target_os!$target_os$ac_delim +GNUTAR!$GNUTAR$ac_delim +OSVERSION!$OSVERSION$ac_delim +PTHREAD_CFLAGS!$PTHREAD_CFLAGS$ac_delim +PTHREAD_LIBS!$PTHREAD_LIBS$ac_delim +ENABLE_CRASHDUMP!$ENABLE_CRASHDUMP$ac_delim +VC_STANDARD!$VC_STANDARD$ac_delim +ENABLE_WERROR!$ENABLE_WERROR$ac_delim +ENABLE_DEBUG!$ENABLE_DEBUG$ac_delim +PRODUCT!$PRODUCT$ac_delim +PROFULLSWITCH!$PROFULLSWITCH$ac_delim +PROEXT!$PROEXT$ac_delim +ENABLE_SYMBOLS!$ENABLE_SYMBOLS$ac_delim +DISABLE_STRIP!$DISABLE_STRIP$ac_delim +ENABLE_CUPS!$ENABLE_CUPS$ac_delim +ENABLE_FONTCONFIG!$ENABLE_FONTCONFIG$ac_delim +WITH_BINFILTER!$WITH_BINFILTER$ac_delim +ENABLE_DIRECTX!$ENABLE_DIRECTX$ac_delim +DISABLE_ACTIVEX!$DISABLE_ACTIVEX$ac_delim +DISABLE_ATL!$DISABLE_ATL$ac_delim +ENABLE_RPATH!$ENABLE_RPATH$ac_delim +WITH_MYSPELL_DICTS!$WITH_MYSPELL_DICTS$ac_delim +SYSTEM_DICTS!$SYSTEM_DICTS$ac_delim +DICT_SYSTEM_DIR!$DICT_SYSTEM_DIR$ac_delim +HYPH_SYSTEM_DIR!$HYPH_SYSTEM_DIR$ac_delim +THES_SYSTEM_DIR!$THES_SYSTEM_DIR$ac_delim +USE_SHELL!$USE_SHELL$ac_delim +WITH_MINGWIN!$WITH_MINGWIN$ac_delim +SHELLPATH!$SHELLPATH$ac_delim +GCC_HOME!$GCC_HOME$ac_delim +CC!$CC$ac_delim +CFLAGS!$CFLAGS$ac_delim +LDFLAGS!$LDFLAGS$ac_delim +CPPFLAGS!$CPPFLAGS$ac_delim +ac_ct_CC!$ac_ct_CC$ac_delim +EXEEXT!$EXEEXT$ac_delim +OBJEXT!$OBJEXT$ac_delim +COMPATH!$COMPATH$ac_delim +GCCVER!$GCCVER$ac_delim +HAVE_LD_BSYMBOLIC_FUNCTIONS!$HAVE_LD_BSYMBOLIC_FUNCTIONS$ac_delim +ENABLE_PCH!$ENABLE_PCH$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` fi -echo 'BEGIN {' >"$tmp/subs1.awk" && +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +CEOF$ac_eof _ACEOF -{ - echo "cat >conf$$subs.awk <<_ACEOF" && - echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && - echo "_ACEOF" -} >conf$$subs.sh || - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do - . ./conf$$subs.sh || - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + cat >conf$$subs.sed <<_ACEOF +NO_HIDS!$NO_HIDS$ac_delim +GNUMAKE!$GNUMAKE$ac_delim +_cc!$_cc$ac_delim +HAVE_LD_HASH_STYLE!$HAVE_LD_HASH_STYLE$ac_delim +PERL!$PERL$ac_delim +MSPDB_PATH!$MSPDB_PATH$ac_delim +COMEX!$COMEX$ac_delim +USE_MINGW!$USE_MINGW$ac_delim +MIDL_PATH!$MIDL_PATH$ac_delim +CSC_PATH!$CSC_PATH$ac_delim +FRAME_HOME!$FRAME_HOME$ac_delim +CPP!$CPP$ac_delim +CXX!$CXX$ac_delim +CXXFLAGS!$CXXFLAGS$ac_delim +ac_ct_CXX!$ac_ct_CXX$ac_delim +CXXCPP!$CXXCPP$ac_delim +SIZEOF_LONG!$SIZEOF_LONG$ac_delim +WORDS_BIGENDIAN!$WORDS_BIGENDIAN$ac_delim +LFS_CFLAGS!$LFS_CFLAGS$ac_delim +ENABLE_VBA!$ENABLE_VBA$ac_delim +VBA_EXTENSION!$VBA_EXTENSION$ac_delim +PAM!$PAM$ac_delim +NEW_SHADOW_API!$NEW_SHADOW_API$ac_delim +PAM_LINK!$PAM_LINK$ac_delim +CRYPT_LINK!$CRYPT_LINK$ac_delim +GXX_INCLUDE_PATH!$GXX_INCLUDE_PATH$ac_delim +MINGW_LIB_INCLUDE_PATH!$MINGW_LIB_INCLUDE_PATH$ac_delim +STLPORT4!$STLPORT4$ac_delim +STLPORT_VER!$STLPORT_VER$ac_delim +USE_SYSTEM_STL!$USE_SYSTEM_STL$ac_delim +HAVE_GCC_VISIBILITY_FEATURE!$HAVE_GCC_VISIBILITY_FEATURE$ac_delim +ALLOC!$ALLOC$ac_delim +BUILD_VER_STRING!$BUILD_VER_STRING$ac_delim +SOLAR_JAVA!$SOLAR_JAVA$ac_delim +JAVAINTERPRETER!$JAVAINTERPRETER$ac_delim +JAVACOMPILER!$JAVACOMPILER$ac_delim +JAVACISGCJ!$JAVACISGCJ$ac_delim +JAVADOC!$JAVADOC$ac_delim +AWTLIB!$AWTLIB$ac_delim +JAVAAOTCOMPILER!$JAVAAOTCOMPILER$ac_delim +JAVA_HOME!$JAVA_HOME$ac_delim +JDK!$JDK$ac_delim +JAVAFLAGS!$JAVAFLAGS$ac_delim +DMAKE!$DMAKE$ac_delim +BUILD_DMAKE!$BUILD_DMAKE$ac_delim +EPM!$EPM$ac_delim +DPKG!$DPKG$ac_delim +PKGMK!$PKGMK$ac_delim +BUILD_EPM!$BUILD_EPM$ac_delim +PKGFORMAT!$PKGFORMAT$ac_delim +RPM!$RPM$ac_delim +GPERF!$GPERF$ac_delim +MINGWCXX!$MINGWCXX$ac_delim +MINGWSTRIP!$MINGWSTRIP$ac_delim +BUILD_UNOWINREG!$BUILD_UNOWINREG$ac_delim +BUILD_QADEVOOO!$BUILD_QADEVOOO$ac_delim +SYSTEM_STDLIBS!$SYSTEM_STDLIBS$ac_delim +SYSTEM_ZLIB!$SYSTEM_ZLIB$ac_delim +SYSTEM_JPEG!$SYSTEM_JPEG$ac_delim +SYSTEM_EXPAT!$SYSTEM_EXPAT$ac_delim +PKG_CONFIG!$PKG_CONFIG$ac_delim +LIBWPD_CFLAGS!$LIBWPD_CFLAGS$ac_delim +LIBWPD_LIBS!$LIBWPD_LIBS$ac_delim +SYSTEM_LIBWPD!$SYSTEM_LIBWPD$ac_delim +FREETYPE_CFLAGS!$FREETYPE_CFLAGS$ac_delim +FREETYPE_LIBS!$FREETYPE_LIBS$ac_delim +USE_FT_EMBOLDEN!$USE_FT_EMBOLDEN$ac_delim +LIBXSLT_CFLAGS!$LIBXSLT_CFLAGS$ac_delim +LIBXSLT_LIBS!$LIBXSLT_LIBS$ac_delim +XSLTPROC!$XSLTPROC$ac_delim +SYSTEM_LIBXSLT!$SYSTEM_LIBXSLT$ac_delim +LIBXML_CFLAGS!$LIBXML_CFLAGS$ac_delim +LIBXML_LIBS!$LIBXML_LIBS$ac_delim +SYSTEM_LIBXML!$SYSTEM_LIBXML$ac_delim +PYTHON!$PYTHON$ac_delim +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 +pythondir!$pythondir$ac_delim +pkgpythondir!$pkgpythondir$ac_delim +pyexecdir!$pyexecdir$ac_delim +pkgpyexecdir!$pkgpyexecdir$ac_delim +BZIP2!$BZIP2$ac_delim +SYSTEM_PYTHON!$SYSTEM_PYTHON$ac_delim +PYTHON_CFLAGS!$PYTHON_CFLAGS$ac_delim +PYTHON_LIBS!$PYTHON_LIBS$ac_delim +HOME!$HOME$ac_delim +SYSTEM_DB!$SYSTEM_DB$ac_delim +DB_VERSION!$DB_VERSION$ac_delim +DB_INCLUDES!$DB_INCLUDES$ac_delim +DB_JAR!$DB_JAR$ac_delim +SYSTEM_LUCENE!$SYSTEM_LUCENE$ac_delim +LUCENE_CORE_JAR!$LUCENE_CORE_JAR$ac_delim +LUCENE_ANALYZERS_JAR!$LUCENE_ANALYZERS_JAR$ac_delim +SYSTEM_HSQLDB!$SYSTEM_HSQLDB$ac_delim +HSQLDB_JAR!$HSQLDB_JAR$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +CEOF$ac_eof +_ACEOF + - ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` - if test $ac_delim_n = $ac_delim_num; then +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +SYSTEM_BSH!$SYSTEM_BSH$ac_delim +BSH_JAR!$BSH_JAR$ac_delim +SERIALIZER_JAR!$SERIALIZER_JAR$ac_delim +SYSTEM_SAXON!$SYSTEM_SAXON$ac_delim +SAXON_JAR!$SAXON_JAR$ac_delim +CURLCONFIG!$CURLCONFIG$ac_delim +SYSTEM_CURL!$SYSTEM_CURL$ac_delim +CURL_CFLAGS!$CURL_CFLAGS$ac_delim +CURL_LIBS!$CURL_LIBS$ac_delim +SYSTEM_BOOST!$SYSTEM_BOOST$ac_delim +SYSTEM_VIGRA!$SYSTEM_VIGRA$ac_delim +SYSTEM_ODBC_HEADERS!$SYSTEM_ODBC_HEADERS$ac_delim +WITH_MOZILLA!$WITH_MOZILLA$ac_delim +WITH_LDAP!$WITH_LDAP$ac_delim +WITH_OPENLDAP!$WITH_OPENLDAP$ac_delim +MOZ_NSS_CFLAGS!$MOZ_NSS_CFLAGS$ac_delim +MOZ_NSS_LIBS!$MOZ_NSS_LIBS$ac_delim +NSS_LIB!$NSS_LIB$ac_delim +MOZ_NSPR_CFLAGS!$MOZ_NSPR_CFLAGS$ac_delim +MOZ_NSPR_LIBS!$MOZ_NSPR_LIBS$ac_delim +NSPR_LIB!$NSPR_LIB$ac_delim +MOZILLAXPCOM_CFLAGS!$MOZILLAXPCOM_CFLAGS$ac_delim +MOZILLAXPCOM_LIBS!$MOZILLAXPCOM_LIBS$ac_delim +MOZILLA_VERSION!$MOZILLA_VERSION$ac_delim +MOZILLA_TOOLKIT!$MOZILLA_TOOLKIT$ac_delim +MOZGTK2_CFLAGS!$MOZGTK2_CFLAGS$ac_delim +MOZGTK2_LIBS!$MOZGTK2_LIBS$ac_delim +MOZLIBREQ_CFLAGS!$MOZLIBREQ_CFLAGS$ac_delim +MOZLIBREQ_LIBS!$MOZLIBREQ_LIBS$ac_delim +BUILD_MOZAB!$BUILD_MOZAB$ac_delim +SYSTEM_MOZILLA!$SYSTEM_MOZILLA$ac_delim +MOZ_FLAVOUR!$MOZ_FLAVOUR$ac_delim +MOZ_INC!$MOZ_INC$ac_delim +MOZ_LIB!$MOZ_LIB$ac_delim +MOZ_LIB_XPCOM!$MOZ_LIB_XPCOM$ac_delim +MOZ_LDAP_CFLAGS!$MOZ_LDAP_CFLAGS$ac_delim +SYSTEM_SANE_HEADER!$SYSTEM_SANE_HEADER$ac_delim +SYSTEM_GENBRK!$SYSTEM_GENBRK$ac_delim +SYSTEM_GENCCODE!$SYSTEM_GENCCODE$ac_delim +SYSTEM_GENCMN!$SYSTEM_GENCMN$ac_delim +SYSTEM_ICU!$SYSTEM_ICU$ac_delim +XMKMF!$XMKMF$ac_delim +X_CFLAGS!$X_CFLAGS$ac_delim +X_PRE_LIBS!$X_PRE_LIBS$ac_delim +X_LIBS!$X_LIBS$ac_delim +X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim +XINC!$XINC$ac_delim +XLIB!$XLIB$ac_delim +XAU_LIBS!$XAU_LIBS$ac_delim +DISABLE_XAW!$DISABLE_XAW$ac_delim +SYSTEM_XRENDER_HEADERS!$SYSTEM_XRENDER_HEADERS$ac_delim +XRENDER_LINK!$XRENDER_LINK$ac_delim +XRANDR_CFLAGS!$XRANDR_CFLAGS$ac_delim +XRANDR_LIBS!$XRANDR_LIBS$ac_delim +XRANDR_DLOPEN!$XRANDR_DLOPEN$ac_delim +ENABLE_RANDR!$ENABLE_RANDR$ac_delim +DISABLE_NEON!$DISABLE_NEON$ac_delim +NEON_CFLAGS!$NEON_CFLAGS$ac_delim +NEON_LIBS!$NEON_LIBS$ac_delim +OPENSSL_CFLAGS!$OPENSSL_CFLAGS$ac_delim +OPENSSL_LIBS!$OPENSSL_LIBS$ac_delim +SYSTEM_OPENSSL!$SYSTEM_OPENSSL$ac_delim +SYSTEM_NEON!$SYSTEM_NEON$ac_delim +NEON_VERSION!$NEON_VERSION$ac_delim +ENABLE_AGG!$ENABLE_AGG$ac_delim +AGG_CFLAGS!$AGG_CFLAGS$ac_delim +AGG_LIBS!$AGG_LIBS$ac_delim +SYSTEM_AGG!$SYSTEM_AGG$ac_delim +AGG_VERSION!$AGG_VERSION$ac_delim +REDLAND_CFLAGS!$REDLAND_CFLAGS$ac_delim +REDLAND_LIBS!$REDLAND_LIBS$ac_delim +SYSTEM_REDLAND!$SYSTEM_REDLAND$ac_delim +HUNSPELL_CFLAGS!$HUNSPELL_CFLAGS$ac_delim +HUNSPELL_LIBS!$HUNSPELL_LIBS$ac_delim +SYSTEM_HUNSPELL!$SYSTEM_HUNSPELL$ac_delim +SYSTEM_HYPH!$SYSTEM_HYPH$ac_delim +HYPHEN_LIB!$HYPHEN_LIB$ac_delim +SYSTEM_MYTHES!$SYSTEM_MYTHES$ac_delim +SYSTEM_LPSOLVE!$SYSTEM_LPSOLVE$ac_delim +PSDK_HOME!$PSDK_HOME$ac_delim +WINDOWS_VISTA_PSDK!$WINDOWS_VISTA_PSDK$ac_delim +DIRECTXSDK_HOME!$DIRECTXSDK_HOME$ac_delim +DIRECTXSDK_LIB!$DIRECTXSDK_LIB$ac_delim +NSIS_PATH!$NSIS_PATH$ac_delim +BISON!$BISON$ac_delim +FLEX!$FLEX$ac_delim +PATCH!$PATCH$ac_delim +GNUCP!$GNUCP$ac_delim +GNUPATCH!$GNUPATCH$ac_delim +CYGWIN_PATH!$CYGWIN_PATH$ac_delim +ML_EXE!$ML_EXE$ac_delim +ASM_HOME!$ASM_HOME$ac_delim +ZIP!$ZIP$ac_delim +UNZIP!$UNZIP$ac_delim +ZIP_HOME!$ZIP_HOME$ac_delim +WITH_GPC!$WITH_GPC$ac_delim +ENABLE_GTK!$ENABLE_GTK$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then break elif $ac_last_try; then - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} { (exit 1); exit 1; }; } else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi done -rm -f conf$$subs.sh - -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && -_ACEOF -sed -n ' -h -s/^/S["/; s/!.*/"]=/ -p -g -s/^[^!]*!// -:repl -t repl -s/'"$ac_delim"'$// -t delim -:nl -h -s/\(.\{148\}\).*/\1/ -t more1 -s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ -p -n -b repl -:more1 -s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -p -g -s/.\{148\}// -t nl -:delim -h -s/\(.\{148\}\).*/\1/ -t more2 -s/["\\]/\\&/g; s/^/"/; s/$/"/ -p -b -:more2 -s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -p -g -s/.\{148\}// -t delim -' >$CONFIG_STATUS || ac_write_fail=1 -rm -f conf$$subs.awk -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -_ACAWK -cat >>"\$tmp/subs1.awk" <<_ACAWK && - for (key in S) S_is_set[key] = 1 - FS = "" -} -{ - line = $ 0 - nfields = split(line, field, "@") - substed = 0 - len = length(field[1]) - for (i = 2; i < nfields; i++) { - key = field[i] - keylen = length(key) - if (S_is_set[key]) { - value = S[key] - line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) - len += length(value) + length(field[++i]) - substed = 1 - } else - len += 1 + keylen - } - - print line -} +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi -_ACAWK +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then - sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" -else - cat -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 -$as_echo "$as_me: error: could not setup config files machinery" >&2;} +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +CEOF$ac_eof +_ACEOF + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +ENABLE_KDE!$ENABLE_KDE$ac_delim +GCONF_CFLAGS!$GCONF_CFLAGS$ac_delim +GCONF_LIBS!$GCONF_LIBS$ac_delim +ENABLE_GCONF!$ENABLE_GCONF$ac_delim +GNOMEVFS_CFLAGS!$GNOMEVFS_CFLAGS$ac_delim +GNOMEVFS_LIBS!$GNOMEVFS_LIBS$ac_delim +ENABLE_GNOMEVFS!$ENABLE_GNOMEVFS$ac_delim +GTK_CFLAGS!$GTK_CFLAGS$ac_delim +GTK_LIBS!$GTK_LIBS$ac_delim +DBUS_CFLAGS!$DBUS_CFLAGS$ac_delim +DBUS_LIBS!$DBUS_LIBS$ac_delim +GIO_CFLAGS!$GIO_CFLAGS$ac_delim +GIO_LIBS!$GIO_LIBS$ac_delim +ENABLE_GIO!$ENABLE_GIO$ac_delim +ENABLE_DBUS!$ENABLE_DBUS$ac_delim +ENABLE_SYSTRAY_GTK!$ENABLE_SYSTRAY_GTK$ac_delim +CAIRO_CFLAGS!$CAIRO_CFLAGS$ac_delim +CAIRO_LIBS!$CAIRO_LIBS$ac_delim +ENABLE_CAIRO!$ENABLE_CAIRO$ac_delim +BUILD_PIXMAN!$BUILD_PIXMAN$ac_delim +SYSTEM_CAIRO!$SYSTEM_CAIRO$ac_delim +ENABLE_OPENGL!$ENABLE_OPENGL$ac_delim +ENABLE_MINIMIZER!$ENABLE_MINIMIZER$ac_delim +ENABLE_PRESENTER_SCREEN!$ENABLE_PRESENTER_SCREEN$ac_delim +POPPLER_CFLAGS!$POPPLER_CFLAGS$ac_delim +POPPLER_LIBS!$POPPLER_LIBS$ac_delim +ENABLE_PDFIMPORT!$ENABLE_PDFIMPORT$ac_delim +SYSTEM_POPPLER!$SYSTEM_POPPLER$ac_delim +ENABLE_MEDIAWIKI!$ENABLE_MEDIAWIKI$ac_delim +SYSTEM_SERVLETAPI!$SYSTEM_SERVLETAPI$ac_delim +SERVLETAPI_JAR!$SERVLETAPI_JAR$ac_delim +ENABLE_REPORTBUILDER!$ENABLE_REPORTBUILDER$ac_delim +SYSTEM_JFREEREPORT!$SYSTEM_JFREEREPORT$ac_delim +SAC_JAR!$SAC_JAR$ac_delim +LIBXML_JAR!$LIBXML_JAR$ac_delim +FLUTE_JAR!$FLUTE_JAR$ac_delim +JFREEREPORT_JAR!$JFREEREPORT_JAR$ac_delim +LIBBASE_JAR!$LIBBASE_JAR$ac_delim +LIBLAYOUT_JAR!$LIBLAYOUT_JAR$ac_delim +LIBLOADER_JAR!$LIBLOADER_JAR$ac_delim +LIBFORMULA_JAR!$LIBFORMULA_JAR$ac_delim +LIBREPOSITORY_JAR!$LIBREPOSITORY_JAR$ac_delim +LIBFONTS_JAR!$LIBFONTS_JAR$ac_delim +LIBSERIALIZER_JAR!$LIBSERIALIZER_JAR$ac_delim +SYSTEM_APACHE_COMMONS!$SYSTEM_APACHE_COMMONS$ac_delim +COMMONS_CODEC_JAR!$COMMONS_CODEC_JAR$ac_delim +COMMONS_LANG_JAR!$COMMONS_LANG_JAR$ac_delim +COMMONS_HTTPCLIENT_JAR!$COMMONS_HTTPCLIENT_JAR$ac_delim +COMMONS_LOGGING_JAR!$COMMONS_LOGGING_JAR$ac_delim +MOC!$MOC$ac_delim +KDE_CFLAGS!$KDE_CFLAGS$ac_delim +KDE_LIBS!$KDE_LIBS$ac_delim +ENABLE_LOCKDOWN!$ENABLE_LOCKDOWN$ac_delim +GOBJECT_CFLAGS!$GOBJECT_CFLAGS$ac_delim +GOBJECT_LIBS!$GOBJECT_LIBS$ac_delim +ENABLE_EVOAB2!$ENABLE_EVOAB2$ac_delim +ENABLE_KAB!$ENABLE_KAB$ac_delim +WITH_FONTOOO!$WITH_FONTOOO$ac_delim +SYSTEM_MSPACK!$SYSTEM_MSPACK$ac_delim +WITH_FONTS!$WITH_FONTS$ac_delim +WITHOUT_PPDS!$WITHOUT_PPDS$ac_delim +WITHOUT_AFMS!$WITHOUT_AFMS$ac_delim +SCPDEFS!$SCPDEFS$ac_delim +USE_XINERAMA!$USE_XINERAMA$ac_delim +XINERAMA_LINK!$XINERAMA_LINK$ac_delim +ANT!$ANT$ac_delim +ANT_HOME!$ANT_HOME$ac_delim +ANT_LIB!$ANT_LIB$ac_delim +WITH_LANG!$WITH_LANG$ac_delim +WITH_POOR_HELP_LOCALIZATIONS!$WITH_POOR_HELP_LOCALIZATIONS$ac_delim +WITH_DICT!$WITH_DICT$ac_delim +INTRO_BITMAPS!$INTRO_BITMAPS$ac_delim +ABOUT_BITMAPS!$ABOUT_BITMAPS$ac_delim +OOO_VENDOR!$OOO_VENDOR$ac_delim +UNIXWRAPPERNAME!$UNIXWRAPPERNAME$ac_delim +ENABLE_STATIC_GTK!$ENABLE_STATIC_GTK$ac_delim +ENABLE_LAYOUT!$ENABLE_LAYOUT$ac_delim +VERBOSE!$VERBOSE$ac_delim +LOCAL_SOLVER!$LOCAL_SOLVER$ac_delim +BUILD_TYPE!$BUILD_TYPE$ac_delim +LIBOBJS!$LIBOBJS$ac_delim +LTLIBOBJS!$LTLIBOBJS$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 82; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +:end +s/|#_!!_#|//g +CEOF$ac_eof _ACEOF + # VPATH may cause trouble with some makes, so we remove $(srcdir), # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty @@ -29775,21 +29359,19 @@ s/^[^=]*=[ ]*$// }' fi -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<\_ACEOF fi # test -n "$CONFIG_FILES" -eval set X " :F $CONFIG_FILES " -shift -for ac_tag +for ac_tag in :F $CONFIG_FILES do case $ac_tag in :[FHLC]) ac_mode=$ac_tag; continue;; esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 -$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} + :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 +echo "$as_me: error: Invalid tag $ac_tag." >&2;} { (exit 1); exit 1; }; };; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; @@ -29818,38 +29400,26 @@ $as_echo "$as_me: error: invalid tag $ac_tag" >&2;} [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} + { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 +echo "$as_me: error: cannot find input file: $ac_f" >&2;} { (exit 1); exit 1; }; };; esac - case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac - ac_file_inputs="$ac_file_inputs '$ac_f'" + ac_file_inputs="$ac_file_inputs $ac_f" done # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ - configure_input='Generated from '` - $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' - `' by configure.' + configure_input="Generated from "`IFS=: + echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 -$as_echo "$as_me: creating $ac_file" >&6;} + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} fi - # Neutralize special characters interpreted by sed in replacement strings. - case $configure_input in #( - *\&* | *\|* | *\\* ) - ac_sed_conf_input=`$as_echo "$configure_input" | - sed 's/[\\\\&|]/\\\\&/g'`;; #( - *) ac_sed_conf_input=$configure_input;; - esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } ;; + *:-:* | *:-) cat >"$tmp/stdin";; esac ;; esac @@ -29859,7 +29429,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$ac_file" | +echo X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -29885,7 +29455,7 @@ $as_echo X"$ac_file" | as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -29894,7 +29464,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | +echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -29915,17 +29485,17 @@ $as_echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} + } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +echo "$as_me: error: cannot create directory $as_dir" >&2;} { (exit 1); exit 1; }; }; } ac_builddir=. case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -29961,13 +29531,12 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<\_ACEOF # If the template does not know about datarootdir, expand it. # FIXME: This hack should be removed a few years after 2.60. ac_datarootdir_hack=; ac_datarootdir_seen= -ac_sed_dataroot=' -/datarootdir/ { +case `sed -n '/datarootdir/ { p q } @@ -29976,14 +29545,13 @@ ac_sed_dataroot=' /@infodir@/p /@localedir@/p /@mandir@/p -' -case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in +' $ac_file_inputs` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<_ACEOF ac_datarootdir_hack=' s&@datadir@&$datadir&g s&@docdir@&$docdir&g @@ -29997,16 +29565,15 @@ _ACEOF # Neutralize VPATH when `$srcdir' = `.'. # Shell code in configure.ac might set extrasub. # FIXME: do we really want to maintain this feature? -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_sed_extra="$ac_vpsub +cat >>$CONFIG_STATUS <<_ACEOF + sed "$ac_vpsub $extrasub _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<\_ACEOF :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s|@configure_input@|$ac_sed_conf_input|;t t +s&@configure_input@&$configure_input&;t t s&@top_builddir@&$ac_top_builddir_sub&;t t -s&@top_build_prefix@&$ac_top_build_prefix&;t t s&@srcdir@&$ac_srcdir&;t t s&@abs_srcdir@&$ac_abs_srcdir&;t t s&@top_srcdir@&$ac_top_srcdir&;t t @@ -30015,28 +29582,21 @@ s&@builddir@&$ac_builddir&;t t s&@abs_builddir@&$ac_abs_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;t t $ac_datarootdir_hack -" -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } +" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" >$tmp/out test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&5 -$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&2;} rm -f "$tmp/stdin" case $ac_file in - -) cat "$tmp/out" && rm -f "$tmp/out";; - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; - esac \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + -) cat "$tmp/out"; rm -f "$tmp/out";; + *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; + esac ;; @@ -30051,11 +29611,6 @@ _ACEOF chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save -test $ac_write_fail = 0 || - { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } - # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. @@ -30077,10 +29632,6 @@ if test "$no_create" != yes; then # would make configure fail if this is the last instruction. $ac_cs_success || { (exit 1); exit 1; } fi -if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} -fi chmod a+x set_soenv diff --git a/configure.in b/configure.in index cc9a533e5553..3a565ebefb7a 100644 --- a/configure.in +++ b/configure.in @@ -2122,6 +2122,10 @@ if test "$GXX" = "yes"; then with_gxx_include_path=`cygpath -d "$with_gxx_include_path"` with_gxx_include_path=`cygpath -u "$with_gxx_include_path"` fi + if echo $with_gxx_include_path | grep -q linux; then + # workaround for Mandriva - issue 100049 + with_gxx_include_path=`cd $with_gxx_include_path && pwd` + fi fi fi dnl This is the original code... diff --git a/set_soenv.in b/set_soenv.in index 2c496efc1d73..5e7c56b0e052 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -86,7 +86,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $SHELL, $PATH, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARLIB, $SOLARINC, $LOCALINI, $FRAMEWORKSHOME, $COMEX, $PERL, $COMP_ENV, $ILIB, $JAVAHOME, $PSDK_HOME, $DIRECTXSDK_LIB, $USE_NEW_SDK, $FRAME_HOME, - $USE_DIRECTX5, $ATL_LIB, $ATL_INCLUDE, $MFC_LIB, $MFC_INCLUDE, $NO_HIDS, $TEMP, + $USE_DIRECTX5, $ATL_LIB, $ATL_INCLUDE, $MFC_LIB, $MFC_INCLUDE, $NO_HIDS, $TMPDIR, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS, $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB, $PROEXT, @@ -1942,9 +1942,12 @@ ToFile( "CRYPT_LINK", "@CRYPT_LINK@", "e" ); ToFile( "XAU_LIBS", "@XAU_LIBS@", "e" ); ToFile( "GXX_INCLUDE_PATH", PathFormat("@GXX_INCLUDE_PATH@"), "e" ); ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS, "e" ); -if ($platform !~ m/cygwin|os2/) -{ ToFile( "TEMP", $TEMP, "e" ); - ToFile( "TMP", $TEMP, "e" ); +if ($platform !~ m/cygwin|os2/) { + if ( $ENV{"TMPDIR"} eq "" ) { + ToFile( "TMPDIR", "/tmp", "e" ); + } else { + ToFile( "TMPDIR", "$ENV{'TMPDIR'}", "e" ); + } } ToFile( "SOLARSRC", $SOLARSRC, "e" ); if ( $platform =~ m/cygwin/ ) diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl index af958c0181ad..c83f65991a82 100644 --- a/solenv/bin/build.pl +++ b/solenv/bin/build.pl @@ -1939,8 +1939,8 @@ sub is_output_tree { sub get_tmp_dir { my $tmp_dir; - if( defined($ENV{TMP}) ) { - $tmp_dir = $ENV{TMP} . '/'; + if( defined($ENV{TMPDIR}) ) { + $tmp_dir = $ENV{TMPDIR} . '/'; } else { $tmp_dir = '/tmp/'; } @@ -2466,7 +2466,7 @@ sub generate_html_file { my @modules_order = sort_modules_appearance(); my ($successes_percent, $errors_percent) = get_progress_percentage(scalar keys %html_info, scalar keys %build_is_finished, scalar keys %modules_with_errors); my $build_duration = get_time_line(time - $build_time); - my $temp_html_file = File::Temp::tmpnam($ENV{TMP}),#scalar tmpnam(); + my $temp_html_file = File::Temp::tmpnam($ENV{TMPDIR}); my $title; $title = $ENV{CWS_WORK_STAMP} . ': ' if (defined $ENV{CWS_WORK_STAMP}); $title .= $ENV{INPATH}; diff --git a/solenv/bin/mhids.pl b/solenv/bin/mhids.pl index 73fcbb468b0a..4b3ce1f2b4dc 100644 --- a/solenv/bin/mhids.pl +++ b/solenv/bin/mhids.pl @@ -120,8 +120,8 @@ if ( $ENV{NO_HID_FILES} ) { $no_hid_files = $ENV{"NO_HID_FILES"}; } $solarincludes = $ENV{SOLARINCLUDES}; -$tmpdir = $ENV{TMP}; -die "ERROR - \"TMP\" environment variable not set\n" if ( !defined $tmpdir ); +$tmpdir = $ENV{TMPDIR}; +die "ERROR - \"TMPDIR\" environment variable not set\n" if ( !defined $tmpdir ); die "ERROR - \"$tmpdir\" doesn't exist\n" if ( ! -d $tmpdir ); setcompiler(); diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index a3c43edaaf67..ca1856fce33e 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -669,7 +669,7 @@ TRYALTSDF:=$(SOLARSRC)$/$(ALT_L10N_MODULE)$/$(COMMON_OUTDIR)$(PROEXT)$/misc/sdf$ # TODO: check performance impact... LOCALIZESDF:=$(strip $(shell @+$(IFEXIST) $(TRYALTSDF) $(THEN) echo $(TRYALTSDF) $(FI))) .ENDIF # "$(ALT_LOCALIZATION_FOUND)"!="" -some_local_helper_var:=$(strip $(shell +$(IFEXIST) $(TRYSDF) $(THEN) echo $(TRYSDF) $(FI) )) +some_local_helper_var:=$(strip $(shell @+$(IFEXIST) $(TRYSDF) $(THEN) echo $(TRYSDF) $(FI) )) LOCALIZESDF!:=$(eq,$(LOCALIZESDF),$(NULL) $(some_local_helper_var) $(LOCALIZESDF)) LOCALIZESDF!:=$(eq,$(LOCALIZESDF),$(NULL) $(COMMONMISC)$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf $(LOCALIZESDF)) .ELSE # "$(LOCALIZATION_FOUND)"!="" || "$(ALT_LOCALIZATION_FOUND)"!="" -- cgit From 5bf54b56d622370084cf8029500d75208601113e Mon Sep 17 00:00:00 2001 From: Release Engineers Date: Fri, 7 Aug 2009 10:16:34 +0000 Subject: CWS-TOOLING: integrate CWS kde4int 2009-07-15 10:40:52 +0200 pl r273993 : #i103288# configure 2009-07-09 14:57:24 +0200 pl r273867 : #i103284# spin fields 2009-07-09 13:49:13 +0200 pl r273864 : #i103284# min size for dropdown comboboxes 2009-07-09 13:46:11 +0200 pl r273860 : #i103284# min size fro dropdown listboxes 2009-07-09 13:01:48 +0200 pl r273857 : #i103284# fix most radiobuttons and checboxes, also on tabpages 2009-07-08 19:38:12 +0200 pl r273847 : #i103290# clean up, enable KDE4 fpicker 2009-07-08 15:54:06 +0200 pl r273837 : #i103284# background mode opaque doesn't look that good 2009-07-07 19:29:01 +0200 pl r273814 : add kde4 directory and deliverables 2009-07-07 11:18:08 +0200 pl r273786 : make compile with Qt 4.1 2009-07-02 19:20:47 +0200 pl r273673 : #i103290# add: KDE4 file picker (thanks Roman Shtylman) 2009-07-02 19:16:07 +0200 pl r273672 : #i103289# add: KDE4integration (thanks Roman Shtylman) 2009-07-02 19:01:20 +0200 pl r273671 : #i103286# add: KDE4 checks (thanks Roman Shtylman) 2009-07-02 18:58:15 +0200 pl r273670 : #i103286# initial import for KDE4 backend (thanks Roman Shtylman) 2009-07-02 18:08:06 +0200 pl r273668 : #i103284# initial import for KDE4 plugin (thanks Roman Shtylman) --- configure.in | 124 ++++++++++++++++++++++++++++++++-- scp2/source/kde/file_kde.scp | 12 ++++ scp2/source/kde/makefile.mk | 11 ++- scp2/source/kde/module_kde.scp | 14 +++- scp2/source/ooo/file_library_ooo.scp | 22 ++++++ scp2/source/ooo/makefile.mk | 4 ++ scp2/source/ooo/module_hidden_ooo.scp | 1 + set_soenv.in | 6 +- 8 files changed, 185 insertions(+), 9 deletions(-) diff --git a/configure.in b/configure.in index 3a565ebefb7a..0fa4670b0d48 100644 --- a/configure.in +++ b/configure.in @@ -259,6 +259,11 @@ AC_ARG_ENABLE(kde, AC_ARG_ENABLE(kdeab, [ --disable-kdeab Disable the KDE address book support ],,if test "$enable_kde" = "yes"; then enable_kdeab=yes; fi) +AC_ARG_ENABLE(kde4, +[ --enable-kde4 Determines whether to use Qt4/KDE4 vclplug on platforms + where Qt4 and KDE4 are available. May be used with --enable-kde + if you want to support both KDE3 and KDE4. +],,) AC_ARG_ENABLE(binfilter, [ --disable-binfilter Disable legacy binary file formats filters ],,if ! test -d ./binfilter; then enable_binfilter=no; fi) @@ -908,6 +913,7 @@ case "$build_os" in test_gtk=yes test_cairo=yes test_kde=yes + test_kde4=yes test_cups=yes test_randr=yes test_freetype=yes @@ -951,6 +957,7 @@ case "$build_os" in test_gtk=yes test_cairo=yes test_kde=yes + test_kde4=yes test_cups=yes test_randr=yes test_freetype=yes @@ -984,6 +991,7 @@ case "$build_os" in test_gtk=yes test_cairo=yes test_kde=yes + test_kde4=yes test_cups=no test_randr=yes test_freetype=yes @@ -5242,6 +5250,13 @@ if test "x$enable_kde" = "xyes"; then fi AC_SUBST(ENABLE_KDE) +ENABLE_KDE4="" +if test "x$enable_kde4" = "xyes"; then + ENABLE_KDE4="TRUE" + R="$R kde4" +fi +AC_SUBST(ENABLE_KDE4) + if test -z "$R"; then AC_MSG_RESULT([none]) else @@ -5780,11 +5795,11 @@ if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE" ; then fi fi if test "$build_cpu" != "x86_64" ; then - kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes" - kde_libdirs="/usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib $x_libraries" + kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /opt/kde3/include /opt/kde/include $x_includes" + kde_libdirs="/usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib /usr/lib $x_libraries" else - kde_incdirs="/usr/lib64/kde/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes" - kde_libdirs="/usr/lib64/kde/lib64 /usr/local/kde/lib64 /usr/kde/lib64 /usr/lib64/kde /usr/lib64/kde3 /usr/lib64 /usr/X11R6/lib64 /usr/local/lib64 /opt/kde3/lib64 /opt/kde/lib64 /usr/X11R6/kde/lib64 /usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib $x_libraries" + kde_incdirs="/usr/lib64/kde/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /opt/kde3/include /opt/kde/include $x_includes" + kde_libdirs="/usr/lib64/kde/lib64 /usr/local/kde/lib64 /usr/kde/lib64 /usr/lib64/kde /usr/lib64/kde3 /usr/X11R6/lib64 /usr/local/lib64 /opt/kde3/lib64 /opt/kde/lib64 /usr/X11R6/kde/lib64 /usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib /usr/lib64 $x_libraries" fi if test -n "$KDEDIR" ; then kde_incdirs="$KDEDIR/include $kde_incdirs" @@ -5831,12 +5846,13 @@ your Qt installation by exporting QTDIR before running "configure".]) your Qt installation by exporting QTDIR before running "configure".]) fi + dnl Check for Meta Object Compiler AC_PATH_PROG( MOC, moc, no, [$QTDIR/bin:$PATH] ) if test "$MOC" = "no" ; then AC_MSG_ERROR([Qt Meta Object Compiler not found. Please specify the root of your Qt installation by exporting QTDIR before running "configure".]) - fi - + fi + dnl Check for KDE headers AC_MSG_CHECKING([for KDE headers]) kde_incdir="no" @@ -5875,6 +5891,102 @@ AC_SUBST(KDE_CFLAGS) AC_SUBST(KDE_LIBS) AC_SUBST(MOC) +dnl =================================================================== +dnl KDE4 Integration +dnl =================================================================== + +KDE4_CFLAGS="" +KDE4_LIBS="" +MOC4="moc" +if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then + qt_incdirs="$QTINC $QTDIR /usr/include/qt4 /usr/include $x_includes" + qt_libdirs="$QTLIB /usr/lib $x_libraries" + + kde_incdirs="/usr/include $x_includes" + kde_libdirs="/usr/lib $x_libraries" + + if test "$build_cpu" == "x86_64" ; then + qt_libdirs="$qt_libdirs /usr/lib64/qt4 /usr/lib64/qt /usr/lib64" + kde_libdirs="$kde_libdirs /usr/lib64 /usr/lib64/kde4" + fi + + qt_test_include="Qt/qobject.h" + qt_test_library="libQtCore.so" + kde_test_include="ksharedptr.h" + kde_test_library="libkdeui.so" + + AC_MSG_CHECKING([for Qt4 headers]) + qt_header_dir="no" + for inc_dir in $qt_incdirs ; do + if test -r "$inc_dir/$qt_test_include" ; then + qt_header_dir="$inc_dir" + break + fi + done + + AC_MSG_RESULT([$qt_header_dir]) + if test "x$qt_header_dir" = "xno" ; then + AC_MSG_ERROR([Qt4 headers not found. Please specify the root of your Qt4 installation by exporting QTDIR before running "configure".]) + fi + + AC_MSG_CHECKING([for Qt4 libraries]) + qt_lib_dir="no" + for lib_dir in $qt_libdirs ; do + if test -r "$lib_dir/$qt_test_library" ; then + qt_lib_dir="$lib_dir" + break + fi + done + + AC_MSG_RESULT([$qt_lib_dir]) + + if test "x$qt_lib_dir" = "xno" ; then + AC_MSG_ERROR([Qt4 libraries not found. Please specify the root of your Qt4 installation by exporting QTDIR before running "configure".]) + fi + + dnl Check for Meta Object Compiler + AC_PATH_PROG( MOC4, moc, no, [$PATH:$QTDIR/bin] ) + if test "$MOC4" = "no" ; then + AC_MSG_ERROR([Qt Meta Object Compiler not found. Please specify +the root of your Qt installation by exporting QTDIR before running "configure".]) + fi + + dnl Check for KDE4 headers + AC_MSG_CHECKING([for KDE4 headers]) + kde_incdir="no" + for kde_check in $kde_incdirs ; do + if test -r "$kde_check/$kde_test_include" ; then + kde_incdir="$kde_check" + break + fi + done + AC_MSG_RESULT([$kde_incdir]) + if test "x$kde_incdir" = "xno" ; then + AC_MSG_ERROR([KDE4 headers not found. Please specify the root of your KDE4 installation by exporting KDEDIR before running "configure".]) + fi + + dnl Check for KDE4 libraries + AC_MSG_CHECKING([for KDE4 libraries]) + kde_libdir="no" + for kde_check in $kde_libdirs ; do + if test -r "$kde_check/$kde_test_library" ; then + kde_libdir="$kde_check" + break + fi + done + + AC_MSG_RESULT([$kde_libdir]) + if test "x$kde_libdir" = "xno" ; then + AC_MSG_ERROR([KDE4 libraries not found. Please specify the root of your KDE4 installation by exporting KDEDIR before running "configure".]) + fi + + KDE4_CFLAGS="`pkg-config --cflags QtCore` `pkg-config --cflags QtGui` -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT" + KDE4_LIBS="-L$kde_libdir -L$qt_lib_dir -lkdeui -lkdecore -lQtCore -lQtGui" +fi +AC_SUBST(KDE4_CFLAGS) +AC_SUBST(KDE4_LIBS) +AC_SUBST(MOC4) + dnl =================================================================== dnl Test for the enabling the lockdown pieces dnl =================================================================== diff --git a/scp2/source/kde/file_kde.scp b/scp2/source/kde/file_kde.scp index a6d6db425a22..1835a39819b5 100644 --- a/scp2/source/kde/file_kde.scp +++ b/scp2/source/kde/file_kde.scp @@ -29,6 +29,7 @@ ************************************************************************/ #include "macros.inc" +#ifdef ENABLE_KDE File gid_File_Lib_Kdebe TXT_FILE_BODY; Styles = (PACKED); @@ -37,4 +38,15 @@ File gid_File_Lib_Kdebe RegistryID = gid_Starregistry_Services_Rdb; Regmergefile = "kdebe1-ucd.txt"; End +#endif +#ifdef ENABLE_KDE4 +File gid_File_Lib_Kde4be + TXT_FILE_BODY; + Styles = (PACKED); + Dir = gid_Dir_Program; + Name = STRING(CONCAT2(kde4be1.uno,UNXSUFFIX)); + RegistryID = gid_Starregistry_Services_Rdb; + Regmergefile = "kde4be1-ucd.txt"; +End +#endif diff --git a/scp2/source/kde/makefile.mk b/scp2/source/kde/makefile.mk index 0cbf6a47123d..6ddb30108ce6 100644 --- a/scp2/source/kde/makefile.mk +++ b/scp2/source/kde/makefile.mk @@ -43,7 +43,16 @@ TARGETTYPE=CUI SCP_PRODUCT_TYPE=osl -.IF "$(ENABLE_KDE)" == "TRUE" +.IF "$(ENABLE_KDE)" == "TRUE" || "$(ENABLE_KDE4)" == "TRUE" + +.IF "$(ENABLE_KDE)" != "" +SCPDEFS+=-DENABLE_KDE +.ENDIF + +.IF "$(ENABLE_KDE4)" != "" +SCPDEFS+=-DENABLE_KDE4 +.ENDIF + PARFILES = \ module_kde.par \ file_kde.par diff --git a/scp2/source/kde/module_kde.scp b/scp2/source/kde/module_kde.scp index 1dce456f6726..28dacbef0583 100644 --- a/scp2/source/kde/module_kde.scp +++ b/scp2/source/kde/module_kde.scp @@ -30,12 +30,24 @@ #include "macros.inc" +#if defined( ENABLE_KDE ) || defined( ENABLE_KDE4 ) Module gid_Module_Optional_Kde ParentID = gid_Module_Optional; Default = YES; PackageInfo = "packinfo_office.txt"; MOD_NAME_DESC(MODULE_OPTIONAL_KDE); Styles = (DONTSHOWINUSERINSTALL); - Files = (gid_File_Lib_Kdebe); + Files = ( +#ifdef ENABLE_KDE + gid_File_Lib_Kdebe +#ifdef ENABLE_KDE4 + , +#endif // ENABLE_KDE4 +#endif // ENABLE_KDE +#ifdef ENABLE_KDE4 + gid_File_Lib_Kde4be +#endif // ENABLE_KDE4 + ); End +#endif diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 98d407c53373..24e8342cc0d5 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -590,6 +590,18 @@ File gid_File_Lib_Fps_Gnome End #endif #endif +#ifdef ENABLE_KDE4 +#ifndef MACOSX +File gid_File_Lib_Fps_Kde4 + TXT_FILE_BODY; + Styles = (PACKED,UNO_COMPONENT); + RegistryID = gid_Starregistry_Services_Rdb; + Dir = gid_Dir_Program; + Name = SPECIAL_COMPONENT_LIB_NAME(fps_kde4.uno); + Regmergefile = "fps-kde4-ucd.txt"; +End +#endif +#endif #endif #ifdef MACOSX @@ -1202,6 +1214,16 @@ File gid_File_Lib_Vclplug_Kde End #endif #endif +#ifdef ENABLE_KDE4 +#ifndef MACOSX +File gid_File_Lib_Vclplug_Kde4 + Name = LIBNAME(vclplug_kde4); + TXT_FILE_BODY; + Styles = (PACKED); + Dir = gid_Dir_Program; +End +#endif +#endif #endif #if defined(QUARTZ) diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index adb0175252c1..646196ec336a 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -79,6 +79,10 @@ SCPDEFS+=-DENABLE_SYSTRAY_GTK SCPDEFS+=-DENABLE_KDE .ENDIF +.IF "$(ENABLE_KDE4)" != "" +SCPDEFS+=-DENABLE_KDE4 +.ENDIF + .IF "$(ENABLE_KAB)" != "" SCPDEFS+=-DENABLE_KAB .ENDIF diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index c08852aae29a..8729bea719f3 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -242,6 +242,7 @@ Module gid_Module_Root_Files_4 gid_File_Lib_Vclplug_Gen, gid_File_Lib_Vclplug_Gtk, gid_File_Lib_Vclplug_Kde, + gid_File_Lib_Vclplug_Kde4, gid_File_Lib_Vclplug_Svp, gid_File_Lib_Basctl, gid_File_Lib_CanvasTools, diff --git a/set_soenv.in b/set_soenv.in index 5e7c56b0e052..c02b3ff603d7 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -1689,8 +1689,12 @@ ToFile( "ENABLE_GIO", "@ENABLE_GIO@", "e" ); ToFile( "ENABLE_KDE", "@ENABLE_KDE@", "e" ); ToFile( "KDE_CFLAGS", "@KDE_CFLAGS@", "e" ); ToFile( "KDE_LIBS", "@KDE_LIBS@", "e" ); -ToFile( "ENABLE_KAB", "@ENABLE_KAB@", "e" ); ToFile( "MOC", "@MOC@", "e" ); +ToFile( "ENABLE_KDE4", "@ENABLE_KDE4@", "e" ); +ToFile( "KDE4_CFLAGS", "@KDE4_CFLAGS@", "e" ); +ToFile( "KDE4_LIBS", "@KDE4_LIBS@", "e" ); +ToFile( "MOC4", "@MOC4@", "e" ); +ToFile( "ENABLE_KAB", "@ENABLE_KAB@", "e" ); ToFile( "PSPRINT", "TRUE", "e" ); ToFile( "MKDEPENDSOLVER", "TRUE", "e" ); # -- cgit From 947666e7ddac58c4d8ea865dbdcee83a5b8c386f Mon Sep 17 00:00:00 2001 From: Release Engineers Date: Fri, 7 Aug 2009 13:32:06 +0000 Subject: CWS-TOOLING: integrate CWS gciteratorfix_DEV300 2009-08-04 10:23:19 +0200 od r274608 : add missing patch flags for libaries swui, msword and xo 2009-08-03 16:42:48 +0200 mav r274586 : #i101899# workaround the wrong error code on MAC 2009-08-03 13:24:44 +0200 tl r274575 : #i103936# fix for grammar checking loop 2009-08-03 12:37:37 +0200 tl r274573 : #i103936# fix for grammar checking loop 2009-08-03 12:10:01 +0200 tl r274572 : #i103936# fix for grammar checking loop 2009-08-03 09:06:49 +0200 tl r274565 : #i103936# fix for grammar checking loop 2009-08-03 09:04:50 +0200 tl r274564 : #i103936# fix for grammar checking loop 2009-07-31 17:52:45 +0200 tl r274545 : #i103936# fix for grammar checking loop --- scp2/source/ooo/file_library_ooo.scp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 24e8342cc0d5..9ffcfb414105 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1,4 +1,4 @@ -/************************************************************************* +************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -559,7 +559,7 @@ End File gid_File_Lib_Fps TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); + Styles = (PACKED,PATCH,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; Dir = gid_Dir_Program; Name = "fps.dll"; @@ -906,8 +906,9 @@ End #endif -#ifdef WNT +STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Lng, lng) +#ifdef WNT File gid_File_Lib_Rebasemsi TXT_FILE_BODY; Name = "rebase.dll"; @@ -1462,7 +1463,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs) STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sw , sw) STD_LIB_FILE_PATCH( gid_File_Lib_Swui, swui) -STD_LIB_FILE( gid_File_Lib_Msword, msword ) +STD_LIB_FILE_PATCH( gid_File_Lib_Msword, msword ) File gid_File_Lib_Sysdtrans TXT_FILE_BODY; -- cgit From 919a300cfbea778cc3fe1c4da29b99c2b4950380 Mon Sep 17 00:00:00 2001 From: Release Engineers Date: Mon, 10 Aug 2009 12:49:40 +0000 Subject: DEV300 --- solenv/inc/minor.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index 1ac537e53e0b..7185775a9c81 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ RSCVERSION=300 -RSCREVISION=300m54(Build:9416) -BUILD=9416 -LAST_MINOR=m54 +RSCREVISION=300m55(Build:9418) +BUILD=9418 +LAST_MINOR=m55 SOURCEVERSION=DEV300 -- cgit From 2f5ecbc5a6d8f3bed84f55d7a47492047904c61b Mon Sep 17 00:00:00 2001 From: Release Engineers Date: Tue, 11 Aug 2009 07:41:26 +0000 Subject: #i10000# regenerate configure --- configure | 19037 +++++++++++++++++++++++++++--------------------------------- 1 file changed, 8621 insertions(+), 10416 deletions(-) diff --git a/configure b/configure index 156b853a06a6..379f0a20b553 100755 --- a/configure +++ b/configure @@ -1,101 +1,37 @@ #! /bin/sh # From configure.in Revision: 1.290 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61. +# Generated by GNU Autoconf 2.57. # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh +# Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh +elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then + set -o posix fi # Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then as_unset=unset else as_unset=false fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -as_nl=' -' -IFS=" "" $as_nl" - -# Find who we are. Look in the path if we contain no directory separator. -case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done -IFS=$as_save_IFS - - ;; -esac -# We did not find ourselves, most probably we were run as `sh COMMAND' -# in which case we are not to be found in the path. -if test "x$as_myself" = x; then - as_myself=$0 -fi -if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } -fi - # Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -done +$as_unset ENV MAIL MAILPATH PS1='$ ' PS2='> ' PS4='+ ' @@ -106,22 +42,21 @@ for as_var in \ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ LC_TELEPHONE LC_TIME do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + $as_unset $as_var fi done # Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then +if expr a : '\(a\)' >/dev/null 2>&1; then as_expr=expr else as_expr=false fi -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then as_basename=basename else as_basename=false @@ -129,447 +64,206 @@ fi # Name of the executable. -as_me=`$as_basename -- "$0" || +as_me=`$as_basename "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || + X"$0" : 'X\(/\)$' \| \ + . : '\(.\)' 2>/dev/null || echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - -# CDPATH. -$as_unset CDPATH - - -if test "x$CONFIG_SHELL" = x; then - if (eval ":") 2>/dev/null; then - as_have_required=yes -else - as_have_required=no -fi - - if test $as_have_required = yes && (eval ": -(as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } + /^X\/\(\/\/\)$/{ s//\1/; q; } + /^X\/\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi +# PATH needs CR, and LINENO needs CR and PATH. +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh fi -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi -test \$exitcode = 0) || { (exit 1); exit 1; } + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" || { + # Find who we are. Look in the path if we contain no path at all + # relative or not. + case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done -( - as_lineno_1=\$LINENO - as_lineno_2=\$LINENO - test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && - test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } -") 2> /dev/null; then - : -else - as_candidate_shells= + ;; + esac + # We did not find ourselves, most probably we were run as `sh COMMAND' + # in which case we are not to be found in the path. + if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then + { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 + { (exit 1); exit 1; }; } + fi + case $CONFIG_SHELL in + '') as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - case $as_dir in + for as_base in sh bash ksh sh5; do + case $as_dir in /*) - for as_base in sh bash ksh sh5; do - as_candidate_shells="$as_candidate_shells $as_dir/$as_base" - done;; - esac -done -IFS=$as_save_IFS - - - for as_shell in $as_candidate_shells $SHELL; do - # Try only shells that exist, to save several forks. - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { ("$as_shell") 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - -: -_ASEOF -}; then - CONFIG_SHELL=$as_shell - as_have_required=yes - if { "$as_shell" 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - -: -(as_func_return () { - (exit $1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = "$1" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test $exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } - -_ASEOF -}; then - break -fi - -fi - - done - - if test "x$CONFIG_SHELL" != x; then - for as_var in BASH_ENV ENV - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - done - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -fi - - - if test $as_have_required = no; then - echo This script requires a shell more modern than all the - echo shells that I found on your system. Please install a - echo modern shell, or manually run the script under such a - echo shell if you do have one. - { (exit 1); exit 1; } -fi - - -fi - -fi - - - -(eval "as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test \$exitcode = 0") || { - echo No shell found that supports shell functions. - echo Please tell autoconf@gnu.org about your system, - echo including any error possibly output before this - echo message -} - - - + if ("$as_dir/$as_base" -c ' as_lineno_1=$LINENO as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } + CONFIG_SHELL=$as_dir/$as_base + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$0" ${1+"$@"} + fi;; + esac + done +done +;; + esac # Create $as_me.lineno as a copy of $as_myself, but with $LINENO # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. + # line-number line before each line; the second 'sed' does the real + # work. The second script uses 'N' to pair each line-number line + # with the numbered line, and appends trailing '-' during + # substitution so that $LINENO is not a special case at line end. # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) + sed '=' <$as_myself | sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + s,$,-, + : loop + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, t loop - s/-\n.*// + s,-$,, + s,^['$as_cr_digits']*\n,, ' >$as_me.lineno && - chmod +x "$as_me.lineno" || + chmod +x $as_me.lineno || { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" + # original and so on. Autoconf is especially sensible to this). + . ./$as_me.lineno # Exit status is that of the last command. exit } -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in --n*) - case `echo 'x\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; - esac;; -*) - ECHO_N='-n';; +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C=' +' ECHO_T=' ' ;; + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; + *) ECHO_N= ECHO_C='\c' ECHO_T= ;; esac -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then +if expr a : '\(a\)' >/dev/null 2>&1; then as_expr=expr else as_expr=false fi rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir -fi echo >conf$$.file if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + # We could just check for DJGPP; but this test a) works b) is more generic + # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). + if test -f conf$$.exe; then + # Don't use ln at all; we don't have any links as_ln_s='cp -p' + else + as_ln_s='ln -s' + fi elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else as_ln_s='cp -p' fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null +rm -f conf$$ conf$$.exe conf$$.file if mkdir -p . 2>/dev/null; then as_mkdir_p=: else - test -d ./-p && rmdir ./-p as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_executable_p="test -f" # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" # Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" + +# IFS +# We need space, tab and new line, in precisely that order. +as_nl=' +' +IFS=" $as_nl" +# CDPATH. +$as_unset CDPATH -exec 7<&0 &1 # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` +exec 6>&1 + # # Initializations. # ac_default_prefix=/usr/local -ac_clean_files= ac_config_libobj_dir=. -LIBOBJS= cross_compiling=no subdirs= MFLAGS= MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} +# Maximum number of lines to put in a shell here document. +# This variable seems obsolete. It should probably be removed, and +# only ac_max_sed_lines should be used. +: ${ac_max_here_lines=38} + # Identity of this package. PACKAGE_NAME= PACKAGE_TARNAME= @@ -580,428 +274,42 @@ PACKAGE_BUGREPORT= # Factoring default headers for most tests. ac_includes_default="\ #include -#ifdef HAVE_SYS_TYPES_H +#if HAVE_SYS_TYPES_H # include #endif -#ifdef HAVE_SYS_STAT_H +#if HAVE_SYS_STAT_H # include #endif -#ifdef STDC_HEADERS +#if STDC_HEADERS # include # include #else -# ifdef HAVE_STDLIB_H +# if HAVE_STDLIB_H # include # endif #endif -#ifdef HAVE_STRING_H -# if !defined STDC_HEADERS && defined HAVE_MEMORY_H +#if HAVE_STRING_H +# if !STDC_HEADERS && HAVE_MEMORY_H # include # endif # include #endif -#ifdef HAVE_STRINGS_H +#if HAVE_STRINGS_H # include #endif -#ifdef HAVE_INTTYPES_H +#if HAVE_INTTYPES_H # include +#else +# if HAVE_STDINT_H +# include +# endif #endif -#ifdef HAVE_STDINT_H -# include -#endif -#ifdef HAVE_UNISTD_H +#if HAVE_UNISTD_H # include #endif" -ac_subst_vars='SHELL -PATH_SEPARATOR -PACKAGE_NAME -PACKAGE_TARNAME -PACKAGE_VERSION -PACKAGE_STRING -PACKAGE_BUGREPORT -exec_prefix -prefix -program_transform_name -bindir -sbindir -libexecdir -datarootdir -datadir -sysconfdir -sharedstatedir -localstatedir -includedir -oldincludedir -docdir -infodir -htmldir -dvidir -pdfdir -psdir -libdir -localedir -mandir -DEFS -ECHO_C -ECHO_N -ECHO_T -LIBS -build_alias -host_alias -target_alias -GREP -EGREP -AWK -SED -LOCAL_SOLENV -_solenv -UPD -SOURCEVERSION -build -build_cpu -build_vendor -build_os -host -host_cpu -host_vendor -host_os -target -target_cpu -target_vendor -target_os -GNUTAR -OSVERSION -PTHREAD_CFLAGS -PTHREAD_LIBS -ENABLE_CRASHDUMP -VC_STANDARD -ENABLE_WERROR -ENABLE_DEBUG -PRODUCT -PROFULLSWITCH -PROEXT -ENABLE_SYMBOLS -DISABLE_STRIP -ENABLE_CUPS -ENABLE_FONTCONFIG -WITH_BINFILTER -ENABLE_DIRECTX -DISABLE_ACTIVEX -DISABLE_ATL -ENABLE_RPATH -WITH_MYSPELL_DICTS -SYSTEM_DICTS -DICT_SYSTEM_DIR -HYPH_SYSTEM_DIR -THES_SYSTEM_DIR -USE_SHELL -WITH_MINGWIN -SHELLPATH -GCC_HOME -CC -CFLAGS -LDFLAGS -CPPFLAGS -ac_ct_CC -EXEEXT -OBJEXT -COMPATH -GCCVER -HAVE_LD_BSYMBOLIC_FUNCTIONS -ENABLE_PCH -NO_HIDS -GNUMAKE -_cc -HAVE_LD_HASH_STYLE -PERL -MSPDB_PATH -COMEX -USE_MINGW -MIDL_PATH -CSC_PATH -FRAME_HOME -CPP -CXX -CXXFLAGS -ac_ct_CXX -CXXCPP -SIZEOF_LONG -WORDS_BIGENDIAN -LFS_CFLAGS -ENABLE_VBA -VBA_EXTENSION -PAM -NEW_SHADOW_API -PAM_LINK -CRYPT_LINK -GXX_INCLUDE_PATH -MINGW_LIB_INCLUDE_PATH -STLPORT4 -STLPORT_VER -USE_SYSTEM_STL -HAVE_GCC_VISIBILITY_FEATURE -ALLOC -BUILD_VER_STRING -SOLAR_JAVA -JAVAINTERPRETER -JAVACOMPILER -JAVACISGCJ -JAVADOC -AWTLIB -JAVAAOTCOMPILER -JAVA_HOME -JDK -JAVAFLAGS -DMAKE -BUILD_DMAKE -EPM -DPKG -PKGMK -BUILD_EPM -PKGFORMAT -RPM -GPERF -MINGWCXX -MINGWSTRIP -BUILD_UNOWINREG -BUILD_QADEVOOO -SYSTEM_STDLIBS -SYSTEM_ZLIB -SYSTEM_JPEG -SYSTEM_EXPAT -PKG_CONFIG -LIBWPD_CFLAGS -LIBWPD_LIBS -SYSTEM_LIBWPD -FREETYPE_CFLAGS -FREETYPE_LIBS -USE_FT_EMBOLDEN -LIBXSLT_CFLAGS -LIBXSLT_LIBS -XSLTPROC -SYSTEM_LIBXSLT -LIBXML_CFLAGS -LIBXML_LIBS -SYSTEM_LIBXML -PYTHON -PYTHON_VERSION -PYTHON_PREFIX -PYTHON_EXEC_PREFIX -PYTHON_PLATFORM -pythondir -pkgpythondir -pyexecdir -pkgpyexecdir -BZIP2 -SYSTEM_PYTHON -PYTHON_CFLAGS -PYTHON_LIBS -HOME -SYSTEM_DB -DB_VERSION -DB_INCLUDES -DB_JAR -SYSTEM_LUCENE -LUCENE_CORE_JAR -LUCENE_ANALYZERS_JAR -SYSTEM_HSQLDB -HSQLDB_JAR -SYSTEM_BSH -BSH_JAR -SERIALIZER_JAR -SYSTEM_SAXON -SAXON_JAR -CURLCONFIG -SYSTEM_CURL -CURL_CFLAGS -CURL_LIBS -SYSTEM_BOOST -SYSTEM_VIGRA -SYSTEM_ODBC_HEADERS -WITH_MOZILLA -WITH_LDAP -WITH_OPENLDAP -MOZ_NSS_CFLAGS -MOZ_NSS_LIBS -NSS_LIB -MOZ_NSPR_CFLAGS -MOZ_NSPR_LIBS -NSPR_LIB -MOZILLAXPCOM_CFLAGS -MOZILLAXPCOM_LIBS -MOZILLA_VERSION -MOZILLA_TOOLKIT -MOZGTK2_CFLAGS -MOZGTK2_LIBS -MOZLIBREQ_CFLAGS -MOZLIBREQ_LIBS -BUILD_MOZAB -SYSTEM_MOZILLA -MOZ_FLAVOUR -MOZ_INC -MOZ_LIB -MOZ_LIB_XPCOM -MOZ_LDAP_CFLAGS -SYSTEM_SANE_HEADER -SYSTEM_GENBRK -SYSTEM_GENCCODE -SYSTEM_GENCMN -SYSTEM_ICU -XMKMF -X_CFLAGS -X_PRE_LIBS -X_LIBS -X_EXTRA_LIBS -XINC -XLIB -XAU_LIBS -DISABLE_XAW -SYSTEM_XRENDER_HEADERS -XRENDER_LINK -XRANDR_CFLAGS -XRANDR_LIBS -XRANDR_DLOPEN -ENABLE_RANDR -DISABLE_NEON -NEON_CFLAGS -NEON_LIBS -OPENSSL_CFLAGS -OPENSSL_LIBS -SYSTEM_OPENSSL -SYSTEM_NEON -NEON_VERSION -ENABLE_AGG -AGG_CFLAGS -AGG_LIBS -SYSTEM_AGG -AGG_VERSION -REDLAND_CFLAGS -REDLAND_LIBS -SYSTEM_REDLAND -HUNSPELL_CFLAGS -HUNSPELL_LIBS -SYSTEM_HUNSPELL -SYSTEM_HYPH -HYPHEN_LIB -SYSTEM_MYTHES -SYSTEM_LPSOLVE -PSDK_HOME -WINDOWS_VISTA_PSDK -DIRECTXSDK_HOME -DIRECTXSDK_LIB -NSIS_PATH -BISON -FLEX -PATCH -GNUCP -GNUPATCH -CYGWIN_PATH -ML_EXE -ASM_HOME -ZIP -UNZIP -ZIP_HOME -WITH_GPC -ENABLE_GTK -ENABLE_KDE -GCONF_CFLAGS -GCONF_LIBS -ENABLE_GCONF -GNOMEVFS_CFLAGS -GNOMEVFS_LIBS -ENABLE_GNOMEVFS -GTK_CFLAGS -GTK_LIBS -DBUS_CFLAGS -DBUS_LIBS -GIO_CFLAGS -GIO_LIBS -ENABLE_GIO -ENABLE_DBUS -ENABLE_SYSTRAY_GTK -CAIRO_CFLAGS -CAIRO_LIBS -ENABLE_CAIRO -BUILD_PIXMAN -SYSTEM_CAIRO -ENABLE_OPENGL -ENABLE_MINIMIZER -ENABLE_PRESENTER_SCREEN -POPPLER_CFLAGS -POPPLER_LIBS -ENABLE_PDFIMPORT -SYSTEM_POPPLER -ENABLE_MEDIAWIKI -SYSTEM_SERVLETAPI -SERVLETAPI_JAR -ENABLE_REPORTBUILDER -SYSTEM_JFREEREPORT -SAC_JAR -LIBXML_JAR -FLUTE_JAR -JFREEREPORT_JAR -LIBBASE_JAR -LIBLAYOUT_JAR -LIBLOADER_JAR -LIBFORMULA_JAR -LIBREPOSITORY_JAR -LIBFONTS_JAR -LIBSERIALIZER_JAR -SYSTEM_APACHE_COMMONS -COMMONS_CODEC_JAR -COMMONS_LANG_JAR -COMMONS_HTTPCLIENT_JAR -COMMONS_LOGGING_JAR -MOC -KDE_CFLAGS -KDE_LIBS -ENABLE_LOCKDOWN -GOBJECT_CFLAGS -GOBJECT_LIBS -ENABLE_EVOAB2 -ENABLE_KAB -WITH_FONTOOO -SYSTEM_MSPACK -WITH_FONTS -WITHOUT_PPDS -WITHOUT_AFMS -SCPDEFS -USE_XINERAMA -XINERAMA_LINK -ANT -ANT_HOME -ANT_LIB -WITH_LANG -WITH_POOR_HELP_LOCALIZATIONS -WITH_DICT -INTRO_BITMAPS -ABOUT_BITMAPS -OOO_VENDOR -UNIXWRAPPERNAME -ENABLE_STATIC_GTK -ENABLE_LAYOUT -VERBOSE -LOCAL_SOLVER -BUILD_TYPE -LIBOBJS -LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS EGREP AWK SED LOCAL_SOLENV _solenv UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os GNUTAR OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP VC_STANDARD ENABLE_WERROR ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS DISABLE_STRIP ENABLE_CUPS ENABLE_FONTCONFIG WITH_BINFILTER ENABLE_DIRECTX DISABLE_ACTIVEX DISABLE_ATL ENABLE_RPATH WITH_MYSPELL_DICTS SYSTEM_DICTS DICT_SYSTEM_DIR HYPH_SYSTEM_DIR THES_SYSTEM_DIR USE_SHELL WITH_MINGWIN SHELLPATH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_LD_BSYMBOLIC_FUNCTIONS ENABLE_PCH NO_HIDS GNUMAKE _cc HAVE_LD_HASH_STYLE PERL MSPDB_PATH COMEX USE_MINGW MIDL_PATH CSC_PATH FRAME_HOME CPP CXX CXXFLAGS ac_ct_CXX CXXCPP SIZEOF_LONG WORDS_BIGENDIAN LFS_CFLAGS ENABLE_VBA VBA_EXTENSION PAM NEW_SHADOW_API PAM_LINK CRYPT_LINK GXX_INCLUDE_PATH MINGW_LIB_INCLUDE_PATH STLPORT4 STLPORT_VER USE_SYSTEM_STL HAVE_GCC_VISIBILITY_FEATURE ALLOC BUILD_VER_STRING SOLAR_JAVA JAVAINTERPRETER JAVACOMPILER JAVACISGCJ JAVADOC AWTLIB JAVAAOTCOMPILER JAVA_HOME JDK JAVAFLAGS DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM PKGFORMAT RPM GPERF MINGWCXX ac_ct_MINGWCXX MINGWSTRIP ac_ct_MINGWSTRIP BUILD_UNOWINREG BUILD_QADEVOOO SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD FREETYPE_CFLAGS FREETYPE_LIBS USE_FT_EMBOLDEN LIBXSLT_CFLAGS LIBXSLT_LIBS XSLTPROC SYSTEM_LIBXSLT LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir BZIP2 SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS HOME SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SYSTEM_LUCENE LUCENE_CORE_JAR LUCENE_ANALYZERS_JAR SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SERIALIZER_JAR SYSTEM_SAXON SAXON_JAR CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_VIGRA SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_LDAP WITH_OPENLDAP MOZ_NSS_CFLAGS MOZ_NSS_LIBS NSS_LIB MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS NSPR_LIB MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZGTK2_CFLAGS MOZGTK2_LIBS MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB SYSTEM_MOZILLA MOZ_FLAVOUR MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER SYSTEM_GENBRK SYSTEM_GENCCODE SYSTEM_GENCMN SYSTEM_ICU X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB XAU_LIBS DISABLE_XAW SYSTEM_XRENDER_HEADERS XRENDER_LINK XRANDR_CFLAGS XRANDR_LIBS XRANDR_DLOPEN ENABLE_RANDR DISABLE_NEON NEON_CFLAGS NEON_LIBS OPENSSL_CFLAGS OPENSSL_LIBS SYSTEM_OPENSSL SYSTEM_NEON NEON_VERSION ENABLE_AGG AGG_CFLAGS AGG_LIBS SYSTEM_AGG AGG_VERSION REDLAND_CFLAGS REDLAND_LIBS SYSTEM_REDLAND HUNSPELL_CFLAGS HUNSPELL_LIBS SYSTEM_HUNSPELL SYSTEM_HYPH HYPHEN_LIB SYSTEM_MYTHES SYSTEM_LPSOLVE PSDK_HOME WINDOWS_VISTA_PSDK DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH BISON FLEX PATCH GNUCP GNUPATCH CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME WITH_GPC ENABLE_GTK ENABLE_KDE ENABLE_KDE4 GCONF_CFLAGS GCONF_LIBS ENABLE_GCONF GNOMEVFS_CFLAGS GNOMEVFS_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS DBUS_CFLAGS DBUS_LIBS GIO_CFLAGS GIO_LIBS ENABLE_GIO ENABLE_DBUS ENABLE_SYSTRAY_GTK CAIRO_CFLAGS CAIRO_LIBS ENABLE_CAIRO BUILD_PIXMAN SYSTEM_CAIRO ENABLE_OPENGL ENABLE_MINIMIZER ENABLE_PRESENTER_SCREEN POPPLER_CFLAGS POPPLER_LIBS ENABLE_PDFIMPORT SYSTEM_POPPLER ENABLE_MEDIAWIKI SYSTEM_SERVLETAPI SERVLETAPI_JAR ENABLE_REPORTBUILDER SYSTEM_JFREEREPORT SAC_JAR LIBXML_JAR FLUTE_JAR JFREEREPORT_JAR LIBBASE_JAR LIBLAYOUT_JAR LIBLOADER_JAR LIBFORMULA_JAR LIBREPOSITORY_JAR LIBFONTS_JAR LIBSERIALIZER_JAR SYSTEM_APACHE_COMMONS COMMONS_CODEC_JAR COMMONS_LANG_JAR COMMONS_HTTPCLIENT_JAR COMMONS_LOGGING_JAR MOC KDE_CFLAGS KDE_LIBS MOC4 KDE4_CFLAGS KDE4_LIBS ENABLE_LOCKDOWN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTOOO SYSTEM_MSPACK WITH_FONTS WITHOUT_PPDS WITHOUT_AFMS SCPDEFS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB WITH_LANG WITH_POOR_HELP_LOCALIZATIONS WITH_DICT INTRO_BITMAPS ABOUT_BITMAPS OOO_VENDOR UNIXWRAPPERNAME ENABLE_STATIC_GTK ENABLE_LAYOUT VERBOSE LOCAL_SOLVER BUILD_TYPE LIBOBJS LTLIBOBJS' ac_subst_files='' - ac_precious_vars='build_alias -host_alias -target_alias -CC -CFLAGS -LDFLAGS -LIBS -CPPFLAGS -CPP -CXX -CXXFLAGS -CCC -CXXCPP -XMKMF' - # Initialize some variables set by options. ac_init_help= @@ -1028,48 +336,34 @@ x_libraries=NONE # and all the variables that are supposed to be based on exec_prefix # by default will actually change. # Use braces instead of parens because sh, perl, etc. also accept them. -# (The list follows the same order as the GNU Coding Standards.) bindir='${exec_prefix}/bin' sbindir='${exec_prefix}/sbin' libexecdir='${exec_prefix}/libexec' -datarootdir='${prefix}/share' -datadir='${datarootdir}' +datadir='${prefix}/share' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +libdir='${exec_prefix}/lib' includedir='${prefix}/include' oldincludedir='/usr/include' -docdir='${datarootdir}/doc/${PACKAGE}' -infodir='${datarootdir}/info' -htmldir='${docdir}' -dvidir='${docdir}' -pdfdir='${docdir}' -psdir='${docdir}' -libdir='${exec_prefix}/lib' -localedir='${datarootdir}/locale' -mandir='${datarootdir}/man' +infodir='${prefix}/info' +mandir='${prefix}/man' ac_prev= -ac_dashdash= for ac_option do # If the previous option needs an argument, assign it. if test -n "$ac_prev"; then - eval $ac_prev=\$ac_option + eval "$ac_prev=\$ac_option" ac_prev= continue fi - case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; - esac + ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` # Accept the important Cygnus configure options, so we can diagnose typos. - case $ac_dashdash$ac_option in - --) - ac_dashdash=yes ;; + case $ac_option in -bindir | --bindir | --bindi | --bind | --bin | --bi) ac_prev=bindir ;; @@ -1091,45 +385,33 @@ do --config-cache | -C) cache_file=config.cache ;; - -datadir | --datadir | --datadi | --datad) + -datadir | --datadir | --datadi | --datad | --data | --dat | --da) ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=*) + -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ + | --da=*) datadir=$ac_optarg ;; - -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ - | --dataroo | --dataro | --datar) - ac_prev=datarootdir ;; - -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ - | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) - datarootdir=$ac_optarg ;; - -disable-* | --disable-*) ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && + expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=no ;; - - -docdir | --docdir | --docdi | --doc | --do) - ac_prev=docdir ;; - -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) - docdir=$ac_optarg ;; - - -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) - ac_prev=dvidir ;; - -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) - dvidir=$ac_optarg ;; + ac_feature=`echo $ac_feature | sed 's/-/_/g'` + eval "enable_$ac_feature=no" ;; -enable-* | --enable-*) ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && + expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=\$ac_optarg ;; + ac_feature=`echo $ac_feature | sed 's/-/_/g'` + case $ac_option in + *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; + *) ac_optarg=yes ;; + esac + eval "enable_$ac_feature='$ac_optarg'" ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -1156,12 +438,6 @@ do -host=* | --host=* | --hos=* | --ho=*) host_alias=$ac_optarg ;; - -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) - ac_prev=htmldir ;; - -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ - | --ht=*) - htmldir=$ac_optarg ;; - -includedir | --includedir | --includedi | --included | --include \ | --includ | --inclu | --incl | --inc) ac_prev=includedir ;; @@ -1186,16 +462,13 @@ do | --libexe=* | --libex=* | --libe=*) libexecdir=$ac_optarg ;; - -localedir | --localedir | --localedi | --localed | --locale) - ac_prev=localedir ;; - -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) - localedir=$ac_optarg ;; - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst | --locals) + | --localstate | --localstat | --localsta | --localst \ + | --locals | --local | --loca | --loc | --lo) ac_prev=localstatedir ;; -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) + | --localstate=* | --localstat=* | --localsta=* | --localst=* \ + | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) localstatedir=$ac_optarg ;; -mandir | --mandir | --mandi | --mand | --man | --ma | --m) @@ -1260,16 +533,6 @@ do | --progr-tra=* | --program-tr=* | --program-t=*) program_transform_name=$ac_optarg ;; - -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) - ac_prev=pdfdir ;; - -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) - pdfdir=$ac_optarg ;; - - -psdir | --psdir | --psdi | --psd | --ps) - ac_prev=psdir ;; - -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) - psdir=$ac_optarg ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; @@ -1322,20 +585,24 @@ do -with-* | --with-*) ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && + expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=\$ac_optarg ;; + ac_package=`echo $ac_package| sed 's/-/_/g'` + case $ac_option in + *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; + *) ac_optarg=yes ;; + esac + eval "with_$ac_package='$ac_optarg'" ;; -without-* | --without-*) ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && + expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=no ;; + ac_package=`echo $ac_package | sed 's/-/_/g'` + eval "with_$ac_package=no" ;; --x) # Obsolete; use --with-x. @@ -1366,7 +633,8 @@ Try \`$0 --help' for more information." >&2 expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 { (exit 1); exit 1; }; } - eval $ac_envvar=\$ac_optarg + ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` + eval "$ac_envvar='$ac_optarg'" export $ac_envvar ;; *) @@ -1386,19 +654,27 @@ if test -n "$ac_prev"; then { (exit 1); exit 1; }; } fi -# Be sure to have absolute directory names. -for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ - datadir sysconfdir sharedstatedir localstatedir includedir \ - oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir +# Be sure to have absolute paths. +for ac_var in exec_prefix prefix do - eval ac_val=\$$ac_var + eval ac_val=$`echo $ac_var` case $ac_val in - [\\/$]* | ?:[\\/]* ) continue;; - NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + [\\/$]* | ?:[\\/]* | NONE | '' ) ;; + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; };; + esac +done + +# Be sure to have absolute paths. +for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ + localstatedir libdir includedir oldincludedir infodir mandir +do + eval ac_val=$`echo $ac_var` + case $ac_val in + [\\/$]* | ?:[\\/]* ) ;; + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; };; esac - { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } done # There might be people who depend on the old broken behavior: `$host' @@ -1425,76 +701,86 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias- test "$silent" = yes && exec 6>/dev/null -ac_pwd=`pwd` && test -n "$ac_pwd" && -ac_ls_di=`ls -di .` && -ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - { echo "$as_me: error: Working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } -test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - { echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } - - # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes - # Try the directory containing this script, then the parent directory. - ac_confdir=`$as_dirname -- "$0" || + # Try the directory containing this script, then its parent. + ac_confdir=`(dirname "$0") 2>/dev/null || $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$0" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` srcdir=$ac_confdir - if test ! -r "$srcdir/$ac_unique_file"; then + if test ! -r $srcdir/$ac_unique_file; then srcdir=.. fi else ac_srcdir_defaulted=no fi -if test ! -r "$srcdir/$ac_unique_file"; then - test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 +if test ! -r $srcdir/$ac_unique_file; then + if test "$ac_srcdir_defaulted" = yes; then + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 { (exit 1); exit 1; }; } -fi -ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } - pwd)` -# When building in place, set srcdir=. -if test "$ac_abs_confdir" = "$ac_pwd"; then - srcdir=. -fi -# Remove unnecessary trailing slashes from srcdir. -# Double slashes in file names in object file debugging info -# mess up M-x gdb in Emacs. -case $srcdir in -*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; -esac -for ac_var in $ac_precious_vars; do - eval ac_env_${ac_var}_set=\${${ac_var}+set} - eval ac_env_${ac_var}_value=\$${ac_var} - eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} - eval ac_cv_env_${ac_var}_value=\$${ac_var} -done + else + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 + { (exit 1); exit 1; }; } + fi +fi +(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || + { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 + { (exit 1); exit 1; }; } +srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` +ac_env_build_alias_set=${build_alias+set} +ac_env_build_alias_value=$build_alias +ac_cv_env_build_alias_set=${build_alias+set} +ac_cv_env_build_alias_value=$build_alias +ac_env_host_alias_set=${host_alias+set} +ac_env_host_alias_value=$host_alias +ac_cv_env_host_alias_set=${host_alias+set} +ac_cv_env_host_alias_value=$host_alias +ac_env_target_alias_set=${target_alias+set} +ac_env_target_alias_value=$target_alias +ac_cv_env_target_alias_set=${target_alias+set} +ac_cv_env_target_alias_value=$target_alias +ac_env_CC_set=${CC+set} +ac_env_CC_value=$CC +ac_cv_env_CC_set=${CC+set} +ac_cv_env_CC_value=$CC +ac_env_CFLAGS_set=${CFLAGS+set} +ac_env_CFLAGS_value=$CFLAGS +ac_cv_env_CFLAGS_set=${CFLAGS+set} +ac_cv_env_CFLAGS_value=$CFLAGS +ac_env_LDFLAGS_set=${LDFLAGS+set} +ac_env_LDFLAGS_value=$LDFLAGS +ac_cv_env_LDFLAGS_set=${LDFLAGS+set} +ac_cv_env_LDFLAGS_value=$LDFLAGS +ac_env_CPPFLAGS_set=${CPPFLAGS+set} +ac_env_CPPFLAGS_value=$CPPFLAGS +ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} +ac_cv_env_CPPFLAGS_value=$CPPFLAGS +ac_env_CPP_set=${CPP+set} +ac_env_CPP_value=$CPP +ac_cv_env_CPP_set=${CPP+set} +ac_cv_env_CPP_value=$CPP +ac_env_CXX_set=${CXX+set} +ac_env_CXX_value=$CXX +ac_cv_env_CXX_set=${CXX+set} +ac_cv_env_CXX_value=$CXX +ac_env_CXXFLAGS_set=${CXXFLAGS+set} +ac_env_CXXFLAGS_value=$CXXFLAGS +ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set} +ac_cv_env_CXXFLAGS_value=$CXXFLAGS +ac_env_CXXCPP_set=${CXXCPP+set} +ac_env_CXXCPP_value=$CXXCPP +ac_cv_env_CXXCPP_set=${CXXCPP+set} +ac_cv_env_CXXCPP_value=$CXXCPP # # Report the --help message. @@ -1523,11 +809,14 @@ Configuration: -n, --no-create do not create output files --srcdir=DIR find the sources in DIR [configure dir or \`..'] +_ACEOF + + cat <<_ACEOF Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] + [$ac_default_prefix] --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] + [PREFIX] By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify @@ -1540,22 +829,15 @@ Fine tuning of the installation directories: --bindir=DIR user executables [EPREFIX/bin] --sbindir=DIR system admin executables [EPREFIX/sbin] --libexecdir=DIR program executables [EPREFIX/libexec] + --datadir=DIR read-only architecture-independent data [PREFIX/share] --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] - --infodir=DIR info documentation [DATAROOTDIR/info] - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] - --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] - --pdfdir=DIR pdf documentation [DOCDIR] - --psdir=DIR ps documentation [DOCDIR] + --infodir=DIR info documentation [PREFIX/info] + --mandir=DIR man documentation [PREFIX/man] _ACEOF cat <<\_ACEOF @@ -1701,6 +983,10 @@ Optional Features: --disable-kdeab Disable the KDE address book support + --enable-kde4 Determines whether to use Qt4/KDE4 vclplug on platforms + where Qt4 and KDE4 are available. May be used with --enable-kde + if you want to support both KDE3 and KDE4. + --disable-binfilter Disable legacy binary file formats filters --disable-rpath Disable the use of relative paths in shared libraries @@ -2138,99 +1424,97 @@ Some influential environment variables: CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory - LIBS libraries to pass to the linker, e.g. -l - CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if - you have headers in a nonstandard directory + CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have + headers in a nonstandard directory CPP C preprocessor CXX C++ compiler command CXXFLAGS C++ compiler flags CXXCPP C++ preprocessor - XMKMF Path to xmkmf, Makefile generator for X Window System Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. _ACEOF -ac_status=$? fi if test "$ac_init_help" = "recursive"; then # If there are subdirs, report their specific --help. + ac_popdir=`pwd` for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d "$ac_dir" || continue + test -d $ac_dir || continue ac_builddir=. -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) +if test "$ac_dir" != .; then ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix + # A "../" for each directory in $ac_dir_suffix. + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +else + ac_dir_suffix= ac_top_builddir= +fi case $srcdir in - .) # We are building in place. + .) # No --srcdir option. We are building in place. ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. + if test -z "$ac_top_builddir"; then + ac_top_srcdir=. + else + ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` + fi ;; + [\\/]* | ?:[\\/]* ) # Absolute path. ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - cd "$ac_dir" || { ac_status=$?; continue; } - # Check for guested configure. - if test -f "$ac_srcdir/configure.gnu"; then - echo && - $SHELL "$ac_srcdir/configure.gnu" --help=recursive - elif test -f "$ac_srcdir/configure"; then - echo && - $SHELL "$ac_srcdir/configure" --help=recursive + ac_top_srcdir=$srcdir ;; + *) # Relative path. + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_builddir$srcdir ;; +esac +# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be +# absolute. +ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` +ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` +ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` +ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` + + cd $ac_dir + # Check for guested configure; otherwise get Cygnus style configure. + if test -f $ac_srcdir/configure.gnu; then + echo + $SHELL $ac_srcdir/configure.gnu --help=recursive + elif test -f $ac_srcdir/configure; then + echo + $SHELL $ac_srcdir/configure --help=recursive + elif test -f $ac_srcdir/configure.ac || + test -f $ac_srcdir/configure.in; then + echo + $ac_configure --help else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi || ac_status=$? - cd "$ac_pwd" || { ac_status=$?; break; } + fi + cd $ac_popdir done fi -test -n "$ac_init_help" && exit $ac_status +test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -configure -generated by GNU Autoconf 2.61 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 +Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF - exit + exit 0 fi -cat >config.log <<_ACEOF +exec 5>config.log +cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.61. Invocation command line was +generated by GNU Autoconf 2.57. Invocation command line was $ $0 $@ _ACEOF -exec 5>>config.log { cat <<_ASUNAME ## --------- ## @@ -2249,7 +1533,7 @@ uname -v = `(uname -v) 2>/dev/null || echo unknown` /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` +hostinfo = `(hostinfo) 2>/dev/null || echo unknown` /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` @@ -2263,7 +1547,6 @@ do test -z "$as_dir" && as_dir=. echo "PATH: $as_dir" done -IFS=$as_save_IFS } >&5 @@ -2285,6 +1568,7 @@ _ACEOF ac_configure_args= ac_configure_args0= ac_configure_args1= +ac_sep= ac_must_keep_next=false for ac_pass in 1 2 do @@ -2295,7 +1579,7 @@ do -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) continue ;; - *\'*) + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in @@ -2303,21 +1587,23 @@ do 2) ac_configure_args1="$ac_configure_args1 '$ac_arg'" if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. + ac_must_keep_next=false # Got value, back to normal. else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac fi - ac_configure_args="$ac_configure_args '$ac_arg'" + ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" + # Get rid of the leading space. + ac_sep=" " ;; esac done @@ -2328,8 +1614,8 @@ $as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_ # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there # would cause problems or look ugly. -# WARNING: Use '\'' to represent an apostrophe within the trap. -# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. +# WARNING: Be sure not to use single quotes in there, as some shells, +# such as our DU 5.0 friend, will then `close' the trap. trap 'exit_status=$? # Save into config.log some information that might help in debugging. { @@ -2342,34 +1628,20 @@ trap 'exit_status=$? _ASBOX echo # The following way of writing the cache mishandles newlines in values, -( - for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - *) $as_unset $ac_var ;; - esac ;; - esac - done +{ (set) 2>&1 | - case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( - *${as_nl}ac_space=\ *) + case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in + *ac_space=\ *) sed -n \ - "s/'\''/'\''\\\\'\'''\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" - ;; #( + "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" + ;; *) - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + sed -n \ + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; - esac | - sort -) + esac; +} echo cat <<\_ASBOX @@ -2380,28 +1652,22 @@ _ASBOX echo for ac_var in $ac_subst_vars do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - echo "$ac_var='\''$ac_val'\''" + eval ac_val=$`echo $ac_var` + echo "$ac_var='"'"'$ac_val'"'"'" done | sort echo if test -n "$ac_subst_files"; then cat <<\_ASBOX -## ------------------- ## -## File substitutions. ## -## ------------------- ## +## ------------- ## +## Output files. ## +## ------------- ## _ASBOX echo for ac_var in $ac_subst_files do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - echo "$ac_var='\''$ac_val'\''" + eval ac_val=$`echo $ac_var` + echo "$ac_var='"'"'$ac_val'"'"'" done | sort echo fi @@ -2413,24 +1679,26 @@ _ASBOX ## ----------- ## _ASBOX echo - cat confdefs.h + sed "/^$/d" confdefs.h | sort echo fi test "$ac_signal" != 0 && echo "$as_me: caught signal $ac_signal" echo "$as_me: exit $exit_status" } >&5 - rm -f core *.core core.conftest.* && - rm -f -r conftest* confdefs* conf$$* $ac_clean_files && + rm -f core core.* *.core && + rm -rf conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status -' 0 + ' 0 for ac_signal in 1 2 13 15; do trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal done ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -f -r conftest* confdefs.h +rm -rf conftest* confdefs.h +# AIX cpp loses on an empty file, so make sure it contains at least a newline. +echo >confdefs.h # Predefined preprocessor variables. @@ -2461,17 +1729,14 @@ _ACEOF # Let the site file select an alternate cache file if it wants to. # Prefer explicitly selected file to automatically selected ones. -if test -n "$CONFIG_SITE"; then - set x "$CONFIG_SITE" -elif test "x$prefix" != xNONE; then - set x "$prefix/share/config.site" "$prefix/etc/config.site" -else - set x "$ac_default_prefix/share/config.site" \ - "$ac_default_prefix/etc/config.site" +if test -z "$CONFIG_SITE"; then + if test "x$prefix" != xNONE; then + CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" + else + CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" + fi fi -shift -for ac_site_file -do +for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} @@ -2487,8 +1752,8 @@ if test -r "$cache_file"; then { echo "$as_me:$LINENO: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in - [\\/]* | ?:[\\/]* ) . "$cache_file";; - *) . "./$cache_file";; + [\\/]* | ?:[\\/]* ) . $cache_file;; + *) . ./$cache_file;; esac fi else @@ -2500,11 +1765,12 @@ fi # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false -for ac_var in $ac_precious_vars; do +for ac_var in `(set) 2>&1 | + sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do eval ac_old_set=\$ac_cv_env_${ac_var}_set eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val=\$ac_cv_env_${ac_var}_value - eval ac_new_val=\$ac_env_${ac_var}_value + eval ac_old_val="\$ac_cv_env_${ac_var}_value" + eval ac_new_val="\$ac_env_${ac_var}_value" case $ac_old_set,$ac_new_set in set,) { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 @@ -2517,19 +1783,20 @@ echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 + { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 + { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: + ac_cache_corrupted=: fi;; esac # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) + ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in @@ -2546,6 +1813,12 @@ echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start ov { (exit 1); exit 1; }; } fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + @@ -2562,1016 +1835,1016 @@ fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu echo "$@" >config.parms -# Check whether --with-gnu-patch was given. +# Check whether --with-gnu-patch or --without-gnu-patch was given. if test "${with_gnu_patch+set}" = set; then - withval=$with_gnu_patch; -fi + withval="$with_gnu_patch" +fi; -# Check whether --with-agg was given. +# Check whether --with-agg or --without-agg was given. if test "${with_agg+set}" = set; then - withval=$with_agg; + withval="$with_agg" + else with_agg=yes -fi +fi; - -# Check whether --with-gnu-cp was given. +# Check whether --with-gnu-cp or --without-gnu-cp was given. if test "${with_gnu_cp+set}" = set; then - withval=$with_gnu_cp; -fi + withval="$with_gnu_cp" +fi; -# Check whether --with-gpc was given. +# Check whether --with-gpc or --without-gpc was given. if test "${with_gpc+set}" = set; then - withval=$with_gpc; + withval="$with_gpc" + else if test ! -e ./external/gpc/gpc.c && test ! -e ./external/gpc/gpc.h; then without_gpc=yes; fi -fi - -# Check whether --enable-ldap was given. +fi; +# Check whether --enable-ldap or --disable-ldap was given. if test "${enable_ldap+set}" = set; then - enableval=$enable_ldap; -fi + enableval="$enable_ldap" +fi; -# Check whether --with-openldap was given. +# Check whether --with-openldap or --without-openldap was given. if test "${with_openldap+set}" = set; then - withval=$with_openldap; -fi + withval="$with_openldap" -# Check whether --enable-lockdown was given. +fi; +# Check whether --enable-lockdown or --disable-lockdown was given. if test "${enable_lockdown+set}" = set; then - enableval=$enable_lockdown; -fi + enableval="$enable_lockdown" -# Check whether --enable-vba was given. +fi; +# Check whether --enable-vba or --disable-vba was given. if test "${enable_vba+set}" = set; then - enableval=$enable_vba; -fi + enableval="$enable_vba" +fi; -# Check whether --with-vba-package-format was given. +# Check whether --with-vba-package-format or --without-vba-package-format was given. if test "${with_vba_package_format+set}" = set; then - withval=$with_vba_package_format; -fi + withval="$with_vba_package_format" -# Check whether --enable-pch was given. +fi; +# Check whether --enable-pch or --disable-pch was given. if test "${enable_pch+set}" = set; then - enableval=$enable_pch; -fi + enableval="$enable_pch" -# Check whether --enable-hids was given. +fi; +# Check whether --enable-hids or --disable-hids was given. if test "${enable_hids+set}" = set; then - enableval=$enable_hids; -fi + enableval="$enable_hids" -# Check whether --enable-mozilla was given. +fi; +# Check whether --enable-mozilla or --disable-mozilla was given. if test "${enable_mozilla+set}" = set; then - enableval=$enable_mozilla; + enableval="$enable_mozilla" + else enable_mozilla="yes" -fi +fi; - -# Check whether --with-fonts was given. +# Check whether --with-fonts or --without-fonts was given. if test "${with_fonts+set}" = set; then - withval=$with_fonts; -fi + withval="$with_fonts" +fi; -# Check whether --with-ppds was given. +# Check whether --with-ppds or --without-ppds was given. if test "${with_ppds+set}" = set; then - withval=$with_ppds; -fi + withval="$with_ppds" +fi; -# Check whether --with-afms was given. +# Check whether --with-afms or --without-afms was given. if test "${with_afms+set}" = set; then - withval=$with_afms; -fi + withval="$with_afms" -# Check whether --enable-epm was given. +fi; +# Check whether --enable-epm or --disable-epm was given. if test "${enable_epm+set}" = set; then - enableval=$enable_epm; + enableval="$enable_epm" + else enable_epm="yes" -fi +fi; - -# Check whether --with-epm was given. +# Check whether --with-epm or --without-epm was given. if test "${with_epm+set}" = set; then - withval=$with_epm; -fi + withval="$with_epm" +fi; -# Check whether --with-package-format was given. +# Check whether --with-package-format or --without-package-format was given. if test "${with_package_format+set}" = set; then - withval=$with_package_format; -fi + withval="$with_package_format" -# Check whether --enable-odk was given. +fi; +# Check whether --enable-odk or --disable-odk was given. if test "${enable_odk+set}" = set; then - enableval=$enable_odk; + enableval="$enable_odk" + else enable_odk="yes" -fi - -# Check whether --enable-qadevooo was given. +fi; +# Check whether --enable-qadevooo or --disable-qadevooo was given. if test "${enable_qadevooo+set}" = set; then - enableval=$enable_qadevooo; + enableval="$enable_qadevooo" + else enable_qadevooo="yes" -fi - -# Check whether --enable-fontooo was given. +fi; +# Check whether --enable-fontooo or --disable-fontooo was given. if test "${enable_fontooo+set}" = set; then - enableval=$enable_fontooo; + enableval="$enable_fontooo" + else enable_fontooo="yes" -fi - -# Check whether --enable-mathmldtd was given. +fi; +# Check whether --enable-mathmldtd or --disable-mathmldtd was given. if test "${enable_mathmldtd+set}" = set; then - enableval=$enable_mathmldtd; + enableval="$enable_mathmldtd" + else enable_mathmldtd="yes" -fi - -# Check whether --enable-evolution2 was given. +fi; +# Check whether --enable-evolution2 or --disable-evolution2 was given. if test "${enable_evolution2+set}" = set; then - enableval=$enable_evolution2; -fi + enableval="$enable_evolution2" +fi; -# Check whether --with-system-stdlibs was given. +# Check whether --with-system-stdlibs or --without-system-stdlibs was given. if test "${with_system_stdlibs+set}" = set; then - withval=$with_system_stdlibs; + withval="$with_system_stdlibs" + else checkforprelink=yes -fi +fi; - -# Check whether --with-system-mspack was given. +# Check whether --with-system-mspack or --without-system-mspack was given. if test "${with_system_mspack+set}" = set; then - withval=$with_system_mspack; -fi + withval="$with_system_mspack" -# Check whether --enable-cups was given. +fi; +# Check whether --enable-cups or --disable-cups was given. if test "${enable_cups+set}" = set; then - enableval=$enable_cups; + enableval="$enable_cups" + else enable_cups=yes -fi - -# Check whether --enable-fontconfig was given. +fi; +# Check whether --enable-fontconfig or --disable-fontconfig was given. if test "${enable_fontconfig+set}" = set; then - enableval=$enable_fontconfig; + enableval="$enable_fontconfig" + else enable_fontconfig=yes -fi - -# Check whether --enable-directx was given. +fi; +# Check whether --enable-directx or --disable-directx was given. if test "${enable_directx+set}" = set; then - enableval=$enable_directx; + enableval="$enable_directx" + else enable_directx=yes -fi - -# Check whether --enable-activex was given. +fi; +# Check whether --enable-activex or --disable-activex was given. if test "${enable_activex+set}" = set; then - enableval=$enable_activex; -fi + enableval="$enable_activex" +fi; -# Check whether --enable-atl was given. +# Check whether --enable-atl or --disable-atl was given. if test "${enable_atl+set}" = set; then - enableval=$enable_atl; -fi + enableval="$enable_atl" +fi; -# Check whether --enable-symbols was given. +# Check whether --enable-symbols or --disable-symbols was given. if test "${enable_symbols+set}" = set; then - enableval=$enable_symbols; -fi + enableval="$enable_symbols" -# Check whether --enable-strip-solver was given. +fi; +# Check whether --enable-strip-solver or --disable-strip-solver was given. if test "${enable_strip_solver+set}" = set; then - enableval=$enable_strip_solver; -fi + enableval="$enable_strip_solver" -# Check whether --enable-werror was given. +fi; +# Check whether --enable-werror or --disable-werror was given. if test "${enable_werror+set}" = set; then - enableval=$enable_werror; -fi + enableval="$enable_werror" -# Check whether --enable-debug was given. +fi; +# Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then - enableval=$enable_debug; -fi + enableval="$enable_debug" -# Check whether --enable-dbgutil was given. +fi; +# Check whether --enable-dbgutil or --disable-dbgutil was given. if test "${enable_dbgutil+set}" = set; then - enableval=$enable_dbgutil; -fi + enableval="$enable_dbgutil" -# Check whether --enable-crashdump was given. +fi; +# Check whether --enable-crashdump or --disable-crashdump was given. if test "${enable_crashdump+set}" = set; then - enableval=$enable_crashdump; + enableval="$enable_crashdump" + else enable_crashdump=no -fi - -# Check whether --enable-cl-standard was given. +fi; +# Check whether --enable-cl-standard or --disable-cl-standard was given. if test "${enable_cl_standard+set}" = set; then - enableval=$enable_cl_standard; -fi + enableval="$enable_cl_standard" -# Check whether --enable-gtk was given. +fi; +# Check whether --enable-gtk or --disable-gtk was given. if test "${enable_gtk+set}" = set; then - enableval=$enable_gtk; + enableval="$enable_gtk" + else enable_gtk=yes -fi - -# Check whether --enable-systray was given. +fi; +# Check whether --enable-systray or --disable-systray was given. if test "${enable_systray+set}" = set; then - enableval=$enable_systray; + enableval="$enable_systray" + else enable_systray=yes -fi - -# Check whether --enable-cairo was given. +fi; +# Check whether --enable-cairo or --disable-cairo was given. if test "${enable_cairo+set}" = set; then - enableval=$enable_cairo; + enableval="$enable_cairo" + else enable_cairo=no -fi +fi; - -# Check whether --with-system-cairo was given. +# Check whether --with-system-cairo or --without-system-cairo was given. if test "${with_system_cairo+set}" = set; then - withval=$with_system_cairo; -fi + withval="$with_system_cairo" -# Check whether --enable-opengl was given. +fi; +# Check whether --enable-opengl or --disable-opengl was given. if test "${enable_opengl+set}" = set; then - enableval=$enable_opengl; + enableval="$enable_opengl" + else enable_opengl=no -fi - -# Check whether --enable-dbus was given. +fi; +# Check whether --enable-dbus or --disable-dbus was given. if test "${enable_dbus+set}" = set; then - enableval=$enable_dbus; + enableval="$enable_dbus" + else enable_dbus=no -fi - -# Check whether --enable-gconf was given. +fi; +# Check whether --enable-gconf or --disable-gconf was given. if test "${enable_gconf+set}" = set; then - enableval=$enable_gconf; + enableval="$enable_gconf" + else enable_gconf=yes -fi - -# Check whether --enable-gnome-vfs was given. +fi; +# Check whether --enable-gnome-vfs or --disable-gnome-vfs was given. if test "${enable_gnome_vfs+set}" = set; then - enableval=$enable_gnome_vfs; + enableval="$enable_gnome_vfs" + else enable_gnome_vfs=yes -fi - -# Check whether --enable-gio was given. +fi; +# Check whether --enable-gio or --disable-gio was given. if test "${enable_gio+set}" = set; then - enableval=$enable_gio; + enableval="$enable_gio" + else enable_gio=no -fi - -# Check whether --enable-static-gtk was given. +fi; +# Check whether --enable-static-gtk or --disable-static-gtk was given. if test "${enable_static_gtk+set}" = set; then - enableval=$enable_static_gtk; -fi + enableval="$enable_static_gtk" -# Check whether --enable-layout was given. +fi; +# Check whether --enable-layout or --disable-layout was given. if test "${enable_layout+set}" = set; then - enableval=$enable_layout; -fi + enableval="$enable_layout" -# Check whether --enable-build-mozilla was given. +fi; +# Check whether --enable-build-mozilla or --disable-build-mozilla was given. if test "${enable_build_mozilla+set}" = set; then - enableval=$enable_build_mozilla; -fi + enableval="$enable_build_mozilla" +fi; -# Check whether --with-mozilla-version was given. +# Check whether --with-mozilla-version or --without-mozilla-version was given. if test "${with_mozilla_version+set}" = set; then - withval=$with_mozilla_version; -fi + withval="$with_mozilla_version" +fi; -# Check whether --with-mozilla-toolkit was given. +# Check whether --with-mozilla-toolkit or --without-mozilla-toolkit was given. if test "${with_mozilla_toolkit+set}" = set; then - withval=$with_mozilla_toolkit; -fi + withval="$with_mozilla_toolkit" -# Check whether --enable-kde was given. +fi; +# Check whether --enable-kde or --disable-kde was given. if test "${enable_kde+set}" = set; then - enableval=$enable_kde; -fi + enableval="$enable_kde" -# Check whether --enable-kdeab was given. +fi; +# Check whether --enable-kdeab or --disable-kdeab was given. if test "${enable_kdeab+set}" = set; then - enableval=$enable_kdeab; + enableval="$enable_kdeab" + else if test "$enable_kde" = "yes"; then enable_kdeab=yes; fi -fi +fi; +# Check whether --enable-kde4 or --disable-kde4 was given. +if test "${enable_kde4+set}" = set; then + enableval="$enable_kde4" -# Check whether --enable-binfilter was given. +fi; +# Check whether --enable-binfilter or --disable-binfilter was given. if test "${enable_binfilter+set}" = set; then - enableval=$enable_binfilter; + enableval="$enable_binfilter" + else if ! test -d ./binfilter; then enable_binfilter=no; fi -fi - -# Check whether --enable-rpath was given. +fi; +# Check whether --enable-rpath or --disable-rpath was given. if test "${enable_rpath+set}" = set; then - enableval=$enable_rpath; -fi + enableval="$enable_rpath" -# Check whether --enable-pam was given. +fi; +# Check whether --enable-pam or --disable-pam was given. if test "${enable_pam+set}" = set; then - enableval=$enable_pam; -fi + enableval="$enable_pam" -# Check whether --enable-pam-link was given. +fi; +# Check whether --enable-pam-link or --disable-pam-link was given. if test "${enable_pam_link+set}" = set; then - enableval=$enable_pam_link; -fi + enableval="$enable_pam_link" -# Check whether --enable-crypt-link was given. +fi; +# Check whether --enable-crypt-link or --disable-crypt-link was given. if test "${enable_crypt_link+set}" = set; then - enableval=$enable_crypt_link; + enableval="$enable_crypt_link" + else enable_crypt_link=yes -fi - -# Check whether --enable-xrender-link was given. +fi; +# Check whether --enable-xrender-link or --disable-xrender-link was given. if test "${enable_xrender_link+set}" = set; then - enableval=$enable_xrender_link; -fi + enableval="$enable_xrender_link" -# Check whether --enable-randr was given. +fi; +# Check whether --enable-randr or --disable-randr was given. if test "${enable_randr+set}" = set; then - enableval=$enable_randr; + enableval="$enable_randr" + else enable_randr=yes -fi - -# Check whether --enable-randr-link was given. +fi; +# Check whether --enable-randr-link or --disable-randr-link was given. if test "${enable_randr_link+set}" = set; then - enableval=$enable_randr_link; + enableval="$enable_randr_link" + else enable_randr_link=yes -fi +fi; - -# Check whether --with-myspell-dicts was given. +# Check whether --with-myspell-dicts or --without-myspell-dicts was given. if test "${with_myspell_dicts+set}" = set; then - withval=$with_myspell_dicts; -fi + withval="$with_myspell_dicts" +fi; -# Check whether --with-system-dicts was given. +# Check whether --with-system-dicts or --without-system-dicts was given. if test "${with_system_dicts+set}" = set; then - withval=$with_system_dicts; -fi + withval="$with_system_dicts" +fi; -# Check whether --with-external-dict-dir was given. +# Check whether --with-external-dict-dir or --without-external-dict-dir was given. if test "${with_external_dict_dir+set}" = set; then - withval=$with_external_dict_dir; -fi + withval="$with_external_dict_dir" +fi; -# Check whether --with-external-hyph-dir was given. +# Check whether --with-external-hyph-dir or --without-external-hyph-dir was given. if test "${with_external_hyph_dir+set}" = set; then - withval=$with_external_hyph_dir; -fi + withval="$with_external_hyph_dir" +fi; -# Check whether --with-external-thes-dir was given. +# Check whether --with-external-thes-dir or --without-external-thes-dir was given. if test "${with_external_thes_dir+set}" = set; then - withval=$with_external_thes_dir; -fi + withval="$with_external_thes_dir" +fi; -# Check whether --with-system-libs was given. +# Check whether --with-system-libs or --without-system-libs was given. if test "${with_system_libs+set}" = set; then - withval=$with_system_libs; -fi + withval="$with_system_libs" +fi; -# Check whether --with-system-headers was given. +# Check whether --with-system-headers or --without-system-headers was given. if test "${with_system_headers+set}" = set; then - withval=$with_system_headers; -fi + withval="$with_system_headers" +fi; -# Check whether --with-system-jars was given. +# Check whether --with-system-jars or --without-system-jars was given. if test "${with_system_jars+set}" = set; then - withval=$with_system_jars; -fi + withval="$with_system_jars" +fi; -# Check whether --with-system-zlib was given. +# Check whether --with-system-zlib or --without-system-zlib was given. if test "${with_system_zlib+set}" = set; then - withval=$with_system_zlib; -fi + withval="$with_system_zlib" +fi; -# Check whether --with-system-openssl was given. +# Check whether --with-system-openssl or --without-system-openssl was given. if test "${with_system_openssl+set}" = set; then - withval=$with_system_openssl; -fi + withval="$with_system_openssl" +fi; -# Check whether --with-system-jpeg was given. +# Check whether --with-system-jpeg or --without-system-jpeg was given. if test "${with_system_jpeg+set}" = set; then - withval=$with_system_jpeg; -fi + withval="$with_system_jpeg" +fi; -# Check whether --with-system-expat was given. +# Check whether --with-system-expat or --without-system-expat was given. if test "${with_system_expat+set}" = set; then - withval=$with_system_expat; -fi + withval="$with_system_expat" +fi; -# Check whether --with-system-libwpd was given. +# Check whether --with-system-libwpd or --without-system-libwpd was given. if test "${with_system_libwpd+set}" = set; then - withval=$with_system_libwpd; -fi + withval="$with_system_libwpd" +fi; -# Check whether --with-system-libxml was given. +# Check whether --with-system-libxml or --without-system-libxml was given. if test "${with_system_libxml+set}" = set; then - withval=$with_system_libxml; -fi + withval="$with_system_libxml" +fi; -# Check whether --with-system-python was given. +# Check whether --with-system-python or --without-system-python was given. if test "${with_system_python+set}" = set; then - withval=$with_system_python; -fi + withval="$with_system_python" +fi; -# Check whether --with-system-icu was given. +# Check whether --with-system-icu or --without-system-icu was given. if test "${with_system_icu+set}" = set; then - withval=$with_system_icu; -fi + withval="$with_system_icu" +fi; -# Check whether --with-system-poppler was given. +# Check whether --with-system-poppler or --without-system-poppler was given. if test "${with_system_poppler+set}" = set; then - withval=$with_system_poppler; -fi + withval="$with_system_poppler" +fi; -# Check whether --with-system-db was given. +# Check whether --with-system-db or --without-system-db was given. if test "${with_system_db+set}" = set; then - withval=$with_system_db; -fi + withval="$with_system_db" +fi; -# Check whether --with-system-lucene was given. +# Check whether --with-system-lucene or --without-system-lucene was given. if test "${with_system_lucene+set}" = set; then - withval=$with_system_lucene; -fi + withval="$with_system_lucene" +fi; -# Check whether --with-lucene-core-jar was given. +# Check whether --with-lucene-core-jar or --without-lucene-core-jar was given. if test "${with_lucene_core_jar+set}" = set; then - withval=$with_lucene_core_jar; LUCENE_CORE_JAR="$withval" - -fi + withval="$with_lucene_core_jar" + LUCENE_CORE_JAR="$withval" +fi; -# Check whether --with-lucene-analyzers-jar was given. +# Check whether --with-lucene-analyzers-jar or --without-lucene-analyzers-jar was given. if test "${with_lucene_analyzers_jar+set}" = set; then - withval=$with_lucene_analyzers_jar; LUCENE_ANALYZERS_JAR="$withval" - -fi + withval="$with_lucene_analyzers_jar" + LUCENE_ANALYZERS_JAR="$withval" +fi; -# Check whether --with-system-hsqldb was given. +# Check whether --with-system-hsqldb or --without-system-hsqldb was given. if test "${with_system_hsqldb+set}" = set; then - withval=$with_system_hsqldb; -fi + withval="$with_system_hsqldb" +fi; -# Check whether --with-hsqldb-jar was given. +# Check whether --with-hsqldb-jar or --without-hsqldb-jar was given. if test "${with_hsqldb_jar+set}" = set; then - withval=$with_hsqldb_jar; HSQLDB_JAR="$withval" - -fi + withval="$with_hsqldb_jar" + HSQLDB_JAR="$withval" +fi; -# Check whether --with-system-beanshell was given. +# Check whether --with-system-beanshell or --without-system-beanshell was given. if test "${with_system_beanshell+set}" = set; then - withval=$with_system_beanshell; -fi + withval="$with_system_beanshell" +fi; -# Check whether --with-beanshell-jar was given. +# Check whether --with-beanshell-jar or --without-beanshell-jar was given. if test "${with_beanshell_jar+set}" = set; then - withval=$with_beanshell_jar; BSH_JAR="$withval" + withval="$with_beanshell_jar" + BSH_JAR="$withval" -fi - -# Check whether --enable-minimizer was given. +fi; +# Check whether --enable-minimizer or --disable-minimizer was given. if test "${enable_minimizer+set}" = set; then - enableval=$enable_minimizer; -fi + enableval="$enable_minimizer" -# Check whether --enable-presenter-console was given. +fi; +# Check whether --enable-presenter-console or --disable-presenter-console was given. if test "${enable_presenter_console+set}" = set; then - enableval=$enable_presenter_console; -fi + enableval="$enable_presenter_console" -# Check whether --enable-pdfimport was given. +fi; +# Check whether --enable-pdfimport or --disable-pdfimport was given. if test "${enable_pdfimport+set}" = set; then - enableval=$enable_pdfimport; -fi + enableval="$enable_pdfimport" -# Check whether --enable-wiki-publisher was given. +fi; +# Check whether --enable-wiki-publisher or --disable-wiki-publisher was given. if test "${enable_wiki_publisher+set}" = set; then - enableval=$enable_wiki_publisher; -fi + enableval="$enable_wiki_publisher" +fi; -# Check whether --with-commons-codec-jar was given. +# Check whether --with-commons-codec-jar or --without-commons-codec-jar was given. if test "${with_commons_codec_jar+set}" = set; then - withval=$with_commons_codec_jar; COMMONS_CODEC_JAR="$withval" - -fi + withval="$with_commons_codec_jar" + COMMONS_CODEC_JAR="$withval" +fi; -# Check whether --with-commons-lang-jar was given. +# Check whether --with-commons-lang-jar or --without-commons-lang-jar was given. if test "${with_commons_lang_jar+set}" = set; then - withval=$with_commons_lang_jar; COMMONS_LANG_JAR="$withval" - -fi + withval="$with_commons_lang_jar" + COMMONS_LANG_JAR="$withval" +fi; -# Check whether --with-commons-httpclient-jar was given. +# Check whether --with-commons-httpclient-jar or --without-commons-httpclient-jar was given. if test "${with_commons_httpclient_jar+set}" = set; then - withval=$with_commons_httpclient_jar; COMMONS_HTTPCLIENT_JAR="$withval" - -fi + withval="$with_commons_httpclient_jar" + COMMONS_HTTPCLIENT_JAR="$withval" +fi; -# Check whether --with-commons-logging-jar was given. +# Check whether --with-commons-logging-jar or --without-commons-logging-jar was given. if test "${with_commons_logging_jar+set}" = set; then - withval=$with_commons_logging_jar; COMMONS_LOGGING_JAR="$withval" - -fi + withval="$with_commons_logging_jar" + COMMONS_LOGGING_JAR="$withval" +fi; -# Check whether --with-servlet-api-jar was given. +# Check whether --with-servlet-api-jar or --without-servlet-api-jar was given. if test "${with_servlet_api_jar+set}" = set; then - withval=$with_servlet_api_jar; SERVLETAPI_JAR="$withval" - -fi + withval="$with_servlet_api_jar" + SERVLETAPI_JAR="$withval" -# Check whether --enable-report-builder was given. +fi; +# Check whether --enable-report-builder or --disable-report-builder was given. if test "${enable_report_builder+set}" = set; then - enableval=$enable_report_builder; -fi + enableval="$enable_report_builder" +fi; -# Check whether --with-system-jfreereport was given. +# Check whether --with-system-jfreereport or --without-system-jfreereport was given. if test "${with_system_jfreereport+set}" = set; then - withval=$with_system_jfreereport; -fi + withval="$with_system_jfreereport" +fi; -# Check whether --with-sac-jar was given. +# Check whether --with-sac-jar or --without-sac-jar was given. if test "${with_sac_jar+set}" = set; then - withval=$with_sac_jar; SAC_JAR="$withval" - -fi + withval="$with_sac_jar" + SAC_JAR="$withval" +fi; -# Check whether --with-libxml-jar was given. +# Check whether --with-libxml-jar or --without-libxml-jar was given. if test "${with_libxml_jar+set}" = set; then - withval=$with_libxml_jar; LIBXML_JAR="$withval" - -fi + withval="$with_libxml_jar" + LIBXML_JAR="$withval" +fi; -# Check whether --with-flute-jar was given. +# Check whether --with-flute-jar or --without-flute-jar was given. if test "${with_flute_jar+set}" = set; then - withval=$with_flute_jar; FLUTE_JAR="$withval" - -fi + withval="$with_flute_jar" + FLUTE_JAR="$withval" +fi; -# Check whether --with-jfreereport-jar was given. +# Check whether --with-jfreereport-jar or --without-jfreereport-jar was given. if test "${with_jfreereport_jar+set}" = set; then - withval=$with_jfreereport_jar; JFREEREPORT_JAR="$withval" - -fi + withval="$with_jfreereport_jar" + JFREEREPORT_JAR="$withval" +fi; -# Check whether --with-liblayout-jar was given. +# Check whether --with-liblayout-jar or --without-liblayout-jar was given. if test "${with_liblayout_jar+set}" = set; then - withval=$with_liblayout_jar; LIBLAYOUT_JAR="$withval" - -fi + withval="$with_liblayout_jar" + LIBLAYOUT_JAR="$withval" +fi; -# Check whether --with-libloader-jar was given. +# Check whether --with-libloader-jar or --without-libloader-jar was given. if test "${with_libloader_jar+set}" = set; then - withval=$with_libloader_jar; LIBLOADER_JAR="$withval" - -fi + withval="$with_libloader_jar" + LIBLOADER_JAR="$withval" +fi; -# Check whether --with-libloader-jar was given. +# Check whether --with-libloader-jar or --without-libloader-jar was given. if test "${with_libloader_jar+set}" = set; then - withval=$with_libloader_jar; LIBLOADER_JAR="$withval" - -fi + withval="$with_libloader_jar" + LIBLOADER_JAR="$withval" +fi; -# Check whether --with-libformula-jar was given. +# Check whether --with-libformula-jar or --without-libformula-jar was given. if test "${with_libformula_jar+set}" = set; then - withval=$with_libformula_jar; LIBFORMULA_JAR="$withval" - -fi + withval="$with_libformula_jar" + LIBFORMULA_JAR="$withval" +fi; -# Check whether --with-librepository-jar was given. +# Check whether --with-librepository-jar or --without-librepository-jar was given. if test "${with_librepository_jar+set}" = set; then - withval=$with_librepository_jar; LIBREPOSITORY_JAR="$withval" - -fi + withval="$with_librepository_jar" + LIBREPOSITORY_JAR="$withval" +fi; -# Check whether --with-libfonts-jar was given. +# Check whether --with-libfonts-jar or --without-libfonts-jar was given. if test "${with_libfonts_jar+set}" = set; then - withval=$with_libfonts_jar; LIBFONTS_JAR="$withval" - -fi + withval="$with_libfonts_jar" + LIBFONTS_JAR="$withval" +fi; -# Check whether --with-libserializer-jar was given. +# Check whether --with-libserializer-jar or --without-libserializer-jar was given. if test "${with_libserializer_jar+set}" = set; then - withval=$with_libserializer_jar; LIBSERIALIZER_JAR="$withval" - -fi + withval="$with_libserializer_jar" + LIBSERIALIZER_JAR="$withval" +fi; -# Check whether --with-libbase-jar was given. +# Check whether --with-libbase-jar or --without-libbase-jar was given. if test "${with_libbase_jar+set}" = set; then - withval=$with_libbase_jar; LIBBASE_JAR="$withval" - -fi + withval="$with_libbase_jar" + LIBBASE_JAR="$withval" +fi; -# Check whether --with-system-saxon was given. +# Check whether --with-system-saxon or --without-system-saxon was given. if test "${with_system_saxon+set}" = set; then - withval=$with_system_saxon; -fi + withval="$with_system_saxon" +fi; -# Check whether --with-saxon-jar was given. +# Check whether --with-saxon-jar or --without-saxon-jar was given. if test "${with_saxon_jar+set}" = set; then - withval=$with_saxon_jar; SAXON_JAR="$withval" - -fi + withval="$with_saxon_jar" + SAXON_JAR="$withval" +fi; -# Check whether --with-system-libxslt was given. +# Check whether --with-system-libxslt or --without-system-libxslt was given. if test "${with_system_libxslt+set}" = set; then - withval=$with_system_libxslt; -fi + withval="$with_system_libxslt" +fi; -# Check whether --with-system-odbc was given. +# Check whether --with-system-odbc or --without-system-odbc was given. if test "${with_system_odbc+set}" = set; then - withval=$with_system_odbc; -fi + withval="$with_system_odbc" +fi; -# Check whether --with-system-sane was given. +# Check whether --with-system-sane or --without-system-sane was given. if test "${with_system_sane+set}" = set; then - withval=$with_system_sane; -fi + withval="$with_system_sane" +fi; -# Check whether --with-system-xrender was given. +# Check whether --with-system-xrender or --without-system-xrender was given. if test "${with_system_xrender+set}" = set; then - withval=$with_system_xrender; -fi + withval="$with_system_xrender" +fi; -# Check whether --with-system-curl was given. +# Check whether --with-system-curl or --without-system-curl was given. if test "${with_system_curl+set}" = set; then - withval=$with_system_curl; -fi + withval="$with_system_curl" +fi; -# Check whether --with-system-boost was given. +# Check whether --with-system-boost or --without-system-boost was given. if test "${with_system_boost+set}" = set; then - withval=$with_system_boost; -fi + withval="$with_system_boost" +fi; -# Check whether --with-system-vigra was given. +# Check whether --with-system-vigra or --without-system-vigra was given. if test "${with_system_vigra+set}" = set; then - withval=$with_system_vigra; -fi + withval="$with_system_vigra" -# Check whether --enable-neon was given. +fi; +# Check whether --enable-neon or --disable-neon was given. if test "${enable_neon+set}" = set; then - enableval=$enable_neon; -fi + enableval="$enable_neon" -# Check whether --enable-Xaw was given. +fi; +# Check whether --enable-Xaw or --disable-Xaw was given. if test "${enable_Xaw+set}" = set; then - enableval=$enable_Xaw; -fi + enableval="$enable_Xaw" +fi; -# Check whether --with-system-neon was given. +# Check whether --with-system-neon or --without-system-neon was given. if test "${with_system_neon+set}" = set; then - withval=$with_system_neon; -fi + withval="$with_system_neon" +fi; -# Check whether --with-system-agg was given. +# Check whether --with-system-agg or --without-system-agg was given. if test "${with_system_agg+set}" = set; then - withval=$with_system_agg; -fi + withval="$with_system_agg" +fi; -# Check whether --with-system-hunspell was given. +# Check whether --with-system-hunspell or --without-system-hunspell was given. if test "${with_system_hunspell+set}" = set; then - withval=$with_system_hunspell; -fi + withval="$with_system_hunspell" +fi; -# Check whether --with-system-mythes was given. +# Check whether --with-system-mythes or --without-system-mythes was given. if test "${with_system_mythes+set}" = set; then - withval=$with_system_mythes; -fi + withval="$with_system_mythes" +fi; -# Check whether --with-system-altlinuxhyph was given. +# Check whether --with-system-altlinuxhyph or --without-system-altlinuxhyph was given. if test "${with_system_altlinuxhyph+set}" = set; then - withval=$with_system_altlinuxhyph; -fi + withval="$with_system_altlinuxhyph" +fi; -# Check whether --with-system-lpsolve was given. +# Check whether --with-system-lpsolve or --without-system-lpsolve was given. if test "${with_system_lpsolve+set}" = set; then - withval=$with_system_lpsolve; -fi + withval="$with_system_lpsolve" +fi; -# Check whether --with-system-mozilla was given. +# Check whether --with-system-mozilla or --without-system-mozilla was given. if test "${with_system_mozilla+set}" = set; then - withval=$with_system_mozilla; WITH_SYSTEM_MOZILLA=$withval + withval="$with_system_mozilla" + WITH_SYSTEM_MOZILLA=$withval else WITH_SYSTEM_MOZILLA=no -fi - +fi; -# Check whether --with-stlport was given. +# Check whether --with-stlport or --without-stlport was given. if test "${with_stlport+set}" = set; then - withval=$with_stlport; WITH_STLPORT=$withval + withval="$with_stlport" + WITH_STLPORT=$withval else WITH_STLPORT=auto -fi - +fi; -# Check whether --with-jdk-home was given. +# Check whether --with-jdk-home or --without-jdk-home was given. if test "${with_jdk_home+set}" = set; then - withval=$with_jdk_home; -fi + withval="$with_jdk_home" +fi; -# Check whether --with-gxx_include_path was given. +# Check whether --with-gxx_include_path or --without-gxx_include_path was given. if test "${with_gxx_include_path+set}" = set; then - withval=$with_gxx_include_path; -fi + withval="$with_gxx_include_path" +fi; -# Check whether --with-java was given. +# Check whether --with-java or --without-java was given. if test "${with_java+set}" = set; then - withval=$with_java; if test "$withval" = "yes"; then WITH_JAVA=java; else WITH_JAVA=$withval; fi + withval="$with_java" + if test "$withval" = "yes"; then WITH_JAVA=java; else WITH_JAVA=$withval; fi else WITH_JAVA=java -fi - -# Check whether --enable-gcjaot was given. +fi; +# Check whether --enable-gcjaot or --disable-gcjaot was given. if test "${enable_gcjaot+set}" = set; then - enableval=$enable_gcjaot; -fi + enableval="$enable_gcjaot" +fi; -# Check whether --with-ant-home was given. +# Check whether --with-ant-home or --without-ant-home was given. if test "${with_ant_home+set}" = set; then - withval=$with_ant_home; -fi + withval="$with_ant_home" +fi; -# Check whether --with-perl-home was given. +# Check whether --with-perl-home or --without-perl-home was given. if test "${with_perl_home+set}" = set; then - withval=$with_perl_home; -fi + withval="$with_perl_home" +fi; -# Check whether --with-cl-home was given. +# Check whether --with-cl-home or --without-cl-home was given. if test "${with_cl_home+set}" = set; then - withval=$with_cl_home; -fi + withval="$with_cl_home" +fi; -# Check whether --with-mspdb-path was given. +# Check whether --with-mspdb-path or --without-mspdb-path was given. if test "${with_mspdb_path+set}" = set; then - withval=$with_mspdb_path; -fi + withval="$with_mspdb_path" +fi; -# Check whether --with-midl-path was given. +# Check whether --with-midl-path or --without-midl-path was given. if test "${with_midl_path+set}" = set; then - withval=$with_midl_path; -fi + withval="$with_midl_path" +fi; -# Check whether --with-csc-path was given. +# Check whether --with-csc-path or --without-csc-path was given. if test "${with_csc_path+set}" = set; then - withval=$with_csc_path; -fi + withval="$with_csc_path" +fi; -# Check whether --with-nsis-path was given. +# Check whether --with-nsis-path or --without-nsis-path was given. if test "${with_nsis_path+set}" = set; then - withval=$with_nsis_path; -fi + withval="$with_nsis_path" +fi; -# Check whether --with-frame-home was given. +# Check whether --with-frame-home or --without-frame-home was given. if test "${with_frame_home+set}" = set; then - withval=$with_frame_home; -fi + withval="$with_frame_home" +fi; -# Check whether --with-psdk-home was given. +# Check whether --with-psdk-home or --without-psdk-home was given. if test "${with_psdk_home+set}" = set; then - withval=$with_psdk_home; -fi + withval="$with_psdk_home" +fi; -# Check whether --with-directx-home was given. +# Check whether --with-directx-home or --without-directx-home was given. if test "${with_directx_home+set}" = set; then - withval=$with_directx_home; -fi + withval="$with_directx_home" +fi; -# Check whether --with-local-solenv was given. +# Check whether --with-local-solenv or --without-local-solenv was given. if test "${with_local_solenv+set}" = set; then - withval=$with_local_solenv; -fi + withval="$with_local_solenv" +fi; -# Check whether --with-local-solver was given. +# Check whether --with-local-solver or --without-local-solver was given. if test "${with_local_solver+set}" = set; then - withval=$with_local_solver; -fi + withval="$with_local_solver" -# Check whether --enable-check-only was given. +fi; +# Check whether --enable-check-only or --disable-check-only was given. if test "${enable_check_only+set}" = set; then - enableval=$enable_check_only; -fi + enableval="$enable_check_only" +fi; -# Check whether --with-lang was given. +# Check whether --with-lang or --without-lang was given. if test "${with_lang+set}" = set; then - withval=$with_lang; -fi + withval="$with_lang" +fi; -# Check whether --with-poor-help-localizations was given. +# Check whether --with-poor-help-localizations or --without-poor-help-localizations was given. if test "${with_poor_help_localizations+set}" = set; then - withval=$with_poor_help_localizations; -fi + withval="$with_poor_help_localizations" +fi; -# Check whether --with-dict was given. +# Check whether --with-dict or --without-dict was given. if test "${with_dict+set}" = set; then - withval=$with_dict; -fi + withval="$with_dict" +fi; -# Check whether --with-intro-bitmaps was given. +# Check whether --with-intro-bitmaps or --without-intro-bitmaps was given. if test "${with_intro_bitmaps+set}" = set; then - withval=$with_intro_bitmaps; -fi + withval="$with_intro_bitmaps" +fi; -# Check whether --with-about-bitmaps was given. +# Check whether --with-about-bitmaps or --without-about-bitmaps was given. if test "${with_about_bitmaps+set}" = set; then - withval=$with_about_bitmaps; -fi + withval="$with_about_bitmaps" +fi; -# Check whether --with-vendor was given. +# Check whether --with-vendor or --without-vendor was given. if test "${with_vendor+set}" = set; then - withval=$with_vendor; -fi + withval="$with_vendor" +fi; -# Check whether --with-unix-wrapper was given. +# Check whether --with-unix-wrapper or --without-unix-wrapper was given. if test "${with_unix_wrapper+set}" = set; then - withval=$with_unix_wrapper; -fi + withval="$with_unix_wrapper" +fi; -# Check whether --with-asm-home was given. +# Check whether --with-asm-home or --without-asm-home was given. if test "${with_asm_home+set}" = set; then - withval=$with_asm_home; -fi + withval="$with_asm_home" +fi; -# Check whether --with-os-version was given. +# Check whether --with-os-version or --without-os-version was given. if test "${with_os_version+set}" = set; then - withval=$with_os_version; -fi + withval="$with_os_version" +fi; -# Check whether --with-unzip-home was given. +# Check whether --with-unzip-home or --without-unzip-home was given. if test "${with_unzip_home+set}" = set; then - withval=$with_unzip_home; -fi + withval="$with_unzip_home" +fi; -# Check whether --with-zip-home was given. +# Check whether --with-zip-home or --without-zip-home was given. if test "${with_zip_home+set}" = set; then - withval=$with_zip_home; -fi + withval="$with_zip_home" +fi; -# Check whether --with-mingwin was given. +# Check whether --with-mingwin or --without-mingwin was given. if test "${with_mingwin+set}" = set; then - withval=$with_mingwin; WITH_MINGWIN=$withval + withval="$with_mingwin" + WITH_MINGWIN=$withval else WITH_MINGWIN=0 -fi +fi; - -# Check whether --with-use-shell was given. +# Check whether --with-use-shell or --without-use-shell was given. if test "${with_use_shell+set}" = set; then - withval=$with_use_shell; with_use_shell=$withval + withval="$with_use_shell" + with_use_shell=$withval else with_use_shell="tcsh" -fi +fi; - -# Check whether --with-build-version was given. +# Check whether --with-build-version or --without-build-version was given. if test "${with_build_version+set}" = set; then - withval=$with_build_version; with_build_version=$withval -fi - -# Check whether --enable-sgistl was given. + withval="$with_build_version" + with_build_version=$withval +fi; +# Check whether --enable-sgistl or --disable-sgistl was given. if test "${enable_sgistl+set}" = set; then - enableval=$enable_sgistl; -fi + enableval="$enable_sgistl" +fi; -# Check whether --with-alloc was given. +# Check whether --with-alloc or --without-alloc was given. if test "${with_alloc+set}" = set; then - withval=$with_alloc; -fi + withval="$with_alloc" -# Check whether --enable-verbose was given. +fi; +# Check whether --enable-verbose or --disable-verbose was given. if test "${enable_verbose+set}" = set; then - enableval=$enable_verbose; -fi + enableval="$enable_verbose" +fi; BUILD_TYPE="OOo" @@ -3598,174 +2871,27 @@ echo "* *" echo "********************************************************************" echo "" cat /dev/null > warn -{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 -echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } -if test "${ac_cv_path_GREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Extract the first word of "grep ggrep" to use in msg output -if test -z "$GREP"; then -set dummy grep ggrep; ac_prog_name=$2 -if test "${ac_cv_path_GREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_path_GREP_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue - # Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in -*GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -*) - ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - echo 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` - if test $ac_count -gt ${ac_path_GREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" - ac_path_GREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - - $ac_path_GREP_found && break 3 - done -done - -done -IFS=$as_save_IFS - - -fi - -GREP="$ac_cv_path_GREP" -if test -z "$GREP"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } -fi - -else - ac_cv_path_GREP=$GREP -fi - - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 -echo "${ECHO_T}$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" - - -{ echo "$as_me:$LINENO: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else - # Extract the first word of "egrep" to use in msg output -if test -z "$EGREP"; then -set dummy egrep; ac_prog_name=$2 -if test "${ac_cv_path_EGREP+set}" = set; then +echo "$as_me:$LINENO: checking for egrep" >&5 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6 +if test "${ac_cv_prog_egrep+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_path_EGREP_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue - # Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP -case `"$ac_path_EGREP" --version 2>&1` in -*GNU*) - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -*) - ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - echo 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` - if test $ac_count -gt ${ac_path_EGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP="$ac_path_EGREP" - ac_path_EGREP_max=$ac_count + if echo a | (grep -E '(a|b)') >/dev/null 2>&1 + then ac_cv_prog_egrep='grep -E' + else ac_cv_prog_egrep='egrep' fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - - $ac_path_EGREP_found && break 3 - done -done - -done -IFS=$as_save_IFS - - -fi - -EGREP="$ac_cv_path_EGREP" -if test -z "$EGREP"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } -fi - -else - ac_cv_path_EGREP=$EGREP fi - - - fi -fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 -echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" +echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 +echo "${ECHO_T}$ac_cv_prog_egrep" >&6 + EGREP=$ac_cv_prog_egrep for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3778,34 +2904,32 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { echo "$as_me:$LINENO: result: $AWK" >&5 -echo "${ECHO_T}$AWK" >&6; } + echo "$as_me:$LINENO: result: $AWK" >&5 +echo "${ECHO_T}$AWK" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - test -n "$AWK" && break done # Extract the first word of "$AWK", so it can be a program name with args. set dummy $AWK; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3820,28 +2944,27 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_AWK="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS ;; esac fi AWK=$ac_cv_path_AWK + if test -n "$AWK"; then - { echo "$as_me:$LINENO: result: $AWK" >&5 -echo "${ECHO_T}$AWK" >&6; } + echo "$as_me:$LINENO: result: $AWK" >&5 +echo "${ECHO_T}$AWK" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test -z "$AWK"; then { { echo "$as_me:$LINENO: error: install awk to run this script" >&5 echo "$as_me: error: install awk to run this script" >&2;} @@ -3852,8 +2975,8 @@ for ac_prog in sed do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_SED+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3868,28 +2991,27 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS ;; esac fi SED=$ac_cv_path_SED + if test -n "$SED"; then - { echo "$as_me:$LINENO: result: $SED" >&5 -echo "${ECHO_T}$SED" >&6; } + echo "$as_me:$LINENO: result: $SED" >&5 +echo "${ECHO_T}$SED" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - test -n "$SED" && break done @@ -3899,16 +3021,16 @@ echo "$as_me: error: install sed to run this script" >&2;} { (exit 1); exit 1; }; } fi -{ echo "$as_me:$LINENO: checking for solenv environment" >&5 -echo $ECHO_N "checking for solenv environment... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for solenv environment" >&5 +echo $ECHO_N "checking for solenv environment... $ECHO_C" >&6 if test -z "$with_local_solenv"; then LOCAL_SOLENV="DEFAULT" - { echo "$as_me:$LINENO: result: default" >&5 -echo "${ECHO_T}default" >&6; } + echo "$as_me:$LINENO: result: default" >&5 +echo "${ECHO_T}default" >&6 else LOCAL_SOLENV=$with_local_solenv - { echo "$as_me:$LINENO: result: $with_local_solenv" >&5 -echo "${ECHO_T}$with_local_solenv" >&6; } + echo "$as_me:$LINENO: result: $with_local_solenv" >&5 +echo "${ECHO_T}$with_local_solenv" >&6 fi @@ -3932,154 +3054,104 @@ echo "$as_me: error: $_solenv/inc/minor.mk missing but needed for architecture/o fi ac_aux_dir= -for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then +for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do + if test -f $ac_dir/install-sh; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" break - elif test -f "$ac_dir/install.sh"; then + elif test -f $ac_dir/install.sh; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install.sh -c" break - elif test -f "$ac_dir/shtool"; then + elif test -f $ac_dir/shtool; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/shtool install -c" break fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 +echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} { (exit 1); exit 1; }; } fi - -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - +ac_config_guess="$SHELL $ac_aux_dir/config.guess" +ac_config_sub="$SHELL $ac_aux_dir/config.sub" +ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} +$ac_config_sub sun4 >/dev/null 2>&1 || + { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 +echo "$as_me: error: cannot run $ac_config_sub" >&2;} { (exit 1); exit 1; }; } -{ echo "$as_me:$LINENO: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking build system type" >&5 +echo $ECHO_N "checking build system type... $ECHO_C" >&6 if test "${ac_cv_build+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_build_alias=$build_alias -test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -test "x$ac_build_alias" = x && + ac_cv_build_alias=$build_alias +test -z "$ac_cv_build_alias" && + ac_cv_build_alias=`$ac_config_guess` +test -z "$ac_cv_build_alias" && { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 echo "$as_me: error: cannot guess build type; you must specify one" >&2;} { (exit 1); exit 1; }; } -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} +ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || + { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 +echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} { (exit 1); exit 1; }; } fi -{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6; } -case $ac_cv_build in -*-*-*) ;; -*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -echo "$as_me: error: invalid value of canonical build" >&2;} - { (exit 1); exit 1; }; };; -esac +echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +echo "${ECHO_T}$ac_cv_build" >&6 build=$ac_cv_build -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_build -shift -build_cpu=$1 -build_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -build_os=$* -IFS=$ac_save_IFS -case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - - -{ echo "$as_me:$LINENO: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6; } +build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + + +echo "$as_me:$LINENO: checking host system type" >&5 +echo $ECHO_N "checking host system type... $ECHO_C" >&6 if test "${ac_cv_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "x$host_alias" = x; then - ac_cv_host=$ac_cv_build -else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} + ac_cv_host_alias=$host_alias +test -z "$ac_cv_host_alias" && + ac_cv_host_alias=$ac_cv_build_alias +ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || + { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 +echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} { (exit 1); exit 1; }; } -fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6; } -case $ac_cv_host in -*-*-*) ;; -*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -echo "$as_me: error: invalid value of canonical host" >&2;} - { (exit 1); exit 1; }; };; -esac +echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +echo "${ECHO_T}$ac_cv_host" >&6 host=$ac_cv_host -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_host -shift -host_cpu=$1 -host_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -host_os=$* -IFS=$ac_save_IFS -case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - - -{ echo "$as_me:$LINENO: checking target system type" >&5 -echo $ECHO_N "checking target system type... $ECHO_C" >&6; } +host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + + +echo "$as_me:$LINENO: checking target system type" >&5 +echo $ECHO_N "checking target system type... $ECHO_C" >&6 if test "${ac_cv_target+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "x$target_alias" = x; then - ac_cv_target=$ac_cv_host -else - ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;} + ac_cv_target_alias=$target_alias +test "x$ac_cv_target_alias" = "x" && + ac_cv_target_alias=$ac_cv_host_alias +ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || + { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5 +echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} { (exit 1); exit 1; }; } -fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5 -echo "${ECHO_T}$ac_cv_target" >&6; } -case $ac_cv_target in -*-*-*) ;; -*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5 -echo "$as_me: error: invalid value of canonical target" >&2;} - { (exit 1); exit 1; }; };; -esac +echo "$as_me:$LINENO: result: $ac_cv_target" >&5 +echo "${ECHO_T}$ac_cv_target" >&6 target=$ac_cv_target -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_target -shift -target_cpu=$1 -target_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -target_os=$* -IFS=$ac_save_IFS -case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac +target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` # The aliases save the names the user supplied, while $host etc. @@ -4096,11 +3168,11 @@ echo "$as_me: WARNING: cross-compiling by any means is not supported (yet)!" >&2 fi if echo "$build_os" | grep cygwin; then - { echo "$as_me:$LINENO: checking Cygwin version" >&5 -echo $ECHO_N "checking Cygwin version... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking Cygwin version" >&5 +echo $ECHO_N "checking Cygwin version... $ECHO_C" >&6 CygwinVer=`uname -r` - { echo "$as_me:$LINENO: result: $CygwinVer" >&5 -echo "${ECHO_T}$CygwinVer" >&6; } + echo "$as_me:$LINENO: result: $CygwinVer" >&5 +echo "${ECHO_T}$CygwinVer" >&6 if test "`echo $CygwinVer | $AWK -F . '{ print $1$2 }'`" -lt "15"; then { { echo "$as_me:$LINENO: error: You need at least Cygwin V1.5.x" >&5 echo "$as_me: error: You need at least Cygwin V1.5.x" >&2;} @@ -4121,8 +3193,8 @@ case "$build_os" in _os=SunOS # Extract the first word of "gtar", so it can be a program name with args. set dummy gtar; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_GNUTAR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4138,28 +3210,27 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GNUTAR="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS ;; esac fi GNUTAR=$ac_cv_path_GNUTAR + if test -n "$GNUTAR"; then - { echo "$as_me:$LINENO: result: $GNUTAR" >&5 -echo "${ECHO_T}$GNUTAR" >&6; } + echo "$as_me:$LINENO: result: $GNUTAR" >&5 +echo "${ECHO_T}$GNUTAR" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test -z "$GNUTAR"; then { { echo "$as_me:$LINENO: error: gtar (gnu tar) not found but needed. Install it (SUN Freeware package)." >&5 echo "$as_me: error: gtar (gnu tar) not found but needed. Install it (SUN Freeware package)." >&2;} @@ -4167,23 +3238,23 @@ echo "$as_me: error: gtar (gnu tar) not found but needed. Install it (SUN Freewa fi - { echo "$as_me:$LINENO: checking the Solaris operating system release" >&5 -echo $ECHO_N "checking the Solaris operating system release... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking the Solaris operating system release" >&5 +echo $ECHO_N "checking the Solaris operating system release... $ECHO_C" >&6 _os_release=`echo $build_os | $SED -e s/solaris2\.//` if test "$_os_release" -lt "6"; then { { echo "$as_me:$LINENO: error: use solaris >= 6 to build OpenOffice.org" >&5 echo "$as_me: error: use solaris >= 6 to build OpenOffice.org" >&2;} { (exit 1); exit 1; }; } else - { echo "$as_me:$LINENO: result: ok ($_os_release)" >&5 -echo "${ECHO_T}ok ($_os_release)" >&6; } + echo "$as_me:$LINENO: result: ok ($_os_release)" >&5 +echo "${ECHO_T}ok ($_os_release)" >&6 fi - { echo "$as_me:$LINENO: checking the processor type" >&5 -echo $ECHO_N "checking the processor type... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking the processor type" >&5 +echo $ECHO_N "checking the processor type... $ECHO_C" >&6 if test "$build_cpu" = "sparc" -o "$build_cpu" = "i386"; then - { echo "$as_me:$LINENO: result: ok ($build_cpu)" >&5 -echo "${ECHO_T}ok ($build_cpu)" >&6; } + echo "$as_me:$LINENO: result: ok ($build_cpu)" >&5 +echo "${ECHO_T}ok ($build_cpu)" >&6 else { { echo "$as_me:$LINENO: error: only sparc and i386 processors are supported" >&5 echo "$as_me: error: only sparc and i386 processors are supported" >&2;} @@ -4194,6 +3265,7 @@ echo "$as_me: error: only sparc and i386 processors are supported" >&2;} test_gtk=yes test_cairo=yes test_kde=yes + test_kde4=yes test_cups=yes test_randr=yes test_freetype=yes @@ -4238,20 +3310,21 @@ echo "$as_me: WARNING: Disabling gtk-quickstarter - not supported on Mac. Use -- test_gtk=yes test_cairo=yes test_kde=yes + test_kde4=yes test_cups=yes test_randr=yes test_freetype=yes - { echo "$as_me:$LINENO: checking the FreeBSD operating system release" >&5 -echo $ECHO_N "checking the FreeBSD operating system release... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking the FreeBSD operating system release" >&5 +echo $ECHO_N "checking the FreeBSD operating system release... $ECHO_C" >&6 if test -n "$with_os_version"; then OSVERSION="$with_os_version" else OSVERSION=`/sbin/sysctl -n kern.osreldate` fi - { echo "$as_me:$LINENO: result: found OSVERSION=$OSVERSION" >&5 -echo "${ECHO_T}found OSVERSION=$OSVERSION" >&6; } - { echo "$as_me:$LINENO: checking which thread library to use" >&5 -echo $ECHO_N "checking which thread library to use... $ECHO_C" >&6; } + echo "$as_me:$LINENO: result: found OSVERSION=$OSVERSION" >&5 +echo "${ECHO_T}found OSVERSION=$OSVERSION" >&6 + echo "$as_me:$LINENO: checking which thread library to use" >&5 +echo $ECHO_N "checking which thread library to use... $ECHO_C" >&6 if test "$OSVERSION" -lt "500016"; then PTHREAD_CFLAGS="-D_THREAD_SAFE" PTHREAD_LIBS="-pthread" @@ -4262,8 +3335,8 @@ echo $ECHO_N "checking which thread library to use... $ECHO_C" >&6; } PTHREAD_CFLAGS="" PTHREAD_LIBS="-pthread" fi - { echo "$as_me:$LINENO: result: $PTHREAD_LIBS" >&5 -echo "${ECHO_T}$PTHREAD_LIBS" >&6; } + echo "$as_me:$LINENO: result: $PTHREAD_LIBS" >&5 +echo "${ECHO_T}$PTHREAD_LIBS" >&6 _os=FreeBSD ;; osf) @@ -4275,6 +3348,7 @@ echo "${ECHO_T}$PTHREAD_LIBS" >&6; } test_gtk=yes test_cairo=yes test_kde=yes + test_kde4=yes test_cups=no test_randr=yes test_freetype=yes @@ -4307,24 +3381,24 @@ esac -{ echo "$as_me:$LINENO: checking whether to enable crashdump feature" >&5 -echo $ECHO_N "checking whether to enable crashdump feature... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to enable crashdump feature" >&5 +echo $ECHO_N "checking whether to enable crashdump feature... $ECHO_C" >&6 if test "$enable_crashdump" = "yes" -o "$enable_crashdump" = "TRUE"; then ENABLE_CRASHDUMP="TRUE" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 BUILD_TYPE="$BUILD_TYPE CRASHREP" else if test "$enable_crashdump" = "STATIC"; then ENABLE_CRASHDUMP="STATIC" - { echo "$as_me:$LINENO: result: yes, STATIC" >&5 -echo "${ECHO_T}yes, STATIC" >&6; } + echo "$as_me:$LINENO: result: yes, STATIC" >&5 +echo "${ECHO_T}yes, STATIC" >&6 BUILD_TYPE="$BUILD_TYPE CRASHREP" else if test "$enable_crashdump" = "" -o "$enable_crashdump" = "no"; then ENABLE_CRASHDUMP="" - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 else { { echo "$as_me:$LINENO: error: --enable-crashdump only accepts yes, no, TRUE or STATIC as parameter." >&5 echo "$as_me: error: --enable-crashdump only accepts yes, no, TRUE or STATIC as parameter." >&2;} @@ -4339,26 +3413,26 @@ if test "$_os" = "WINNT"; then fi if test "$_os" = "WINNT"; then - { echo "$as_me:$LINENO: checking whether to use the standard non-optimizing compiler" >&5 -echo $ECHO_N "checking whether to use the standard non-optimizing compiler... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking whether to use the standard non-optimizing compiler" >&5 +echo $ECHO_N "checking whether to use the standard non-optimizing compiler... $ECHO_C" >&6 if test "$enable_cl_standard" = "" -o "$enable_cl_standard" = "no"; then VC_STANDARD="" - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 else VC_STANDARD="TRUE" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 fi fi -{ echo "$as_me:$LINENO: checking whether to turn warnings to errors" >&5 -echo $ECHO_N "checking whether to turn warnings to errors... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to turn warnings to errors" >&5 +echo $ECHO_N "checking whether to turn warnings to errors... $ECHO_C" >&6 if test -n "$enable_werror" && test "$enable_werror" != "no"; then ENABLE_WERROR="TRUE" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 { echo "$as_me:$LINENO: WARNING: Turning warnings to errors has no effect in modules or" >&5 echo "$as_me: WARNING: Turning warnings to errors has no effect in modules or" >&2;} { echo "$as_me:$LINENO: WARNING: on platforms where it has been disabled explicitely" >&5 @@ -4366,58 +3440,58 @@ echo "$as_me: WARNING: on platforms where it has been disabled explicitely" >&2; echo "Turning warnings to errors has no effect in modules or on platforms where it has been disabled explicitely" >> warn else ENABLE_WERROR="FALSE" - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -{ echo "$as_me:$LINENO: checking whether to do a debug build" >&5 -echo $ECHO_N "checking whether to do a debug build... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to do a debug build" >&5 +echo $ECHO_N "checking whether to do a debug build... $ECHO_C" >&6 if test -n "$enable_debug" && test "$enable_debug" != "no"; then ENABLE_DEBUG="TRUE" if test -z "$enable_symbols"; then enable_symbols="yes" fi - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else ENABLE_DEBUG="FALSE" - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -{ echo "$as_me:$LINENO: checking whether to build with additional debug utilities" >&5 -echo $ECHO_N "checking whether to build with additional debug utilities... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to build with additional debug utilities" >&5 +echo $ECHO_N "checking whether to build with additional debug utilities... $ECHO_C" >&6 if test -n "$enable_dbgutil" && test "$enable_dbgutil" != "no"; then PROEXT="" PRODUCT="" PROFULLSWITCH="" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else PRODUCT="full" PROFULLSWITCH="product=full" PROEXT=".pro" - { echo "$as_me:$LINENO: result: no, full product build" >&5 -echo "${ECHO_T}no, full product build" >&6; } + echo "$as_me:$LINENO: result: no, full product build" >&5 +echo "${ECHO_T}no, full product build" >&6 fi -{ echo "$as_me:$LINENO: checking whether to include symbols into final build" >&5 -echo $ECHO_N "checking whether to include symbols into final build... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to include symbols into final build" >&5 +echo $ECHO_N "checking whether to include symbols into final build... $ECHO_C" >&6 if test -n "$enable_symbols" && test "$enable_symbols" != "no"; then if test "$enable_symbols" = "yes" -o "$enable_symbols" = "TRUE"; then ENABLE_SYMBOLS="TRUE" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else if test "$enable_symbols" = "SMALL" -o "$enable_symbols" = "small"; then ENABLE_SYMBOLS="SMALL" - { echo "$as_me:$LINENO: result: yes, small ones" >&5 -echo "${ECHO_T}yes, small ones" >&6; } + echo "$as_me:$LINENO: result: yes, small ones" >&5 +echo "${ECHO_T}yes, small ones" >&6 else if test "$enable_symbols" != "no" ; then echo enable symbols is: $enable_symbols { { echo "$as_me:$LINENO: error: --enable-symbols only accepts yes, TRUE or SMALL as parameter." >&5 @@ -4430,13 +3504,13 @@ echo "$as_me: error: --enable-symbols only accepts yes, TRUE or SMALL as paramet fi else ENABLE_SYMBOLS= - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -{ echo "$as_me:$LINENO: checking whether to strip the solver or not." >&5 -echo $ECHO_N "checking whether to strip the solver or not.... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to strip the solver or not." >&5 +echo $ECHO_N "checking whether to strip the solver or not.... $ECHO_C" >&6 if test -n "$enable_strip_solver"; then if test "$enable_strip_solver" = "yes"; then DISABLE_STRIP= @@ -4457,151 +3531,151 @@ else fi -{ echo "$as_me:$LINENO: checking whether to enable native CUPS support" >&5 -echo $ECHO_N "checking whether to enable native CUPS support... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to enable native CUPS support" >&5 +echo $ECHO_N "checking whether to enable native CUPS support... $ECHO_C" >&6 if test "$test_cups" = "yes" -a \( "$enable_cups" = "yes" -o "$enable_cups" = "TRUE" \) ; then ENABLE_CUPS="TRUE" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else ENABLE_CUPS="" - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -{ echo "$as_me:$LINENO: checking whether to enable fontconfig support" >&5 -echo $ECHO_N "checking whether to enable fontconfig support... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to enable fontconfig support" >&5 +echo $ECHO_N "checking whether to enable fontconfig support... $ECHO_C" >&6 if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a \( "$enable_fontconfig" = "yes" -o "$enable_fontconfig" = "TRUE" \); then ENABLE_FONTCONFIG="TRUE" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else ENABLE_FONTCONFIG="" - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -{ echo "$as_me:$LINENO: checking whether to enable filters for legacy binary file formats (StarOffice 5.2)" >&5 -echo $ECHO_N "checking whether to enable filters for legacy binary file formats (StarOffice 5.2)... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to enable filters for legacy binary file formats (StarOffice 5.2)" >&5 +echo $ECHO_N "checking whether to enable filters for legacy binary file formats (StarOffice 5.2)... $ECHO_C" >&6 if test "$enable_binfilter" = "no"; then WITH_BINFILTER="NO" - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 else WITH_BINFILTER="YES" BUILD_TYPE="$BUILD_TYPE BINFILTER" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 fi if test "$_os" = "WINNT"; then - { echo "$as_me:$LINENO: checking whether to use DirectX" >&5 -echo $ECHO_N "checking whether to use DirectX... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking whether to use DirectX" >&5 +echo $ECHO_N "checking whether to use DirectX... $ECHO_C" >&6 if test "$enable_directx" = "yes" -o "$enable_directx" = "TRUE" -o "$enable_directx" = ""; then ENABLE_DIRECTX="TRUE" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else ENABLE_DIRECTX="" - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - { echo "$as_me:$LINENO: checking whether to use ActiveX" >&5 -echo $ECHO_N "checking whether to use ActiveX... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking whether to use ActiveX" >&5 +echo $ECHO_N "checking whether to use ActiveX... $ECHO_C" >&6 if test "$enable_activex" = "yes" -o "$enable_activex" = "TRUE" -o "$enable_activex" = ""; then DISABLE_ACTIVEX="" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else DISABLE_ACTIVEX="TRUE" - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - { echo "$as_me:$LINENO: checking whether to use ATL" >&5 -echo $ECHO_N "checking whether to use ATL... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking whether to use ATL" >&5 +echo $ECHO_N "checking whether to use ATL... $ECHO_C" >&6 if test "$enable_atl" = "yes" -o "$enable_atl" = "TRUE" -o "$enable_atl" = ""; then DISABLE_ATL="" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else DISABLE_ATL="TRUE" - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi fi -{ echo "$as_me:$LINENO: checking whether to use RPATH in shared libraries" >&5 -echo $ECHO_N "checking whether to use RPATH in shared libraries... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to use RPATH in shared libraries" >&5 +echo $ECHO_N "checking whether to use RPATH in shared libraries... $ECHO_C" >&6 if test "$enable_rpath" = "no"; then ENABLE_RPATH="no" else ENABLE_RPATH="yes" fi -{ echo "$as_me:$LINENO: result: $ENABLE_RPATH" >&5 -echo "${ECHO_T}$ENABLE_RPATH" >&6; } +echo "$as_me:$LINENO: result: $ENABLE_RPATH" >&5 +echo "${ECHO_T}$ENABLE_RPATH" >&6 -{ echo "$as_me:$LINENO: checking whether to include MySpell dictionaries" >&5 -echo $ECHO_N "checking whether to include MySpell dictionaries... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to include MySpell dictionaries" >&5 +echo $ECHO_N "checking whether to include MySpell dictionaries... $ECHO_C" >&6 if test -z "$with_myspell_dicts" || test "$with_myspell_dicts" = "yes"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 WITH_MYSPELL_DICTS=YES BUILD_TYPE="$BUILD_TYPE DICTIONARIES" else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 WITH_MYSPELL_DICTS=NO fi if test "$WITH_MYSPELL_DICTS" = "NO"; then - { echo "$as_me:$LINENO: checking whether to use dicts from external paths" >&5 -echo $ECHO_N "checking whether to use dicts from external paths... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking whether to use dicts from external paths" >&5 +echo $ECHO_N "checking whether to use dicts from external paths... $ECHO_C" >&6 if test -n "$with_system_dicts" -a "$with_system_dicts" = "yes"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 SYSTEM_DICTS=YES - { echo "$as_me:$LINENO: checking for spelling dictionary directory" >&5 -echo $ECHO_N "checking for spelling dictionary directory... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for spelling dictionary directory" >&5 +echo $ECHO_N "checking for spelling dictionary directory... $ECHO_C" >&6 if test -n "$with_external_dict_dir"; then DICT_SYSTEM_DIR=file://$with_external_dict_dir else DICT_SYSTEM_DIR=file:///usr/share/hunspell fi - { echo "$as_me:$LINENO: result: $DICT_SYSTEM_DIR" >&5 -echo "${ECHO_T}$DICT_SYSTEM_DIR" >&6; } - { echo "$as_me:$LINENO: checking for hyphenation patterns directory" >&5 -echo $ECHO_N "checking for hyphenation patterns directory... $ECHO_C" >&6; } + echo "$as_me:$LINENO: result: $DICT_SYSTEM_DIR" >&5 +echo "${ECHO_T}$DICT_SYSTEM_DIR" >&6 + echo "$as_me:$LINENO: checking for hyphenation patterns directory" >&5 +echo $ECHO_N "checking for hyphenation patterns directory... $ECHO_C" >&6 if test -n "$with_external_hyph_dir"; then HYPH_SYSTEM_DIR=file://$with_external_hyph_dir else HYPH_SYSTEM_DIR=file:///usr/share/hyphen fi - { echo "$as_me:$LINENO: result: $HYPH_SYSTEM_DIR" >&5 -echo "${ECHO_T}$HYPH_SYSTEM_DIR" >&6; } - { echo "$as_me:$LINENO: checking for thesaurus directory" >&5 -echo $ECHO_N "checking for thesaurus directory... $ECHO_C" >&6; } + echo "$as_me:$LINENO: result: $HYPH_SYSTEM_DIR" >&5 +echo "${ECHO_T}$HYPH_SYSTEM_DIR" >&6 + echo "$as_me:$LINENO: checking for thesaurus directory" >&5 +echo $ECHO_N "checking for thesaurus directory... $ECHO_C" >&6 if test -n "$with_external_thes_dir"; then THES_SYSTEM_DIR=file://$with_external_thes_dir else THES_SYSTEM_DIR=file:///usr/share/mythes fi - { echo "$as_me:$LINENO: result: $THES_SYSTEM_DIR" >&5 -echo "${ECHO_T}$THES_SYSTEM_DIR" >&6; } + echo "$as_me:$LINENO: result: $THES_SYSTEM_DIR" >&5 +echo "${ECHO_T}$THES_SYSTEM_DIR" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 SYSTEM_DICTS=NO fi fi @@ -4610,8 +3684,8 @@ fi -{ echo "$as_me:$LINENO: checking which shell to use" >&5 -echo $ECHO_N "checking which shell to use... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking which shell to use" >&5 +echo $ECHO_N "checking which shell to use... $ECHO_C" >&6 if test $_os = "WINNT"; then if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "bash" -a "$with_use_shell" != "4nt"; then { { echo "$as_me:$LINENO: error: only \"tcsh\",\"bash\" or \"4nt\" are supported options" >&5 @@ -4657,17 +3731,17 @@ echo "$as_me: error: only \"tcsh\" or \"bash\" are supported options" >&2;} fi fi USE_SHELL="$with_use_shell" -{ echo "$as_me:$LINENO: result: $USE_SHELL" >&5 -echo "${ECHO_T}$USE_SHELL" >&6; } +echo "$as_me:$LINENO: result: $USE_SHELL" >&5 +echo "${ECHO_T}$USE_SHELL" >&6 if test "$_os" = "WINNT" -a "$with_use_shell" != "4nt" ; then - { echo "$as_me:$LINENO: checking for cygwin gcc/g++" >&5 -echo $ECHO_N "checking for cygwin gcc/g++... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for cygwin gcc/g++" >&5 +echo $ECHO_N "checking for cygwin gcc/g++... $ECHO_C" >&6 if which gcc > /dev/null && which g++ > /dev/null ; then - { echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6; } + echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6 else { { echo "$as_me:$LINENO: error: cygwin gcc and g++ are needed, please install them." >&5 echo "$as_me: error: cygwin gcc and g++ are needed, please install them." >&2;} @@ -4679,8 +3753,8 @@ fi if test "$with_use_shell" = "tcsh"; then # Extract the first word of "tcsh", so it can be a program name with args. set dummy tcsh; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_SHELLPATH+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4695,28 +3769,27 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_SHELLPATH="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS ;; esac fi SHELLPATH=$ac_cv_path_SHELLPATH + if test -n "$SHELLPATH"; then - { echo "$as_me:$LINENO: result: $SHELLPATH" >&5 -echo "${ECHO_T}$SHELLPATH" >&6; } + echo "$as_me:$LINENO: result: $SHELLPATH" >&5 +echo "${ECHO_T}$SHELLPATH" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test -z "$SHELLPATH"; then { { echo "$as_me:$LINENO: error: tcsh not found in \$PATH" >&5 echo "$as_me: error: tcsh not found in \$PATH" >&2;} @@ -4727,8 +3800,8 @@ echo "$as_me: error: tcsh not found in \$PATH" >&2;} elif test "$with_use_shell" = "bash"; then # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_SHELLPATH+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4743,28 +3816,27 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_SHELLPATH="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS ;; esac fi SHELLPATH=$ac_cv_path_SHELLPATH + if test -n "$SHELLPATH"; then - { echo "$as_me:$LINENO: result: $SHELLPATH" >&5 -echo "${ECHO_T}$SHELLPATH" >&6; } + echo "$as_me:$LINENO: result: $SHELLPATH" >&5 +echo "${ECHO_T}$SHELLPATH" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test -z "$SHELLPATH"; then { { echo "$as_me:$LINENO: error: bash not found in \$PATH" >&5 echo "$as_me: error: bash not found in \$PATH" >&2;} @@ -4779,15 +3851,15 @@ echo "$as_me: WARNING: Windows/OS/2 4NT builds don't test for the shell" >&2;} fi -{ echo "$as_me:$LINENO: checking gcc home" >&5 -echo $ECHO_N "checking gcc home... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking gcc home" >&5 +echo $ECHO_N "checking gcc home... $ECHO_C" >&6 if test -z "$with_gcc_home"; then GCC_HOME=`which gcc | $SED -e s,/bin/gcc,,` else GCC_HOME="$with_gcc_home" fi -{ echo "$as_me:$LINENO: result: $GCC_HOME" >&5 -echo "${ECHO_T}$GCC_HOME" >&6; } +echo "$as_me:$LINENO: result: $GCC_HOME" >&5 +echo "${ECHO_T}$GCC_HOME" >&6 if test -n "$with_gcc_home"; then @@ -4805,8 +3877,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4819,34 +3891,32 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +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_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4859,51 +3929,36 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" 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_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test "x$ac_ct_CC" = x; then - CC="" - 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 - CC=$ac_ct_CC - fi + CC=$ac_ct_CC else CC="$ac_cv_prog_CC" fi if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4916,34 +3971,74 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; 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_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 fi +done +done + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + CC=$ac_ct_CC +else + CC="$ac_cv_prog_CC" +fi + fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4957,7 +4052,7 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -4968,7 +4063,6 @@ do fi done done -IFS=$as_save_IFS if test $ac_prog_rejected = yes; then # We found a bogon in the path, so make sure we never use it. @@ -4986,23 +4080,22 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test -z "$CC"; then if test -n "$ac_tool_prefix"; then - for ac_prog in cl.exe + for ac_prog in cl do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5015,38 +4108,36 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - test -n "$CC" && break done fi if test -z "$CC"; then ac_ct_CC=$CC - for ac_prog in cl.exe + for ac_prog in cl do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +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_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5059,45 +4150,29 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" 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_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - test -n "$ac_ct_CC" && break done - if test "x$ac_ct_CC" = x; then - CC="" - 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 - CC=$ac_ct_CC - fi + CC=$ac_ct_CC fi fi @@ -5110,40 +4185,27 @@ See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:$LINENO: checking for C compiler version" >&5 +echo "$as_me:$LINENO:" \ + "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (ac_try="$ac_compiler --version >&5" -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_compiler --version >&5") 2>&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 + (eval $ac_compiler --version &5) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -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_compiler -v >&5") 2>&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 + (eval $ac_compiler -v &5) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -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_compiler -V >&5") 2>&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 + (eval $ac_compiler -V &5) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5163,77 +4225,47 @@ ac_clean_files="$ac_clean_files a.out a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for C compiler default output" >&5 +echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -# -# List of possible output files, starting from the most likely. -# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) -# only as a last resort. b.out is created by i960 compilers. -ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' -# -# The IRIX 6 linker writes into existing files which may not be -# executable, retaining their permissions. Remove them first so a -# subsequent execution test works. -ac_rmfiles= -for ac_file in $ac_files -do - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; - * ) ac_rmfiles="$ac_rmfiles $ac_file";; - esac -done -rm -f $ac_rmfiles - -if { (ac_try="$ac_link_default" -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_default") 2>&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 + (eval $ac_link_default) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -# in a Makefile. We should not override ac_cv_exeext if it was cached, -# so that the user can short-circuit this test for compilers unknown to -# Autoconf. -for ac_file in $ac_files '' + # Find the output, starting from the most likely. This scheme is +# not robust to junk in `.', hence go to wildcards (a.*) only as a last +# resort. + +# Be careful to initialize this variable, since it used to be cached. +# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. +ac_cv_exeext= +# b.out is created by i960 compilers. +for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) - ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) + ;; + conftest.$ac_ext ) + # This is the source file. + ;; [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; + # We found the default executable, but exeext='' is most + # certainly right. + break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; - then :; else - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - fi - # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an `-o' - # argument, so we may need to know it at that point already. - # Even if this section looks crufty: it has the advantage of - # actually working. - break;; + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + # FIXME: I believe we export ac_cv_exeext for Libtool, + # but it would be cool to find out if it's true. Does anybody + # maintain Libtool? --akim. + export ac_cv_exeext + break;; * ) - break;; + break;; esac done -test "$ac_cv_exeext" = no && ac_cv_exeext= - else - ac_file='' -fi - -{ echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6; } -if test -z "$ac_file"; then echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -5245,21 +4277,19 @@ See \`config.log' for more details." >&2;} fi ac_exeext=$ac_cv_exeext +echo "$as_me:$LINENO: result: $ac_file" >&5 +echo "${ECHO_T}$ac_file" >&6 -# Check that the compiler produces executables we can run. If not, either +# Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -5278,27 +4308,22 @@ See \`config.log' for more details." >&2;} fi fi fi -{ echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 rm -f a.out a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -# Check that the compiler produces executables we can run. If not, either +# Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } -{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6; } - -{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } -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>&5 +echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 +echo "$as_me:$LINENO: result: $cross_compiling" >&5 +echo "${ECHO_T}$cross_compiling" >&6 + +echo "$as_me:$LINENO: checking for suffix of executables" >&5 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then @@ -5309,9 +4334,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - break;; + export ac_cv_exeext + break;; * ) break;; esac done @@ -5324,18 +4350,19 @@ See \`config.log' for more details." >&2;} fi rm -f conftest$ac_cv_exeext -{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +echo "${ECHO_T}$ac_cv_exeext" >&6 rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for suffix of object files" >&5 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5351,20 +4378,14 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (ac_try="$ac_compile" -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_compile") 2>&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - for ac_file in conftest.o conftest.obj conftest.*; do - test -f "$ac_file" || continue; + for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac @@ -5382,16 +4403,17 @@ fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5410,87 +4432,41 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_objext; then + (exit $ac_status); }; }; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_compiler_gnu=no +ac_compiler_gnu=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } +CFLAGS="-g" +echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - ac_cv_prog_cc_g=no - CFLAGS="-g" - 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 -if { (ac_try="$ac_compile" -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_compile") 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_objext; then - ac_cv_prog_cc_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5506,80 +4482,28 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 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_objext; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_c_werror_flag=$ac_save_c_werror_flag - CFLAGS="-g" - 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 -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_objext; then + (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_prog_cc_g=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag +rm -f conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then @@ -5595,14 +4519,15 @@ else CFLAGS= fi fi -{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then +echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 +echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 +if test "${ac_cv_prog_cc_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_prog_cc_c89=no + ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5630,21 +4555,6 @@ static char *f (char * (*g) (char **, int), char **p, ...) va_end (v); return s; } - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; - int test (int i, double x); struct s1 {int (*f) (int a);}; struct s2 {int (*f) (double a);}; @@ -5659,57 +4569,168 @@ return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; return 0; } _ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +# Don't try gcc -ansi; that turns off useful extensions and +# breaks some systems' header files. +# AIX -qlanglvl=ansi +# Ultrix and OSF/1 -std1 +# HP-UX 10.20 and later -Ae +# HP-UX older versions -Aa -D_HPUX_SOURCE +# SVR4 -Xc -D__EXTENSIONS__ +for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_objext; then - ac_cv_prog_cc_c89=$ac_arg + (exit $ac_status); }; }; then + ac_cv_prog_cc_stdc=$ac_arg +break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - fi - -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c89" != "xno" && break +rm -f conftest.$ac_objext done -rm -f conftest.$ac_ext +rm -f conftest.$ac_ext conftest.$ac_objext CC=$ac_save_CC fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6; } ;; - xno) - { echo "$as_me:$LINENO: result: unsupported" >&5 -echo "${ECHO_T}unsupported" >&6; } ;; + +case "x$ac_cv_prog_cc_stdc" in + x|xno) + echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6 ;; *) - CC="$CC $ac_cv_prog_cc_c89" - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; + echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 + CC="$CC $ac_cv_prog_cc_stdc" ;; esac +# Some people use a C++ compiler to compile C. Since we use `exit', +# in C++ we need to declare it. In case someone uses the same compiler +# for both compiling C and C++ we need to have the C++ compiler decide +# the declaration of exit, since it's the most demanding environment. +cat >conftest.$ac_ext <<_ACEOF +#ifndef __cplusplus + choke me +#endif +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + for ac_declaration in \ + ''\ + '#include ' \ + 'extern "C" void std::exit (int) throw (); using std::exit;' \ + 'extern "C" void std::exit (int); using std::exit;' \ + 'extern "C" void exit (int) throw ();' \ + 'extern "C" void exit (int);' \ + 'void exit (int);' +do + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +$ac_declaration +int +main () +{ +exit (42); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +continue +fi +rm -f conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_declaration +int +main () +{ +exit (42); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.$ac_objext conftest.$ac_ext +done +rm -f conftest* +if test -n "$ac_declaration"; then + echo '#ifdef __cplusplus' >>confdefs.h + echo $ac_declaration >>confdefs.h + echo '#endif' >>confdefs.h +fi + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +fi +rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -5724,8 +4745,8 @@ if test "$COMPATH" = "." ; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_COMPATH+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5740,28 +4761,27 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_COMPATH="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS ;; esac fi COMPATH=$ac_cv_path_COMPATH + if test -n "$COMPATH"; then - { echo "$as_me:$LINENO: result: $COMPATH" >&5 -echo "${ECHO_T}$COMPATH" >&6; } + echo "$as_me:$LINENO: result: $COMPATH" >&5 +echo "${ECHO_T}$COMPATH" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - test -n "$COMPATH" && break done @@ -5770,8 +4790,8 @@ fi GCCVER=20995 if test \( "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes" \) -a "$GCC" = "yes"; then - { echo "$as_me:$LINENO: checking the GNU gcc compiler version" >&5 -echo $ECHO_N "checking the GNU gcc compiler version... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking the GNU gcc compiler version" >&5 +echo $ECHO_N "checking the GNU gcc compiler version... $ECHO_C" >&6 _gcc_version=`$CC -dumpversion` _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` _gcc_longver=`echo $_gcc_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'` @@ -5790,30 +4810,31 @@ echo "$as_me: error: version \"$_gcc_version\" gives internal error with small." fi fi fi - { echo "$as_me:$LINENO: result: checked (gcc $_gcc_version)" >&5 -echo "${ECHO_T}checked (gcc $_gcc_version)" >&6; } + echo "$as_me:$LINENO: result: checked (gcc $_gcc_version)" >&5 +echo "${ECHO_T}checked (gcc $_gcc_version)" >&6 if test "$_os" = "SunOS"; then - { echo "$as_me:$LINENO: checking gcc linker" >&5 -echo $ECHO_N "checking gcc linker... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking gcc linker" >&5 +echo $ECHO_N "checking gcc linker... $ECHO_C" >&6 if $CC -Wl,--version 2>&1 |head -n 1| grep -v GNU > /dev/null;then { { echo "$as_me:$LINENO: error: failed (not GNU ld). Use GNU ld instead of Sun ld on Solaris" >&5 echo "$as_me: error: failed (not GNU ld). Use GNU ld instead of Sun ld on Solaris" >&2;} { (exit 1); exit 1; }; } fi - { echo "$as_me:$LINENO: result: ok (GNU ld)" >&5 -echo "${ECHO_T}ok (GNU ld)" >&6; } + echo "$as_me:$LINENO: result: ok (GNU ld)" >&5 +echo "${ECHO_T}ok (GNU ld)" >&6 fi fi HAVE_LD_BSYMBOLIC_FUNCTIONS= if test "$GCC" = "yes"; then - { echo "$as_me:$LINENO: checking for -Bsymbolic-functions linker support " >&5 -echo $ECHO_N "checking for -Bsymbolic-functions linker support ... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for -Bsymbolic-functions linker support " >&5 +echo $ECHO_N "checking for -Bsymbolic-functions linker support ... $ECHO_C" >&6 bsymbolic_functions_ldflags_save=$LDFLAGS LDFLAGS="$LDFLAGS -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5833,55 +4854,46 @@ main () } _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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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 + (exit $ac_status); }; }; then HAVE_LD_BSYMBOLIC_FUNCTIONS=TRUE else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test "z$HAVE_LD_BSYMBOLIC_FUNCTIONS" = "zTRUE"; then - { echo "$as_me:$LINENO: result: found " >&5 -echo "${ECHO_T}found " >&6; } + echo "$as_me:$LINENO: result: found " >&5 +echo "${ECHO_T}found " >&6 else - { echo "$as_me:$LINENO: result: not found " >&5 -echo "${ECHO_T}not found " >&6; } + echo "$as_me:$LINENO: result: not found " >&5 +echo "${ECHO_T}not found " >&6 fi LDFLAGS=$bsymbolic_functions_ldflags_save fi -{ echo "$as_me:$LINENO: checking whether to enable pch feature" >&5 -echo $ECHO_N "checking whether to enable pch feature... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to enable pch feature" >&5 +echo $ECHO_N "checking whether to enable pch feature... $ECHO_C" >&6 if test -n "$enable_pch" && test "$enable_pch" != "no"; then if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then ENABLE_PCH="TRUE" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 elif test "$GCC" = "yes" -a "$GCCVER" -gt "030400"; then ENABLE_PCH="TRUE" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else ENABLE_PCH="" { echo "$as_me:$LINENO: WARNING: Precompiled header not yet supported for your platform/compiler" >&5 @@ -5889,26 +4901,26 @@ echo "$as_me: WARNING: Precompiled header not yet supported for your platform/co fi else ENABLE_PCH="" - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -{ echo "$as_me:$LINENO: checking whether to enable hid list feature" >&5 -echo $ECHO_N "checking whether to enable hid list feature... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to enable hid list feature" >&5 +echo $ECHO_N "checking whether to enable hid list feature... $ECHO_C" >&6 if test -n "$enable_hids" && test "$enable_hids" != "no"; then NO_HIDS="" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else NO_HIDS="TRUE" - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -{ echo "$as_me:$LINENO: checking for GNU make" >&5 -echo $ECHO_N "checking for GNU make... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for GNU make" >&5 +echo $ECHO_N "checking for GNU make... $ECHO_C" >&6 for a in "$MAKE" $GNUMAKE make gmake gnumake; do $a --version 2> /dev/null | grep GNU 2>&1 > /dev/null if test $? -eq 0; then @@ -5916,26 +4928,26 @@ for a in "$MAKE" $GNUMAKE make gmake gnumake; do break fi done -{ echo "$as_me:$LINENO: result: $GNUMAKE" >&5 -echo "${ECHO_T}$GNUMAKE" >&6; } +echo "$as_me:$LINENO: result: $GNUMAKE" >&5 +echo "${ECHO_T}$GNUMAKE" >&6 if test -z "$GNUMAKE"; then { { echo "$as_me:$LINENO: error: not found. install GNU make." >&5 echo "$as_me: error: not found. install GNU make." >&2;} { (exit 1); exit 1; }; } fi -{ echo "$as_me:$LINENO: checking the GNU make version" >&5 -echo $ECHO_N "checking the GNU make version... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking the GNU make version" >&5 +echo $ECHO_N "checking the GNU make version... $ECHO_C" >&6 _make_version=`$GNUMAKE --version | grep GNU | $SED -e 's@^[^0-9]*@@' -e 's@ .*@@' -e 's@,.*@@'`; _make_longver=`echo $_make_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'` if test "$_make_longver" -ge "037901" ; then - { echo "$as_me:$LINENO: result: $GNUMAKE $_make_version" >&5 -echo "${ECHO_T}$GNUMAKE $_make_version" >&6; } + echo "$as_me:$LINENO: result: $GNUMAKE $_make_version" >&5 +echo "${ECHO_T}$GNUMAKE $_make_version" >&6 else if test "$_os" = "Darwin"; then if test "$_make_longver" -ge "037900" ; then - { echo "$as_me:$LINENO: result: $GNUMAKE $_make_version" >&5 -echo "${ECHO_T}$GNUMAKE $_make_version" >&6; } + echo "$as_me:$LINENO: result: $GNUMAKE $_make_version" >&5 +echo "${ECHO_T}$GNUMAKE $_make_version" >&6 else { echo "$as_me:$LINENO: WARNING: failed ($GNUMAKE $_make_version need 3.79.0+)" >&5 echo "$as_me: WARNING: failed ($GNUMAKE $_make_version need 3.79.0+)" >&2;} @@ -5948,8 +4960,8 @@ echo "$as_me: error: failed ($GNUMAKE $_make_version need 3.79.1+)" >&2;} fi -{ echo "$as_me:$LINENO: checking for GNU tar" >&5 -echo $ECHO_N "checking for GNU tar... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for GNU tar" >&5 +echo $ECHO_N "checking for GNU tar... $ECHO_C" >&6 for a in $GNUTAR gtar gnutar tar; do $a --version 2> /dev/null | grep GNU 2>&1 > /dev/null if test $? -eq 0; then @@ -5957,8 +4969,8 @@ for a in $GNUTAR gtar gnutar tar; do break fi done -{ echo "$as_me:$LINENO: result: $GNUTAR" >&5 -echo "${ECHO_T}$GNUTAR" >&6; } +echo "$as_me:$LINENO: result: $GNUTAR" >&5 +echo "${ECHO_T}$GNUTAR" >&6 if test -z "$GNUTAR"; then { { echo "$as_me:$LINENO: error: not found. install GNU tar." >&5 echo "$as_me: error: not found. install GNU tar." >&2;} @@ -5973,8 +4985,8 @@ if test "$_os" = "SunOS"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path__cc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5989,34 +5001,33 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path__cc="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS ;; esac fi _cc=$ac_cv_path__cc + if test -n "$_cc"; then - { echo "$as_me:$LINENO: result: $_cc" >&5 -echo "${ECHO_T}$_cc" >&6; } + echo "$as_me:$LINENO: result: $_cc" >&5 +echo "${ECHO_T}$_cc" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - test -n "$_cc" && break done COMPATH=`echo $_cc | $SED -n "s/\/cc//p"` - { echo "$as_me:$LINENO: checking the SunStudio C/C++ compiler version" >&5 -echo $ECHO_N "checking the SunStudio C/C++ compiler version... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking the SunStudio C/C++ compiler version" >&5 +echo $ECHO_N "checking the SunStudio C/C++ compiler version... $ECHO_C" >&6 _sunstudio_string=`$CC -V 2>&1 | grep '^cc' | sed -e 's/.* C //'` _sunstudio_version=`echo $_sunstudio_string | $AWK '{ print $1 }'` _sunstudio_major=`echo $_sunstudio_version | $AWK -F. '{ print $1 }'` @@ -6031,19 +5042,20 @@ echo "$as_me: error: found version \"$_sunstudio_version\", use version 5.5, 5.7 echo "$as_me: error: found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" >&2;} { (exit 1); exit 1; }; } else - { echo "$as_me:$LINENO: result: checked" >&5 -echo "${ECHO_T}checked" >&6; } + echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6 fi fi fi fi if test "$GCC" = "yes"; then - { echo "$as_me:$LINENO: checking for --hash-style=both linker support " >&5 -echo $ECHO_N "checking for --hash-style=both linker support ... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for --hash-style=both linker support " >&5 +echo $ECHO_N "checking for --hash-style=both linker support ... $ECHO_C" >&6 hash_style_ldflags_save=$LDFLAGS LDFLAGS="$LDFLAGS -Wl,--hash-style=both" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6063,39 +5075,31 @@ main () } _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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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 + (exit $ac_status); }; }; then HAVE_LD_HASH_STYLE=TRUE else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - HAVE_LD_HASH_STYLE=FALSE +HAVE_LD_HASH_STYLE=FALSE fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test "z$HAVE_LD_HASH_STYLE" = "zTRUE"; then - { echo "$as_me:$LINENO: result: found " >&5 -echo "${ECHO_T}found " >&6; } + echo "$as_me:$LINENO: result: found " >&5 +echo "${ECHO_T}found " >&6 else - { echo "$as_me:$LINENO: result: not found " >&5 -echo "${ECHO_T}not found " >&6; } + echo "$as_me:$LINENO: result: not found " >&5 +echo "${ECHO_T}not found " >&6 fi LDFLAGS=$hash_style_ldflags_save fi @@ -6107,8 +5111,8 @@ if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path__cc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6123,34 +5127,33 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path__cc="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS ;; esac fi _cc=$ac_cv_path__cc + if test -n "$_cc"; then - { echo "$as_me:$LINENO: result: $_cc" >&5 -echo "${ECHO_T}$_cc" >&6; } + echo "$as_me:$LINENO: result: $_cc" >&5 +echo "${ECHO_T}$_cc" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - test -n "$_cc" && break done COMPATH=`echo $_cc | $SED -n "s/\/cc//p"` - { echo "$as_me:$LINENO: checking the SGI MIPSpro C compiler version" >&5 -echo $ECHO_N "checking the SGI MIPSpro C compiler version... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking the SGI MIPSpro C compiler version" >&5 +echo $ECHO_N "checking the SGI MIPSpro C compiler version... $ECHO_C" >&6 _mipspro_version=`$CC -version 2>&1 | $AWK '{ print $4 }'` _mipspro_major=`echo $_mipspro_version | $AWK -F. '{ print $1 }'` if test "$_mipspro_major" != "7"; then @@ -6164,8 +5167,8 @@ echo "$as_me: error: found version \"$_mipspro_version\", use version 7.2+ of th echo "$as_me: error: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&2;} { (exit 1); exit 1; }; } else - { echo "$as_me:$LINENO: result: checked" >&5 -echo "${ECHO_T}checked" >&6; } + echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6 fi fi fi @@ -6177,8 +5180,8 @@ if test "$_os" = "OSF1"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path__cc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6193,36 +5196,35 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path__cc="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS ;; esac fi _cc=$ac_cv_path__cc + if test -n "$_cc"; then - { echo "$as_me:$LINENO: result: $_cc" >&5 -echo "${ECHO_T}$_cc" >&6; } + echo "$as_me:$LINENO: result: $_cc" >&5 +echo "${ECHO_T}$_cc" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - test -n "$_cc" && break done COMPATH=`echo $_cc | $SED -n "s/\/cc//p"` { echo "$as_me:$LINENO: WARNING: ******* $_cc , $COMPATH" >&5 echo "$as_me: WARNING: ******* $_cc , $COMPATH" >&2;} - { echo "$as_me:$LINENO: checking the Compaq C compiler version" >&5 -echo $ECHO_N "checking the Compaq C compiler version... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking the Compaq C compiler version" >&5 +echo $ECHO_N "checking the Compaq C compiler version... $ECHO_C" >&6 _compaqc_version=`$CC -V 2>&1 | $AWK '{ print $3 }'` _compaqc_major=`echo $_compaqc_version | $AWK -F. '{ print $1 }'` if test "$_compaqc_major" != "T6"; then @@ -6230,8 +5232,8 @@ echo $ECHO_N "checking the Compaq C compiler version... $ECHO_C" >&6; } echo "$as_me: error: found version \"$_compaqc_version\", use version 6 of the Compaq C compiler" >&2;} { (exit 1); exit 1; }; } else - { echo "$as_me:$LINENO: result: checked" >&5 -echo "${ECHO_T}checked" >&6; } + echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6 fi fi fi @@ -6239,8 +5241,8 @@ fi if test -z "$with_perl_home"; then # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PERL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6255,28 +5257,27 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS ;; esac fi PERL=$ac_cv_path_PERL + if test -n "$PERL"; then - { echo "$as_me:$LINENO: result: $PERL" >&5 -echo "${ECHO_T}$PERL" >&6; } + echo "$as_me:$LINENO: result: $PERL" >&5 +echo "${ECHO_T}$PERL" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - else if test "$_os" = "WINNT"; then with_perl_home=`cygpath -u "$with_perl_home"` @@ -6292,8 +5293,8 @@ echo "$as_me: error: $_perl_path not found" >&2;} fi if test "$PERL"; then - { echo "$as_me:$LINENO: checking the Perl version" >&5 -echo $ECHO_N "checking the Perl version... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking the Perl version" >&5 +echo $ECHO_N "checking the Perl version... $ECHO_C" >&6 ${PERL} -e "exit($]);" _perl_version=$? if test "$_perl_version" -lt 5; then @@ -6301,8 +5302,8 @@ echo $ECHO_N "checking the Perl version... $ECHO_C" >&6; } echo "$as_me: error: found Perl version \"$_perl_version\", use version 5 of Perl" >&2;} { (exit 1); exit 1; }; } fi - { echo "$as_me:$LINENO: result: checked (perl $_perl_version)" >&5 -echo "${ECHO_T}checked (perl $_perl_version)" >&6; } + echo "$as_me:$LINENO: result: checked (perl $_perl_version)" >&5 +echo "${ECHO_T}checked (perl $_perl_version)" >&6 else { { echo "$as_me:$LINENO: error: Perl not found, install version 5 of Perl" >&5 echo "$as_me: error: Perl not found, install version 5 of Perl" >&2;} @@ -6310,11 +5311,11 @@ echo "$as_me: error: Perl not found, install version 5 of Perl" >&2;} fi -{ echo "$as_me:$LINENO: checking for required Perl modules" >&5 -echo $ECHO_N "checking for required Perl modules... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for required Perl modules" >&5 +echo $ECHO_N "checking for required Perl modules... $ECHO_C" >&6 if `$PERL -e 'use Archive::Zip;'`; then - { echo "$as_me:$LINENO: result: all modules found" >&5 -echo "${ECHO_T}all modules found" >&6; } + echo "$as_me:$LINENO: result: all modules found" >&5 +echo "${ECHO_T}all modules found" >&6 else { { echo "$as_me:$LINENO: error: Failed to find some modules" >&5 echo "$as_me: error: Failed to find some modules" >&2;} @@ -6323,8 +5324,8 @@ fi if test "$_os" = "WINNT"; then if test "$WITH_MINGWIN" != "yes"; then - { echo "$as_me:$LINENO: checking for friendly registry keys" >&5 -echo $ECHO_N "checking for friendly registry keys... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for friendly registry keys" >&5 +echo $ECHO_N "checking for friendly registry keys... $ECHO_C" >&6 # VS.Net 2003, VS.Net 2005 if test -z "$with_cl_home"; then vctest=`./oowintool --msvc-productdir`; @@ -6334,8 +5335,8 @@ echo $ECHO_N "checking for friendly registry keys... $ECHO_C" >&6; } else with_cl_home=`cygpath -u "$with_cl_home"` fi - { echo "$as_me:$LINENO: result: done" >&5 -echo "${ECHO_T}done" >&6; } + echo "$as_me:$LINENO: result: done" >&5 +echo "${ECHO_T}done" >&6 if test -n "$with_mspdb_path";then with_mspdb_path=`cygpath -u "$with_mspdb_path"` @@ -6356,8 +5357,8 @@ echo "${ECHO_T}done" >&6; } if test -z "$MSPDB_PATH";then # Extract the first word of "mspdb80.dll", so it can be a program name with args. set dummy mspdb80.dll; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_MSPDB_PATH+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6372,32 +5373,31 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MSPDB_PATH="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS ;; esac fi MSPDB_PATH=$ac_cv_path_MSPDB_PATH + if test -n "$MSPDB_PATH"; then - { echo "$as_me:$LINENO: result: $MSPDB_PATH" >&5 -echo "${ECHO_T}$MSPDB_PATH" >&6; } + echo "$as_me:$LINENO: result: $MSPDB_PATH" >&5 +echo "${ECHO_T}$MSPDB_PATH" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - # Extract the first word of "mspdb71.dll", so it can be a program name with args. set dummy mspdb71.dll; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_MSPDB_PATH+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6412,28 +5412,27 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MSPDB_PATH="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS ;; esac fi MSPDB_PATH=$ac_cv_path_MSPDB_PATH + if test -n "$MSPDB_PATH"; then - { echo "$as_me:$LINENO: result: $MSPDB_PATH" >&5 -echo "${ECHO_T}$MSPDB_PATH" >&6; } + echo "$as_me:$LINENO: result: $MSPDB_PATH" >&5 +echo "${ECHO_T}$MSPDB_PATH" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - MSPDB_PATH=`dirname "$MSPDB_PATH"` fi @@ -6446,15 +5445,15 @@ echo "$as_me: error: You need a mspdb71.dll/mspdb80.dll, make sure it's in the p MSPDB_PATH=`cygpath -u "$MSPDB_PATH"` PATH="$MSPDB_PATH:$PATH" - { echo "$as_me:$LINENO: checking the Microsoft C/C++ Compiler" >&5 -echo $ECHO_N "checking the Microsoft C/C++ Compiler... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking the Microsoft C/C++ Compiler" >&5 +echo $ECHO_N "checking the Microsoft C/C++ Compiler... $ECHO_C" >&6 if test -x "$with_cl_home/bin/cl.exe"; then CC="$with_cl_home/bin/cl.exe" else # Extract the first word of "cl.exe", so it can be a program name with args. set dummy cl.exe; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6469,40 +5468,39 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_CC="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS ;; esac fi CC=$ac_cv_path_CC + if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test -e "$CC"; then # This gives us a posix path with 8.3 filename restrictions CC=`cygpath -d "$CC"` CC=`cygpath -u "$CC"` # Remove /cl.exe from CC case insensitive - { echo "$as_me:$LINENO: result: found ($CC)" >&5 -echo "${ECHO_T}found ($CC)" >&6; } + echo "$as_me:$LINENO: result: found ($CC)" >&5 +echo "${ECHO_T}found ($CC)" >&6 COMPATH=`echo $CC | $SED 's@/[cC][lL]\.[eE][xX][eE]@@'` export INCLUDE=`cygpath -d "$COMPATH/../Include"` - { echo "$as_me:$LINENO: checking the Version of Microsoft C/C++ Compiler" >&5 -echo $ECHO_N "checking the Version of Microsoft C/C++ Compiler... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking the Version of Microsoft C/C++ Compiler" >&5 +echo $ECHO_N "checking the Version of Microsoft C/C++ Compiler... $ECHO_C" >&6 CCNUMVER=`$CC 2>&1 | $AWK "/Microsoft/ && /..\\...\\...../ { x = match( \\\$0, /..\\...\\...../ ) CCversion = substr( \\\$0, RSTART, RLENGTH) @@ -6511,23 +5509,23 @@ echo $ECHO_N "checking the Version of Microsoft C/C++ Compiler... $ECHO_C" >&6; printf (\"%04d\",vertoken[i] ) } }"` - { echo "$as_me:$LINENO: result: found Compiler version $CCNUMVER." >&5 -echo "${ECHO_T}found Compiler version $CCNUMVER." >&6; } + echo "$as_me:$LINENO: result: found Compiler version $CCNUMVER." >&5 +echo "${ECHO_T}found Compiler version $CCNUMVER." >&6 if test "$CCNUMVER" -ge "001500000000"; then COMEX=12 MSVSVER=2008 - { echo "$as_me:$LINENO: result: found .NET 2008 / VS 9.0." >&5 -echo "${ECHO_T}found .NET 2008 / VS 9.0." >&6; } + echo "$as_me:$LINENO: result: found .NET 2008 / VS 9.0." >&5 +echo "${ECHO_T}found .NET 2008 / VS 9.0." >&6 elif test "$CCNUMVER" -ge "001400000000"; then COMEX=11 MSVSVER=2005 - { echo "$as_me:$LINENO: result: found .NET 2005." >&5 -echo "${ECHO_T}found .NET 2005." >&6; } + echo "$as_me:$LINENO: result: found .NET 2005." >&5 +echo "${ECHO_T}found .NET 2005." >&6 elif test "$CCNUMVER" -ge "001300102240"; then COMEX=10 MSVSVER=2003 - { echo "$as_me:$LINENO: result: found .NET 2003." >&5 -echo "${ECHO_T}found .NET 2003." >&6; } + echo "$as_me:$LINENO: result: found .NET 2003." >&5 +echo "${ECHO_T}found .NET 2003." >&6 else { { echo "$as_me:$LINENO: error: Compiler too old. Use Microsoft C/C++ .NET 2003/2005 compiler." >&5 echo "$as_me: error: Compiler too old. Use Microsoft C/C++ .NET 2003/2005 compiler." >&2;} @@ -6539,11 +5537,11 @@ echo "$as_me: error: Microsoft C/C++ Compiler not found. Use --with-cl-home or s { (exit 1); exit 1; }; } fi else - { echo "$as_me:$LINENO: checking the Mingwin32 C++ Compiler" >&5 -echo $ECHO_N "checking the Mingwin32 C++ Compiler... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking the Mingwin32 C++ Compiler" >&5 +echo $ECHO_N "checking the Mingwin32 C++ Compiler... $ECHO_C" >&6 if test `$CC -dumpmachine | $SED -e 's/^.*-//'` = "mingw32"; then - { echo "$as_me:$LINENO: result: found." >&5 -echo "${ECHO_T}found." >&6; } + echo "$as_me:$LINENO: result: found." >&5 +echo "${ECHO_T}found." >&6 if $CC -dumpspecs | grep -q "mno-cygwin"; then USE_MINGW="cygwin" else @@ -6564,8 +5562,8 @@ if test "$_os" = "WINNT"; then if test "$WITH_MINGWIN" = "yes" || test "$COMEX" -ge "10"; then # Extract the first word of "midl.exe", so it can be a program name with args. set dummy midl.exe; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_MIDL_PATH+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6580,28 +5578,27 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MIDL_PATH="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS ;; esac fi MIDL_PATH=$ac_cv_path_MIDL_PATH + if test -n "$MIDL_PATH"; then - { echo "$as_me:$LINENO: result: $MIDL_PATH" >&5 -echo "${ECHO_T}$MIDL_PATH" >&6; } + echo "$as_me:$LINENO: result: $MIDL_PATH" >&5 +echo "${ECHO_T}$MIDL_PATH" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test -n "$MIDL_PATH";then MIDL_PATH=`dirname "$MIDL_PATH"` fi @@ -6637,8 +5634,8 @@ echo "$as_me: error: midl.exe not found. Make sure it's in the path or use --wit # Extract the first word of "csc.exe", so it can be a program name with args. set dummy csc.exe; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_CSC_PATH+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6653,28 +5650,27 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_CSC_PATH="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS ;; esac fi CSC_PATH=$ac_cv_path_CSC_PATH + if test -n "$CSC_PATH"; then - { echo "$as_me:$LINENO: result: $CSC_PATH" >&5 -echo "${ECHO_T}$CSC_PATH" >&6; } + echo "$as_me:$LINENO: result: $CSC_PATH" >&5 +echo "${ECHO_T}$CSC_PATH" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test -n "$CSC_PATH";then CSC_PATH=`dirname "$CSC_PATH"` fi @@ -6698,8 +5694,8 @@ echo "$as_me: error: csc.exe not found. Make sure it's in the path or use --with CSC_PATH=`cygpath -d "$CSC_PATH"` CSC_PATH=`cygpath -u "$CSC_PATH"` - { echo "$as_me:$LINENO: checking .NET Framework" >&5 -echo $ECHO_N "checking .NET Framework... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking .NET Framework" >&5 +echo $ECHO_N "checking .NET Framework... $ECHO_C" >&6 if test -n "$with_frame_home"; then with_frame_home=`cygpath -u "$with_frame_home"` fi @@ -6725,8 +5721,8 @@ echo $ECHO_N "checking .NET Framework... $ECHO_C" >&6; } echo "$as_me: error: mscoree.lib (.NET Framework) not found. Make sure you use --with-frame-home" >&2;} { (exit 1); exit 1; }; } fi - { echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6; } + echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6 # Convert to posix path with 8.3 filename restrictions ( No spaces ) FRAME_HOME=`cygpath -d "$FRAME_HOME"` FRAME_HOME=`cygpath -u "$FRAME_HOME"` @@ -6742,8 +5738,8 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -6765,6 +5761,7 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6775,24 +5772,25 @@ cat >>conftest.$ac_ext <<_ACEOF #else # include #endif - Syntax error + Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then : else echo "$as_me: failed program was:" >&5 @@ -6801,12 +5799,12 @@ sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi - rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether nonexistent headers + # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6814,22 +5812,23 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then # Broken: success on invalid input. continue else @@ -6840,7 +5839,6 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_preproc_ok=: break fi - rm -f conftest.err conftest.$ac_ext done @@ -6858,8 +5856,8 @@ fi else ac_cv_prog_CPP=$CPP fi -{ echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6; } +echo "$as_me:$LINENO: result: $CPP" >&5 +echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do @@ -6870,6 +5868,7 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6880,24 +5879,25 @@ cat >>conftest.$ac_ext <<_ACEOF #else # include #endif - Syntax error + Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then : else echo "$as_me: failed program was:" >&5 @@ -6906,12 +5906,12 @@ sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi - rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether nonexistent headers + # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6919,22 +5919,23 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then # Broken: success on invalid input. continue else @@ -6945,7 +5946,6 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_preproc_ok=: break fi - rm -f conftest.err conftest.$ac_ext done @@ -6968,12 +5968,13 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6993,35 +5994,30 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_objext; then + (exit $ac_status); }; }; then ac_cv_header_stdc=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_header_stdc=no +ac_cv_header_stdc=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7043,6 +6039,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7067,21 +6064,21 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include -#include #if ((' ' & 0x0FF) == 0x020) # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) #else # define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) #endif @@ -7092,28 +6089,19 @@ main () int i; for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; + || toupper (i) != TOUPPER (i)) + exit(2); + exit (0); } _ACEOF rm -f 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>&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (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_try") 2>&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -7126,14 +6114,12 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - - fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then cat >>confdefs.h <<\_ACEOF @@ -7145,22 +6131,18 @@ fi fi if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then - ac_ext=cpp + ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -z "$CXX"; then - if test -n "$CCC"; then - CXX=$CCC - else - if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC +if test -n "$ac_tool_prefix"; then + for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7173,38 +6155,36 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - { echo "$as_me:$LINENO: result: $CXX" >&5 -echo "${ECHO_T}$CXX" >&6; } + echo "$as_me:$LINENO: result: $CXX" >&5 +echo "${ECHO_T}$CXX" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - test -n "$CXX" && break done fi if test -z "$CXX"; then ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC + for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +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_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7217,89 +6197,60 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" 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_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -echo "${ECHO_T}$ac_ct_CXX" >&6; } + echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +echo "${ECHO_T}$ac_ct_CXX" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - test -n "$ac_ct_CXX" && break done +test -n "$ac_ct_CXX" || ac_ct_CXX="g++" - if test "x$ac_ct_CXX" = x; then - CXX="g++" - 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 - CXX=$ac_ct_CXX - fi + CXX=$ac_ct_CXX fi - fi -fi + # Provide some information about the compiler. -echo "$as_me:$LINENO: checking for C++ compiler version" >&5 +echo "$as_me:$LINENO:" \ + "checking for C++ compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (ac_try="$ac_compiler --version >&5" -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_compiler --version >&5") 2>&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 + (eval $ac_compiler --version &5) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -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_compiler -v >&5") 2>&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 + (eval $ac_compiler -v &5) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -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_compiler -V >&5") 2>&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 + (eval $ac_compiler -V &5) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7318,49 +6269,41 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); }; }; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_compiler_gnu=no +ac_compiler_gnu=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 GXX=`test $ac_compiler_gnu = yes && echo yes` ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS -{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } +CXXFLAGS="-g" +echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cxx_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_cxx_werror_flag=$ac_cxx_werror_flag - ac_cxx_werror_flag=yes - ac_cv_prog_cxx_g=no - CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7376,146 +6319,145 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 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_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_prog_cxx_g=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - CXXFLAGS="" - cat >conftest.$ac_ext <<_ACEOF +ac_cv_prog_cxx_g=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 +if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS=$ac_save_CXXFLAGS +elif test $ac_cv_prog_cxx_g = yes; then + if test "$GXX" = yes; then + CXXFLAGS="-g -O2" + else + CXXFLAGS="-g" + fi +else + if test "$GXX" = yes; then + CXXFLAGS="-O2" + else + CXXFLAGS= + fi +fi +for ac_declaration in \ + ''\ + '#include ' \ + 'extern "C" void std::exit (int) throw (); using std::exit;' \ + 'extern "C" void std::exit (int); using std::exit;' \ + 'extern "C" void exit (int) throw ();' \ + 'extern "C" void exit (int);' \ + 'void exit (int);' +do + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - +#include +$ac_declaration int main () { - +exit (42); ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); }; }; then : else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cxx_werror_flag=$ac_save_cxx_werror_flag - CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF +continue +fi +rm -f conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - +$ac_declaration int main () { - +exit (42); ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 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_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext +done +rm -f conftest* +if test -n "$ac_declaration"; then + echo '#ifdef __cplusplus' >>confdefs.h + echo $ac_declaration >>confdefs.h + echo '#endif' >>confdefs.h fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag -fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -ac_ext=cpp +ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 +echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 if test -z "$CXXCPP"; then if test "${ac_cv_prog_CXXCPP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7533,6 +6475,7 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7543,24 +6486,25 @@ cat >>conftest.$ac_ext <<_ACEOF #else # include #endif - Syntax error + Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then : else echo "$as_me: failed program was:" >&5 @@ -7569,12 +6513,12 @@ sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi - rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether nonexistent headers + # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7582,22 +6526,23 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then # Broken: success on invalid input. continue else @@ -7608,7 +6553,6 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_preproc_ok=: break fi - rm -f conftest.err conftest.$ac_ext done @@ -7626,8 +6570,8 @@ fi else ac_cv_prog_CXXCPP=$CXXCPP fi -{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 -echo "${ECHO_T}$CXXCPP" >&6; } +echo "$as_me:$LINENO: result: $CXXCPP" >&5 +echo "${ECHO_T}$CXXCPP" >&6 ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes do @@ -7638,6 +6582,7 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7648,24 +6593,25 @@ cat >>conftest.$ac_ext <<_ACEOF #else # include #endif - Syntax error + Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then : else echo "$as_me: failed program was:" >&5 @@ -7674,12 +6620,12 @@ sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi - rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether nonexistent headers + # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7687,22 +6633,23 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then # Broken: success on invalid input. continue else @@ -7713,7 +6660,6 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_preproc_ok=: break fi - rm -f conftest.err conftest.$ac_ext done @@ -7744,8 +6690,8 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -7767,6 +6713,7 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7777,24 +6724,25 @@ cat >>conftest.$ac_ext <<_ACEOF #else # include #endif - Syntax error + Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then : else echo "$as_me: failed program was:" >&5 @@ -7803,12 +6751,12 @@ sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi - rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether nonexistent headers + # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7816,22 +6764,23 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then # Broken: success on invalid input. continue else @@ -7842,7 +6791,6 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_preproc_ok=: break fi - rm -f conftest.err conftest.$ac_ext done @@ -7860,8 +6808,8 @@ fi else ac_cv_prog_CPP=$CPP fi -{ echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6; } +echo "$as_me:$LINENO: result: $CPP" >&5 +echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do @@ -7872,6 +6820,7 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7882,24 +6831,25 @@ cat >>conftest.$ac_ext <<_ACEOF #else # include #endif - Syntax error + Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then : else echo "$as_me: failed program was:" >&5 @@ -7908,12 +6858,12 @@ sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi - rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether nonexistent headers + # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7921,22 +6871,23 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then # Broken: success on invalid input. continue else @@ -7947,7 +6898,6 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_preproc_ok=: break fi - rm -f conftest.err conftest.$ac_ext done @@ -7983,15 +6933,16 @@ fi for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h + inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8002,35 +6953,28 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_objext; then + (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_Header=no" +eval "$as_ac_Header=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 @@ -8041,83 +6985,78 @@ fi done -{ echo "$as_me:$LINENO: checking for long" >&5 -echo $ECHO_N "checking for long... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for long" >&5 +echo $ECHO_N "checking for long... $ECHO_C" >&6 if test "${ac_cv_type_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -typedef long ac__type_new_; int main () { -if ((ac__type_new_ *) 0) +if ((long *) 0) return 0; -if (sizeof (ac__type_new_)) +if (sizeof (long)) return 0; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_objext; then + (exit $ac_status); }; }; then ac_cv_type_long=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_type_long=no +ac_cv_type_long=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5 -echo "${ECHO_T}$ac_cv_type_long" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5 +echo "${ECHO_T}$ac_cv_type_long" >&6 -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ echo "$as_me:$LINENO: checking size of long" >&5 -echo $ECHO_N "checking size of long... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking size of long" >&5 +echo $ECHO_N "checking size of long... $ECHO_C" >&6 if test "${ac_cv_sizeof_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + if test "$ac_cv_type_long" = yes; then + # The cast to unsigned long works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default - typedef long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; +static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)]; test_array [0] = 0 ; @@ -8125,36 +7064,31 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_objext; then + (exit $ac_status); }; }; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default - typedef long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; test_array [0] = 0 ; @@ -8162,53 +7096,47 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_objext; then + (exit $ac_status); }; }; then ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` +ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default - typedef long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; +static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)]; test_array [0] = 0 ; @@ -8216,36 +7144,31 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_objext; then + (exit $ac_status); }; }; then ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default - typedef long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)]; test_array [0] = 0 ; @@ -8253,63 +7176,55 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 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_objext; then + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_lo=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` +ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo= ac_hi= +ac_lo= ac_hi= fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default - typedef long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; test_array [0] = 0 ; @@ -8317,55 +7232,52 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_objext; then + (exit $ac_status); }; }; then ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo=`expr '(' $ac_mid ')' + 1` +ac_lo=`expr '(' $ac_mid ')' + 1` fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_long=$ac_lo;; -'') if test "$ac_cv_type_long" = yes; then - { { echo "$as_me:$LINENO: error: cannot compute sizeof (long) +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (long) +echo "$as_me: error: cannot compute sizeof (long), 77 See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } - else - ac_cv_sizeof_long=0 - fi ;; + { (exit 1); exit 1; }; } ;; esac +else + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default - typedef long ac__type_sizeof_; -static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } -static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } +long longval () { return (long) (sizeof (long)); } +unsigned long ulongval () { return (long) (sizeof (long)); } #include #include int @@ -8374,44 +7286,35 @@ main () FILE *f = fopen ("conftest.val", "w"); if (! f) - return 1; - if (((long int) (sizeof (ac__type_sizeof_))) < 0) + exit (1); + if (((long) (sizeof (long))) < 0) { - long int i = longval (); - if (i != ((long int) (sizeof (ac__type_sizeof_)))) - return 1; + long i = longval (); + if (i != ((long) (sizeof (long)))) + exit (1); fprintf (f, "%ld\n", i); } else { - unsigned long int i = ulongval (); - if (i != ((long int) (sizeof (ac__type_sizeof_)))) - return 1; + unsigned long i = ulongval (); + if (i != ((long) (sizeof (long)))) + exit (1); fprintf (f, "%lu\n", i); } - return ferror (f) || fclose (f) != 0; + exit (ferror (f) || fclose (f) != 0); ; return 0; } _ACEOF rm -f 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>&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (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_try") 2>&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -8422,25 +7325,22 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -if test "$ac_cv_type_long" = yes; then - { { echo "$as_me:$LINENO: error: cannot compute sizeof (long) +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (long) +echo "$as_me: error: cannot compute sizeof (long), 77 See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } - else - ac_cv_sizeof_long=0 - fi + { (exit 1); exit 1; }; } +fi +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.val +else + ac_cv_sizeof_long=0 fi -{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 -echo "${ECHO_T}$ac_cv_sizeof_long" >&6; } - - - +fi +echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 +echo "${ECHO_T}$ac_cv_sizeof_long" >&6 cat >>confdefs.h <<_ACEOF #define SIZEOF_LONG $ac_cv_sizeof_long _ACEOF @@ -8448,13 +7348,14 @@ _ACEOF SIZEOF_LONG=$ac_cv_sizeof_long -{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 -echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 +echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6 if test "${ac_cv_c_bigendian+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else # See if sys/param.h defines the BYTE_ORDER macro. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8466,8 +7367,7 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -#if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \ - && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN) +#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN bogus endian macros #endif @@ -8476,24 +7376,20 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_objext; then + (exit $ac_status); }; }; then # It does; now see whether it defined to BIG_ENDIAN or not. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8514,50 +7410,45 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 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_objext; then + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_c_bigendian=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_c_bigendian=no +ac_cv_c_bigendian=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - # It does not; compile a test program. +# It does not; compile a test program. if test "$cross_compiling" = yes; then # try to guess the endianness by grepping values into an object file ac_cv_c_bigendian=unknown cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; -short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; +short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; +short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } -short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; -short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; +short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; +short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; } int main () @@ -8568,22 +7459,17 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 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_objext; then + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then ac_cv_c_bigendian=yes fi @@ -8599,52 +7485,37 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default int main () { - /* Are we little or big endian? From Harbison&Steele. */ union { - long int l; - char c[sizeof (long int)]; + long l; + char c[sizeof (long)]; } u; u.l = 1; - return u.c[sizeof (long int) - 1] == 1; - - ; - return 0; + exit (u.c[sizeof (long) - 1] == 1); } _ACEOF rm -f 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>&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (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_try") 2>&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -8657,16 +7528,13 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_c_bigendian=yes fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - - fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 -echo "${ECHO_T}$ac_cv_c_bigendian" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 +echo "${ECHO_T}$ac_cv_c_bigendian" >&6 case $ac_cv_c_bigendian in yes) @@ -8687,15 +7555,15 @@ esac WORDS_BIGENDIAN=$ac_cv_c_bigendian -# Check whether --enable-largefile was given. +# Check whether --enable-largefile or --disable-largefile was given. if test "${enable_largefile+set}" = set; then - enableval=$enable_largefile; -fi + enableval="$enable_largefile" +fi; if test "$enable_largefile" != no; then - { echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5 -echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5 +echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_largefile_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8703,9 +7571,10 @@ else if test "$GCC" != yes; then ac_save_CC=$CC while :; do - # IRIX 6.2 and later do not support large files by default, - # so use the C compiler's -n32 option if that helps. - cat >conftest.$ac_ext <<_ACEOF + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8728,78 +7597,66 @@ main () return 0; } _ACEOF - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 + rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_objext; then + (exit $ac_status); }; }; then break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - fi - -rm -f core conftest.err conftest.$ac_objext - CC="$CC -n32" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +rm -f conftest.$ac_objext + CC="$CC -n32" + rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_objext; then + (exit $ac_status); }; }; then ac_cv_sys_largefile_CC=' -n32'; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - fi - -rm -f core conftest.err conftest.$ac_objext - break +rm -f conftest.$ac_objext + break done CC=$ac_save_CC rm -f conftest.$ac_ext fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5 -echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5 +echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 if test "$ac_cv_sys_largefile_CC" != no; then CC=$CC$ac_cv_sys_largefile_CC fi - { echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 -echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_file_offset_bits+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else while :; do + ac_cv_sys_file_offset_bits=no cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8823,32 +7680,26 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_objext; then - ac_cv_sys_file_offset_bits=no; break + (exit $ac_status); }; }; then + break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8873,54 +7724,46 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_objext; then + (exit $ac_status); }; }; then ac_cv_sys_file_offset_bits=64; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_sys_file_offset_bits=unknown +rm -f conftest.$ac_objext conftest.$ac_ext break done fi -{ echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5 -echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6; } -case $ac_cv_sys_file_offset_bits in #( - no | unknown) ;; - *) +echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5 +echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 +if test "$ac_cv_sys_file_offset_bits" != no; then + cat >>confdefs.h <<_ACEOF #define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits _ACEOF -;; -esac + +fi rm -f conftest* - if test $ac_cv_sys_file_offset_bits = unknown; then - { echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5 -echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5 +echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_large_files+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else while :; do + ac_cv_sys_large_files=no cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8944,32 +7787,26 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_objext; then - ac_cv_sys_large_files=no; break + (exit $ac_status); }; }; then + break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8994,47 +7831,37 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 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_objext; then + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_sys_large_files=1; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_sys_large_files=unknown +rm -f conftest.$ac_objext conftest.$ac_ext break done fi -{ echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5 -echo "${ECHO_T}$ac_cv_sys_large_files" >&6; } -case $ac_cv_sys_large_files in #( - no | unknown) ;; - *) +echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5 +echo "${ECHO_T}$ac_cv_sys_large_files" >&6 +if test "$ac_cv_sys_large_files" != no; then + cat >>confdefs.h <<_ACEOF #define _LARGE_FILES $ac_cv_sys_large_files _ACEOF -;; -esac + +fi rm -f conftest* - fi fi if test -n "$ac_cv_sys_file_offset_bits"; then @@ -9045,33 +7872,33 @@ if test -n "$ac_cv_sys_large_files" && test "$ac_cv_sys_large_files" != "no"; th fi -{ echo "$as_me:$LINENO: checking whether to disable vba feature" >&5 -echo $ECHO_N "checking whether to disable vba feature... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to disable vba feature" >&5 +echo $ECHO_N "checking whether to disable vba feature... $ECHO_C" >&6 if test -n "$enable_vba" && test "$enable_vba" = "no"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 ENABLE_VBA=NO else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 ENABLE_VBA=YES fi if test "$ENABLE_VBA" = "YES"; then - { echo "$as_me:$LINENO: checking how to package the vba compatibility api" >&5 -echo $ECHO_N "checking how to package the vba compatibility api... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking how to package the vba compatibility api" >&5 +echo $ECHO_N "checking how to package the vba compatibility api... $ECHO_C" >&6 if test -n "$with_vba_package_format"; then if test "$with_vba_package_format" = "extn"; then VBA_EXTENSION=YES - { echo "$as_me:$LINENO: result: uno extension" >&5 -echo "${ECHO_T}uno extension" >&6; } + echo "$as_me:$LINENO: result: uno extension" >&5 +echo "${ECHO_T}uno extension" >&6 { echo "$as_me:$LINENO: WARNING: --with-vba-package-format=extn can cause problems" >&5 echo "$as_me: WARNING: --with-vba-package-format=extn can cause problems" >&2;} else if test "$with_vba_package_format" = "builtin"; then VBA_EXTENSION=NO - { echo "$as_me:$LINENO: result: build into installset" >&5 -echo "${ECHO_T}build into installset" >&6; } + echo "$as_me:$LINENO: result: build into installset" >&5 +echo "${ECHO_T}build into installset" >&6 else { { echo "$as_me:$LINENO: error: unknown packaging method" >&5 echo "$as_me: error: unknown packaging method" >&2;} @@ -9081,8 +7908,8 @@ echo "$as_me: error: unknown packaging method" >&2;} else VBA_EXTENSION=NO - { echo "$as_me:$LINENO: result: defaulting to build into installset" >&5 -echo "${ECHO_T}defaulting to build into installset" >&6; } + echo "$as_me:$LINENO: result: defaulting to build into installset" >&5 +echo "${ECHO_T}defaulting to build into installset" >&6 fi else VBA_EXTENSION=NO @@ -9093,18 +7920,19 @@ fi if test "$test_cups" = "yes" -a "$ENABLE_CUPS" = "TRUE" ; then if test "${ac_cv_header_cups_cups_h+set}" = set; then - { echo "$as_me:$LINENO: checking for cups/cups.h" >&5 -echo $ECHO_N "checking for cups/cups.h... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for cups/cups.h" >&5 +echo $ECHO_N "checking for cups/cups.h... $ECHO_C" >&6 if test "${ac_cv_header_cups_cups_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5 -echo "${ECHO_T}$ac_cv_header_cups_cups_h" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5 +echo "${ECHO_T}$ac_cv_header_cups_cups_h" >&6 else # Is the header compilable? -{ echo "$as_me:$LINENO: checking cups/cups.h usability" >&5 -echo $ECHO_N "checking cups/cups.h usability... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking cups/cups.h usability" >&5 +echo $ECHO_N "checking cups/cups.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -9114,38 +7942,33 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 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_objext; then + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no +ac_header_compiler=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 # Is the header present? -{ echo "$as_me:$LINENO: checking cups/cups.h presence" >&5 -echo $ECHO_N "checking cups/cups.h presence... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking cups/cups.h presence" >&5 +echo $ECHO_N "checking cups/cups.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -9153,22 +7976,23 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -9176,45 +8000,52 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi - rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) +case $ac_header_compiler:$ac_header_preproc in + yes:no ) { echo "$as_me:$LINENO: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: cups/cups.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes + { echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; - no:yes:* ) + no:yes ) { echo "$as_me:$LINENO: WARNING: cups/cups.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: cups/cups.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: cups/cups.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: cups/cups.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: cups/cups.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: cups/cups.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: cups/cups.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: cups/cups.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: cups/cups.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: cups/cups.h: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&2;} - + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for cups/cups.h" >&5 -echo $ECHO_N "checking for cups/cups.h... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for cups/cups.h" >&5 +echo $ECHO_N "checking for cups/cups.h... $ECHO_C" >&6 if test "${ac_cv_header_cups_cups_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_cups_cups_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5 -echo "${ECHO_T}$ac_cv_header_cups_cups_h" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5 +echo "${ECHO_T}$ac_cv_header_cups_cups_h" >&6 fi if test $ac_cv_header_cups_cups_h = yes; then @@ -9229,25 +8060,26 @@ fi fi if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "GNU"; then - { echo "$as_me:$LINENO: checking whether to enable pam support" >&5 -echo $ECHO_N "checking whether to enable pam support... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking whether to enable pam support" >&5 +echo $ECHO_N "checking whether to enable pam support... $ECHO_C" >&6 if test -z "$enable_pam" || test "$enable_pam" != "no"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 PAM=YES if test "${ac_cv_header_security_pam_appl_h+set}" = set; then - { echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5 -echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5 +echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6 if test "${ac_cv_header_security_pam_appl_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5 -echo "${ECHO_T}$ac_cv_header_security_pam_appl_h" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5 +echo "${ECHO_T}$ac_cv_header_security_pam_appl_h" >&6 else # Is the header compilable? -{ echo "$as_me:$LINENO: checking security/pam_appl.h usability" >&5 -echo $ECHO_N "checking security/pam_appl.h usability... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking security/pam_appl.h usability" >&5 +echo $ECHO_N "checking security/pam_appl.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -9257,38 +8089,33 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_objext; then + (exit $ac_status); }; }; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no +ac_header_compiler=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 # Is the header present? -{ echo "$as_me:$LINENO: checking security/pam_appl.h presence" >&5 -echo $ECHO_N "checking security/pam_appl.h presence... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking security/pam_appl.h presence" >&5 +echo $ECHO_N "checking security/pam_appl.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -9296,22 +8123,23 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -9319,45 +8147,52 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi - rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) +case $ac_header_compiler:$ac_header_preproc in + yes:no ) { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: security/pam_appl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: security/pam_appl.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes + { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; - no:yes:* ) + no:yes ) { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: security/pam_appl.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: security/pam_appl.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: security/pam_appl.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: security/pam_appl.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: security/pam_appl.h: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: security/pam_appl.h: in the future, the compiler will take precedence" >&2;} - + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5 -echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5 +echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6 if test "${ac_cv_header_security_pam_appl_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_security_pam_appl_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5 -echo "${ECHO_T}$ac_cv_header_security_pam_appl_h" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5 +echo "${ECHO_T}$ac_cv_header_security_pam_appl_h" >&6 fi if test $ac_cv_header_security_pam_appl_h = yes; then @@ -9369,74 +8204,67 @@ echo "$as_me: error: pam_appl.h could not be found. libpam-dev or pam-devel miss fi - { echo "$as_me:$LINENO: checking whether to link to libpam" >&5 -echo $ECHO_N "checking whether to link to libpam... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking whether to link to libpam" >&5 +echo $ECHO_N "checking whether to link to libpam... $ECHO_C" >&6 if test -n "$enable_pam_link" -a "$enable_pam_link" != "no"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 PAM_LINK=YES -{ echo "$as_me:$LINENO: checking for pam_start in -lpam" >&5 -echo $ECHO_N "checking for pam_start in -lpam... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for pam_start in -lpam" >&5 +echo $ECHO_N "checking for pam_start in -lpam... $ECHO_C" >&6 if test "${ac_cv_lib_pam_pam_start+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lpam $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char pam_start (); int main () { -return pam_start (); +pam_start (); ; 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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 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 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_pam_pam_start=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_pam_pam_start=no +ac_cv_lib_pam_pam_start=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_pam_pam_start" >&5 -echo "${ECHO_T}$ac_cv_lib_pam_pam_start" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_lib_pam_pam_start" >&5 +echo "${ECHO_T}$ac_cv_lib_pam_pam_start" >&6 if test $ac_cv_lib_pam_pam_start = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBPAM 1 @@ -9451,13 +8279,13 @@ echo "$as_me: error: libpam not found or functional" >&2;} fi else - { echo "$as_me:$LINENO: result: no, dynamically open it" >&5 -echo "${ECHO_T}no, dynamically open it" >&6; } + echo "$as_me:$LINENO: result: no, dynamically open it" >&5 +echo "${ECHO_T}no, dynamically open it" >&6 PAM_LINK=NO fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 PAM=NO PAM_LINK=NO @@ -9468,8 +8296,8 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - { echo "$as_me:$LINENO: checking how many arguments getspnam_r() takes" >&5 -echo $ECHO_N "checking how many arguments getspnam_r() takes... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking how many arguments getspnam_r() takes" >&5 +echo $ECHO_N "checking how many arguments getspnam_r() takes... $ECHO_C" >&6 if test "${ac_cv_func_which_getspnam_r+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9490,6 +8318,7 @@ ac_cv_func_which_getspnam_r=unknown # assuming an implicit prototype. In which case, we're out of luck. # cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -9511,31 +8340,24 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 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_objext; then + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_func_which_getspnam_r=no else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext # # FIVE ARGUMENTS @@ -9544,6 +8366,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test "$ac_cv_func_which_getspnam_r" = "unknown"; then cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -9567,31 +8390,24 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_objext; then + (exit $ac_status); }; }; then ac_cv_func_which_getspnam_r=five else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi @@ -9602,6 +8418,7 @@ fi if test "$ac_cv_func_which_getspnam_r" = "unknown"; then cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -9625,31 +8442,24 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_objext; then + (exit $ac_status); }; }; then ac_cv_func_which_getspnam_r=four else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi @@ -9660,24 +8470,24 @@ fi case "$ac_cv_func_which_getspnam_r" in five) - { echo "$as_me:$LINENO: result: five" >&5 -echo "${ECHO_T}five" >&6; } + echo "$as_me:$LINENO: result: five" >&5 +echo "${ECHO_T}five" >&6 NEW_SHADOW_API=YES ;; four) - { echo "$as_me:$LINENO: result: four" >&5 -echo "${ECHO_T}four" >&6; } + echo "$as_me:$LINENO: result: four" >&5 +echo "${ECHO_T}four" >&6 ;; no) - { echo "$as_me:$LINENO: result: cannot find function declaration in shadow.h" >&5 -echo "${ECHO_T}cannot find function declaration in shadow.h" >&6; } + echo "$as_me:$LINENO: result: cannot find function declaration in shadow.h" >&5 +echo "${ECHO_T}cannot find function declaration in shadow.h" >&6 ;; unknown) - { echo "$as_me:$LINENO: result: can't tell" >&5 -echo "${ECHO_T}can't tell" >&6; } + echo "$as_me:$LINENO: result: can't tell" >&5 +echo "${ECHO_T}can't tell" >&6 ;; *) @@ -9702,74 +8512,67 @@ fi if test "$_os" = "Linux"; then - { echo "$as_me:$LINENO: checking whether to link to libcrypt" >&5 -echo $ECHO_N "checking whether to link to libcrypt... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking whether to link to libcrypt" >&5 +echo $ECHO_N "checking whether to link to libcrypt... $ECHO_C" >&6 if test -n "$enable_crypt_link" -a "$enable_crypt_link" != "no"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 CRYPT_LINK=YES -{ echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5 -echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5 +echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6 if test "${ac_cv_lib_crypt_crypt+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lcrypt $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char crypt (); int main () { -return crypt (); +crypt (); ; 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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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 + (exit $ac_status); }; }; then ac_cv_lib_crypt_crypt=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_crypt_crypt=no +ac_cv_lib_crypt_crypt=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5 -echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5 +echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6 if test $ac_cv_lib_crypt_crypt = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBCRYPT 1 @@ -9784,8 +8587,8 @@ echo "$as_me: error: libcrypt not found or functional" >&2;} fi else - { echo "$as_me:$LINENO: result: no, dynamically open it" >&5 -echo "${ECHO_T}no, dynamically open it" >&6; } + echo "$as_me:$LINENO: result: no, dynamically open it" >&5 +echo "${ECHO_T}no, dynamically open it" >&6 CRYPT_LINK=NO fi fi @@ -9804,22 +8607,18 @@ if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then fi if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then - ac_ext=cpp + ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -z "$CXX"; then - if test -n "$CCC"; then - CXX=$CCC - else - if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC +if test -n "$ac_tool_prefix"; then + for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9832,38 +8631,36 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - { echo "$as_me:$LINENO: result: $CXX" >&5 -echo "${ECHO_T}$CXX" >&6; } + echo "$as_me:$LINENO: result: $CXX" >&5 +echo "${ECHO_T}$CXX" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - test -n "$CXX" && break done fi if test -z "$CXX"; then ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC + for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +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_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9876,89 +8673,60 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" 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_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -echo "${ECHO_T}$ac_ct_CXX" >&6; } + echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +echo "${ECHO_T}$ac_ct_CXX" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - test -n "$ac_ct_CXX" && break done +test -n "$ac_ct_CXX" || ac_ct_CXX="g++" - if test "x$ac_ct_CXX" = x; then - CXX="g++" - 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 - CXX=$ac_ct_CXX - fi + CXX=$ac_ct_CXX fi - fi -fi + # Provide some information about the compiler. -echo "$as_me:$LINENO: checking for C++ compiler version" >&5 +echo "$as_me:$LINENO:" \ + "checking for C++ compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (ac_try="$ac_compiler --version >&5" -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_compiler --version >&5") 2>&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 + (eval $ac_compiler --version &5) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -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_compiler -v >&5") 2>&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 + (eval $ac_compiler -v &5) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -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_compiler -V >&5") 2>&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 + (eval $ac_compiler -V &5) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -9977,49 +8745,41 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); }; }; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_compiler_gnu=no +ac_compiler_gnu=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 GXX=`test $ac_compiler_gnu = yes && echo yes` ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS -{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } +CXXFLAGS="-g" +echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cxx_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_cxx_werror_flag=$ac_cxx_werror_flag - ac_cxx_werror_flag=yes - ac_cv_prog_cxx_g=no - CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -10035,133 +8795,132 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); }; }; then ac_cv_prog_cxx_g=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - CXXFLAGS="" - cat >conftest.$ac_ext <<_ACEOF +ac_cv_prog_cxx_g=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 +if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS=$ac_save_CXXFLAGS +elif test $ac_cv_prog_cxx_g = yes; then + if test "$GXX" = yes; then + CXXFLAGS="-g -O2" + else + CXXFLAGS="-g" + fi +else + if test "$GXX" = yes; then + CXXFLAGS="-O2" + else + CXXFLAGS= + fi +fi +for ac_declaration in \ + ''\ + '#include ' \ + 'extern "C" void std::exit (int) throw (); using std::exit;' \ + 'extern "C" void std::exit (int); using std::exit;' \ + 'extern "C" void exit (int) throw ();' \ + 'extern "C" void exit (int);' \ + 'void exit (int);' +do + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - +#include +$ac_declaration int main () { - +exit (42); ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); }; }; then : else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cxx_werror_flag=$ac_save_cxx_werror_flag - CXXFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF +continue +fi +rm -f conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - +$ac_declaration int main () { - +exit (42); ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 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_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext +done +rm -f conftest* +if test -n "$ac_declaration"; then + echo '#ifdef __cplusplus' >>confdefs.h + echo $ac_declaration >>confdefs.h + echo '#endif' >>confdefs.h fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag -fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi -fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -10171,20 +8930,20 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi if test "$GXX" = "yes"; then - { echo "$as_me:$LINENO: checking the GNU C++ compiler version" >&5 -echo $ECHO_N "checking the GNU C++ compiler version... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking the GNU C++ compiler version" >&5 +echo $ECHO_N "checking the GNU C++ compiler version... $ECHO_C" >&6 _gpp_version=`$CXX -dumpversion` _gpp_major=`echo $_gpp_version | $AWK -F. '{ print \$1 }'` _gpp_minor=`echo $_gpp_version | $AWK -F. '{ print \$2 }'` - { echo "$as_me:$LINENO: result: checked (g++ $_gpp_version)" >&5 -echo "${ECHO_T}checked (g++ $_gpp_version)" >&6; } + echo "$as_me:$LINENO: result: checked (g++ $_gpp_version)" >&5 +echo "${ECHO_T}checked (g++ $_gpp_version)" >&6 if test "$_gpp_major" = "3"; then if test "$_gpp_minor" = "4"; then - { echo "$as_me:$LINENO: checking whether $CXX has the enum bug" >&5 -echo $ECHO_N "checking whether $CXX has the enum bug... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking whether $CXX has the enum bug" >&5 +echo $ECHO_N "checking whether $CXX has the enum bug... $ECHO_C" >&6 if test "$cross_compiling" = yes; then { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling See \`config.log' for more details." >&5 @@ -10193,6 +8952,7 @@ See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -10222,22 +8982,13 @@ main (void) _ACEOF rm -f 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>&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (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_try") 2>&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -10250,13 +9001,11 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } +echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - - fi fi fi @@ -10264,8 +9013,8 @@ fi # Removed the special FreeBSD treatment. The problem was that with_gxx_include_path # often contains an i386 which is expanded as a macro. Solved in stlport. if test "$GXX" = "yes"; then - { echo "$as_me:$LINENO: checking for g++ include path" >&5 -echo $ECHO_N "checking for g++ include path... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for g++ include path" >&5 +echo $ECHO_N "checking for g++ include path... $ECHO_C" >&6 if test -z "$with_gxx_include_path"; then with_gxx_include_path=`echo "#include " | $CXX -E -xc++ - | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1` if test "$with_gxx_include_path" = "/usr/libexec/(null)/include"; then @@ -10276,25 +9025,25 @@ echo $ECHO_N "checking for g++ include path... $ECHO_C" >&6; } with_gxx_include_path=`cygpath -u "$with_gxx_include_path"` fi if echo $with_gxx_include_path | grep -q linux; then - # workaround for Mandriva - with_gxx_include_path=`cd $with_gxx_include_path && pwd` + # workaround for Mandriva - issue 100049 + with_gxx_include_path=`cd $with_gxx_include_path && pwd` fi fi fi if test -z "$with_gxx_include_path"; then with_gxx_include_path="NO_GXX_INCLUDE" - { echo "$as_me:$LINENO: result: no g++ includes" >&5 -echo "${ECHO_T}no g++ includes" >&6; } + echo "$as_me:$LINENO: result: no g++ includes" >&5 +echo "${ECHO_T}no g++ includes" >&6 else - { echo "$as_me:$LINENO: result: $with_gxx_include_path" >&5 -echo "${ECHO_T}$with_gxx_include_path" >&6; } + echo "$as_me:$LINENO: result: $with_gxx_include_path" >&5 +echo "${ECHO_T}$with_gxx_include_path" >&6 fi GXX_INCLUDE_PATH="$with_gxx_include_path" if test "$WITH_MINGWIN" = "yes"; then - { echo "$as_me:$LINENO: checking for mingwin runtime include path" >&5 -echo $ECHO_N "checking for mingwin runtime include path... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for mingwin runtime include path" >&5 +echo $ECHO_N "checking for mingwin runtime include path... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #include #include @@ -10312,11 +9061,11 @@ _ACEOF fi if test -z "$_mingw_lib_include_path"; then _mingw_lib_include_path="NO_LIB_INCLUDE" - { echo "$as_me:$LINENO: result: no mingwin runtime includes" >&5 -echo "${ECHO_T}no mingwin runtime includes" >&6; } + echo "$as_me:$LINENO: result: no mingwin runtime includes" >&5 +echo "${ECHO_T}no mingwin runtime includes" >&6 else - { echo "$as_me:$LINENO: result: $_mingw_lib_include_path" >&5 -echo "${ECHO_T}$_mingw_lib_include_path" >&6; } + echo "$as_me:$LINENO: result: $_mingw_lib_include_path" >&5 +echo "${ECHO_T}$_mingw_lib_include_path" >&6 fi MINGW_LIB_INCLUDE_PATH="$_mingw_lib_include_path" @@ -10324,49 +9073,49 @@ fi if test "$_os" = "SunOS"; then if test "$CC" = "cc"; then - { echo "$as_me:$LINENO: checking SunStudio C++ Compiler" >&5 -echo $ECHO_N "checking SunStudio C++ Compiler... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking SunStudio C++ Compiler" >&5 +echo $ECHO_N "checking SunStudio C++ Compiler... $ECHO_C" >&6 if test "$CXX" != "CC"; then { echo "$as_me:$LINENO: WARNING: SunStudio C++ was not found" >&5 echo "$as_me: WARNING: SunStudio C++ was not found" >&2;} echo "SunStudio C++ was not found" >> warn else - { echo "$as_me:$LINENO: result: checked" >&5 -echo "${ECHO_T}checked" >&6; } + echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6 fi fi fi if test "$_os" = "Darwin"; then if test "$CC" = "cc"; then - { echo "$as_me:$LINENO: checking Macosx c++ Compiler" >&5 -echo $ECHO_N "checking Macosx c++ Compiler... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking Macosx c++ Compiler" >&5 +echo $ECHO_N "checking Macosx c++ Compiler... $ECHO_C" >&6 if test "$CXX" != "c++"; then { echo "$as_me:$LINENO: WARNING: Macosx C++ was not found" >&5 echo "$as_me: WARNING: Macosx C++ was not found" >&2;} echo "Macosx C++ was not found" >> warn else - { echo "$as_me:$LINENO: result: checked" >&5 -echo "${ECHO_T}checked" >&6; } + echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6 fi fi fi if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then if test "$CC" = "cc"; then - { echo "$as_me:$LINENO: checking SGI MIPSpro C++ Compiler" >&5 -echo $ECHO_N "checking SGI MIPSpro C++ Compiler... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking SGI MIPSpro C++ Compiler" >&5 +echo $ECHO_N "checking SGI MIPSpro C++ Compiler... $ECHO_C" >&6 if test "$CXX" != "CC"; then { echo "$as_me:$LINENO: WARNING: SGI MIPSpro C++ was not found" >&5 echo "$as_me: WARNING: SGI MIPSpro C++ was not found" >&2;} echo "SGI MIPSpro C++ was not found" >> warn else - { echo "$as_me:$LINENO: result: checked" >&5 -echo "${ECHO_T}checked" >&6; } + echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6 fi fi fi if test "$_os" = "OSF1"; then - { echo "$as_me:$LINENO: checking Compaq C++ compiler version" >&5 -echo $ECHO_N "checking Compaq C++ compiler version... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking Compaq C++ compiler version" >&5 +echo $ECHO_N "checking Compaq C++ compiler version... $ECHO_C" >&6 _compaqcxx_version=`$CXX -V 2>&1 | $AWK '{ print $3 }'` _compaqcxx_major=`echo $_compaqcxx_version | $AWK -F. '{ print $1 }'` if test "$_compaqcxx_major" != "V6"; then @@ -10374,16 +9123,16 @@ echo $ECHO_N "checking Compaq C++ compiler version... $ECHO_C" >&6; } echo "$as_me: WARNING: found version \"$_compaqc_version\", use version 6 of the Compaq C++ compiler" >&2;} echo "found version $_compaqc_version, use version 6 of the Compaq C++ compiler" >> warn else - { echo "$as_me:$LINENO: result: checked" >&5 -echo "${ECHO_T}checked" >&6; } + echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6 fi fi if test "$_os" = "SunOS"; then _temp=`showrev -p | $AWK -F" " '{ print $2 }'` if test "$_os_release" = "7"; then - { echo "$as_me:$LINENO: checking for patch 106327-06 or greater" >&5 -echo $ECHO_N "checking for patch 106327-06 or greater... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for patch 106327-06 or greater" >&5 +echo $ECHO_N "checking for patch 106327-06 or greater... $ECHO_C" >&6 _patch=`echo $_temp | $AWK '/106327-06/ { print "found" }'` _patch="false" for i in $_temp @@ -10397,15 +9146,15 @@ echo $ECHO_N "checking for patch 106327-06 or greater... $ECHO_C" >&6; } fi done if test "$_patch" = "found"; then - { echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6; } + echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6 else { echo "$as_me:$LINENO: WARNING: patch 106327-06 not found, please install compiler patch 106327-06 or greater" >&5 echo "$as_me: WARNING: patch 106327-06 not found, please install compiler patch 106327-06 or greater" >&2;} echo "patch 106327-06 not found, please install compiler patch 106327-06 or greater" >> warn fi - { echo "$as_me:$LINENO: checking for patch 106950-11 or greater" >&5 -echo $ECHO_N "checking for patch 106950-11 or greater... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for patch 106950-11 or greater" >&5 +echo $ECHO_N "checking for patch 106950-11 or greater... $ECHO_C" >&6 _patch=`echo $_temp | $AWK '/106950-11/ { print "found" }'` _patch="false" for i in $_temp @@ -10419,8 +9168,8 @@ echo $ECHO_N "checking for patch 106950-11 or greater... $ECHO_C" >&6; } fi done if test "$_patch" = "found"; then - { echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6; } + echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6 else { echo "$as_me:$LINENO: WARNING: patch 106950-11 not found, please install linker patch 106950-11 or greater" >&5 echo "$as_me: WARNING: patch 106950-11 not found, please install linker patch 106950-11 or greater" >&2;} @@ -10428,8 +9177,8 @@ echo "$as_me: WARNING: patch 106950-11 not found, please install linker patch 10 fi else if test "$_os_release" = "6"; then - { echo "$as_me:$LINENO: checking for patch 105591-09 or greater" >&5 -echo $ECHO_N "checking for patch 105591-09 or greater... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for patch 105591-09 or greater" >&5 +echo $ECHO_N "checking for patch 105591-09 or greater... $ECHO_C" >&6 _patch=`echo $_temp | $AWK '/105591-09/ { print "found" }'` _patch="false" for i in $_temp @@ -10443,15 +9192,15 @@ echo $ECHO_N "checking for patch 105591-09 or greater... $ECHO_C" >&6; } fi done if test "$_patch" = "found"; then - { echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6; } + echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6 else { echo "$as_me:$LINENO: WARNING: patch 105591-09 not found, please install compiler patch 105591-09 or greater" >&5 echo "$as_me: WARNING: patch 105591-09 not found, please install compiler patch 105591-09 or greater" >&2;} echo "patch 105591-09 not found, please install compiler patch 105591-09 or greater" >> warn fi - { echo "$as_me:$LINENO: checking for patch 107733-08 or greater" >&5 -echo $ECHO_N "checking for patch 107733-08 or greater... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for patch 107733-08 or greater" >&5 +echo $ECHO_N "checking for patch 107733-08 or greater... $ECHO_C" >&6 _patch=`echo $_temp | $AWK '/107733-08/ { print "found" }'` _patch="false" for i in $_temp @@ -10465,8 +9214,8 @@ echo $ECHO_N "checking for patch 107733-08 or greater... $ECHO_C" >&6; } fi done if test "$_patch" = "found"; then - { echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6; } + echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6 else { echo "$as_me:$LINENO: WARNING: patch 107733-06 not found, please install linker patch 107733-08 or greater" >&5 echo "$as_me: WARNING: patch 107733-06 not found, please install linker patch 107733-08 or greater" >&2;} @@ -10478,15 +9227,15 @@ fi if test -n "$enable_sgistl" && "$enable_sgistl" != "no"; then if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then - { echo "$as_me:$LINENO: checking for SGI STL" >&5 -echo $ECHO_N "checking for SGI STL... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for SGI STL" >&5 +echo $ECHO_N "checking for SGI STL... $ECHO_C" >&6 if test -d /usr/include/CC ; then - { echo "$as_me:$LINENO: result: yes." >&5 -echo "${ECHO_T}yes." >&6; } + echo "$as_me:$LINENO: result: yes." >&5 +echo "${ECHO_T}yes." >&6 else - { echo "$as_me:$LINENO: result: not found." >&5 -echo "${ECHO_T}not found." >&6; } + echo "$as_me:$LINENO: result: not found." >&5 +echo "${ECHO_T}not found." >&6 fi else { { echo "$as_me:$LINENO: error: Option --enable-sgistl is only valid for IRIX" >&5 @@ -10495,8 +9244,8 @@ echo "$as_me: error: Option --enable-sgistl is only valid for IRIX" >&2;} fi else - { echo "$as_me:$LINENO: checking what the default STL should be" >&5 -echo $ECHO_N "checking what the default STL should be... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking what the default STL should be" >&5 +echo $ECHO_N "checking what the default STL should be... $ECHO_C" >&6 DEFAULT_TO_STLPORT="no" if test "$_os" = "Linux"; then case "$build_cpu" in @@ -10517,31 +9266,31 @@ echo $ECHO_N "checking what the default STL should be... $ECHO_C" >&6; } DEFAULT_TO_STLPORT="yes" fi if test "$DEFAULT_TO_STLPORT" = "yes"; then - { echo "$as_me:$LINENO: result: stlport" >&5 -echo "${ECHO_T}stlport" >&6; } + echo "$as_me:$LINENO: result: stlport" >&5 +echo "${ECHO_T}stlport" >&6 else - { echo "$as_me:$LINENO: result: system" >&5 -echo "${ECHO_T}system" >&6; } + echo "$as_me:$LINENO: result: system" >&5 +echo "${ECHO_T}system" >&6 fi if test "$WITH_STLPORT" = "auto"; then WITH_STLPORT=$DEFAULT_TO_STLPORT fi - { echo "$as_me:$LINENO: checking for STL providing headers" >&5 -echo $ECHO_N "checking for STL providing headers... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for STL providing headers" >&5 +echo $ECHO_N "checking for STL providing headers... $ECHO_C" >&6 STLPORT4="" USE_SYSTEM_STL="" if test "$WITH_STLPORT" = "yes"; then - { echo "$as_me:$LINENO: result: using internal stlport." >&5 -echo "${ECHO_T}using internal stlport." >&6; } + echo "$as_me:$LINENO: result: using internal stlport." >&5 +echo "${ECHO_T}using internal stlport." >&6 if test "$DEFAULT_TO_STLPORT" != "yes"; then { echo "$as_me:$LINENO: WARNING: using stlport. Warning, breaks your ABI compatability!" >&5 echo "$as_me: WARNING: using stlport. Warning, breaks your ABI compatability!" >&2;} echo "using stlport. Warning, breaks your ABI compatability!" >>warn fi elif test "$WITH_STLPORT" = "no"; then - { echo "$as_me:$LINENO: result: using system STL" >&5 -echo "${ECHO_T}using system STL" >&6; } + echo "$as_me:$LINENO: result: using system STL" >&5 +echo "${ECHO_T}using system STL" >&6 USE_SYSTEM_STL="YES" if test "$DEFAULT_TO_STLPORT" != "no"; then { echo "$as_me:$LINENO: WARNING: using system STL. Warning, breaks your ABI compatability!" >&5 @@ -10552,6 +9301,7 @@ echo "$as_me: WARNING: using system STL. Warning, breaks your ABI compatability! STLPORT4=$WITH_STLPORT if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -10559,24 +9309,25 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $STLPORT4/stlport/hash_map _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - { echo "$as_me:$LINENO: result: checked." >&5 -echo "${ECHO_T}checked." >&6; } + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + echo "$as_me:$LINENO: result: checked." >&5 +echo "${ECHO_T}checked." >&6 else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -10585,12 +9336,11 @@ sed 's/^/| /' conftest.$ac_ext >&5 echo "$as_me: error: STLport headers not found." >&2;} { (exit 1); exit 1; }; } fi - rm -f conftest.err conftest.$ac_ext else if test -f "$STLPORT4/stlport/hash_map"; then - { echo "$as_me:$LINENO: result: checked." >&5 -echo "${ECHO_T}checked." >&6; } + echo "$as_me:$LINENO: result: checked." >&5 +echo "${ECHO_T}checked." >&6 else { { echo "$as_me:$LINENO: error: STLport headers not found." >&5 echo "$as_me: error: STLport headers not found." >&2;} @@ -10598,15 +9348,15 @@ echo "$as_me: error: STLport headers not found." >&2;} fi fi if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then - { echo "$as_me:$LINENO: checking for STLport libraries" >&5 -echo $ECHO_N "checking for STLport libraries... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for STLport libraries" >&5 +echo $ECHO_N "checking for STLport libraries... $ECHO_C" >&6 if test "$_os" = "SunOS"; then if test -f "$STLPORT4/lib/libstlport_sunpro.so"; then - { echo "$as_me:$LINENO: result: checked" >&5 -echo "${ECHO_T}checked" >&6; } + echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6 elif test -f "$STLPORT4/lib/libstlport.so"; then - { echo "$as_me:$LINENO: result: checked" >&5 -echo "${ECHO_T}checked" >&6; } + echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6 STLPORT_VER=500 else { { echo "$as_me:$LINENO: error: STLport libraries not found" >&5 @@ -10615,11 +9365,11 @@ echo "$as_me: error: STLport libraries not found" >&2;} fi elif test "$_os" = "Darwin"; then if test -f "$STLPORT4/lib/libstlport_gcc.dylib"; then - { echo "$as_me:$LINENO: result: checked" >&5 -echo "${ECHO_T}checked" >&6; } + echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6 elif test -f "$STLPORT4/lib/libstlport.dylib"; then - { echo "$as_me:$LINENO: result: checked" >&5 -echo "${ECHO_T}checked" >&6; } + echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6 STLPORT_VER=500 else { { echo "$as_me:$LINENO: error: STLport libraries not found" >&5 @@ -10628,15 +9378,15 @@ echo "$as_me: error: STLport libraries not found" >&2;} fi elif test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then if test -f "$STLPORT4/lib/libstlport_mipspro_41.so"; then - { echo "$as_me:$LINENO: result: checked" >&5 -echo "${ECHO_T}checked" >&6; } + echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6 else if test -f "$STLPORT4/lib/libstlport_gcc.so"; then - { echo "$as_me:$LINENO: result: checked" >&5 -echo "${ECHO_T}checked" >&6; } + echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6 elif test -f "$STLPORT4/lib/libstlport.so"; then - { echo "$as_me:$LINENO: result: checked" >&5 -echo "${ECHO_T}checked" >&6; } + echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6 STLPORT_VER=500 else { { echo "$as_me:$LINENO: error: STLport libraries not found" >&5 @@ -10646,11 +9396,11 @@ echo "$as_me: error: STLport libraries not found" >&2;} fi else if test -f "$STLPORT4/lib/libstlport_gcc.so"; then - { echo "$as_me:$LINENO: result: checked" >&5 -echo "${ECHO_T}checked" >&6; } + echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6 elif test -f "$STLPORT4/lib/libstlport.so"; then - { echo "$as_me:$LINENO: result: checked" >&5 -echo "${ECHO_T}checked" >&6; } + echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6 STLPORT_VER=500 else { { echo "$as_me:$LINENO: error: STLport libraries not found" >&5 @@ -10678,11 +9428,12 @@ fi if test "$GCC" = "yes"; then - { echo "$as_me:$LINENO: checking whether $CC supports -fvisibility=hidden" >&5 -echo $ECHO_N "checking whether $CC supports -fvisibility=hidden... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking whether $CC supports -fvisibility=hidden" >&5 +echo $ECHO_N "checking whether $CC supports -fvisibility=hidden... $ECHO_C" >&6 save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -fvisibility=hidden" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -10698,47 +9449,38 @@ main () } _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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 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 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then HAVE_GCC_VISIBILITY_FEATURE=TRUE else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext CFLAGS=$save_CFLAGS if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi fi if test "$USE_SYSTEM_STL" = "YES"; then - { echo "$as_me:$LINENO: checking if hash_map will be in __gnu_cxx namespace" >&5 -echo $ECHO_N "checking if hash_map will be in __gnu_cxx namespace... $ECHO_C" >&6; } - ac_ext=cpp + echo "$as_me:$LINENO: checking if hash_map will be in __gnu_cxx namespace" >&5 +echo $ECHO_N "checking if hash_map will be in __gnu_cxx namespace... $ECHO_C" >&6 + ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -10747,6 +9489,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -10764,46 +9507,41 @@ hash_map t; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); }; }; then ac_cv_cxx_have_ext_hash_map=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_cxx_have_ext_hash_map=no +ac_cv_cxx_have_ext_hash_map=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext if test "$ac_cv_cxx_have_ext_hash_map" = "no"; then { { echo "$as_me:$LINENO: error: Can't find hash_map. Try with --with-stlport" >&5 echo "$as_me: error: Can't find hash_map. Try with --with-stlport" >&2;} { (exit 1); exit 1; }; } else - { echo "$as_me:$LINENO: result: $ac_cv_cxx_have_ext_hash_map" >&5 -echo "${ECHO_T}$ac_cv_cxx_have_ext_hash_map" >&6; } + echo "$as_me:$LINENO: result: $ac_cv_cxx_have_ext_hash_map" >&5 +echo "${ECHO_T}$ac_cv_cxx_have_ext_hash_map" >&6 fi if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then - { echo "$as_me:$LINENO: checking if STL headers are visibility safe" >&5 -echo $ECHO_N "checking if STL headers are visibility safe... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking if STL headers are visibility safe" >&5 +echo $ECHO_N "checking if STL headers are visibility safe... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -10820,8 +9558,8 @@ else fi rm -f conftest* - { echo "$as_me:$LINENO: result: $stlvisok" >&5 -echo "${ECHO_T}$stlvisok" >&6; } + echo "$as_me:$LINENO: result: $stlvisok" >&5 +echo "${ECHO_T}$stlvisok" >&6 if test "$stlvisok" = "no"; then { echo "$as_me:$LINENO: WARNING: Your gcc STL headers are not visibility safe. Disabling visibility" >&5 echo "$as_me: WARNING: Your gcc STL headers are not visibility safe. Disabling visibility" >&2;} @@ -10834,9 +9572,10 @@ echo "$as_me: WARNING: Your gcc STL headers are not visibility safe. Disabling v sharedlink_ldflags_save=$LDFLAGS LDFLAGS="$LDFLAGS -fvisibility-inlines-hidden -fpic -shared" - { echo "$as_me:$LINENO: checking if gcc is -fvisibility-inlines-hidden safe with STL headers" >&5 -echo $ECHO_N "checking if gcc is -fvisibility-inlines-hidden safe with STL headers... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking if gcc is -fvisibility-inlines-hidden safe with STL headers" >&5 +echo $ECHO_N "checking if gcc is -fvisibility-inlines-hidden safe with STL headers... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -10854,36 +9593,28 @@ istringstream strm( "test" ); 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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); }; }; then $EGREP -q unresolvable conftest.err; if test $? -eq 0; then gccvisok=no; else gccvisok=yes; fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - gccvisok=no +gccvisok=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - { echo "$as_me:$LINENO: result: $gccvisok" >&5 -echo "${ECHO_T}$gccvisok" >&6; } +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + echo "$as_me:$LINENO: result: $gccvisok" >&5 +echo "${ECHO_T}$gccvisok" >&6 if test "$gccvisok" = "no"; then { echo "$as_me:$LINENO: WARNING: Your gcc is not -fvisibility-inlines-hidden safe. Disabling visibility" >&5 echo "$as_me: WARNING: Your gcc is not -fvisibility-inlines-hidden safe. Disabling visibility" >&2;} @@ -10895,8 +9626,8 @@ echo "$as_me: WARNING: Your gcc is not -fvisibility-inlines-hidden safe. Disabli fi if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then - { echo "$as_me:$LINENO: checking if gcc has a visibility bug with class-level attributes (GCC bug 26905)" >&5 -echo $ECHO_N "checking if gcc has a visibility bug with class-level attributes (GCC bug 26905)... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking if gcc has a visibility bug with class-level attributes (GCC bug 26905)" >&5 +echo $ECHO_N "checking if gcc has a visibility bug with class-level attributes (GCC bug 26905)... $ECHO_C" >&6 cat >visibility.cxx <<_ACEOF #pragma GCC visibility push(hidden) struct __attribute__ ((visibility ("default"))) TestStruct { @@ -10917,8 +9648,8 @@ _ACEOF fi rm -f visibility.s - { echo "$as_me:$LINENO: result: $gccvisbroken" >&5 -echo "${ECHO_T}$gccvisbroken" >&6; } + echo "$as_me:$LINENO: result: $gccvisbroken" >&5 +echo "${ECHO_T}$gccvisbroken" >&6 if test "$gccvisbroken" = "yes"; then { echo "$as_me:$LINENO: WARNING: Your gcc is not -fvisibility=hidden safe. Disabling visibility" >&5 echo "$as_me: WARNING: Your gcc is not -fvisibility=hidden safe. Disabling visibility" >&2;} @@ -10937,11 +9668,11 @@ fi -{ echo "$as_me:$LINENO: checking which memory allocator to use" >&5 -echo $ECHO_N "checking which memory allocator to use... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking which memory allocator to use" >&5 +echo $ECHO_N "checking which memory allocator to use... $ECHO_C" >&6 if test "$with_alloc" = "system"; then - { echo "$as_me:$LINENO: result: system" >&5 -echo "${ECHO_T}system" >&6; } + echo "$as_me:$LINENO: result: system" >&5 +echo "${ECHO_T}system" >&6 ALLOC="SYS_ALLOC"; @@ -10950,88 +9681,78 @@ echo "${ECHO_T}system" >&6; } for ac_func in malloc realloc calloc free do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ - #ifdef __STDC__ # include #else # include #endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me +#else +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} #endif int main () { -return $ac_func (); +return f != $ac_func; ; 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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 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 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_var=no" +eval "$as_ac_var=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -11042,75 +9763,68 @@ done fi if test "$with_alloc" = "tcmalloc"; then - { echo "$as_me:$LINENO: result: tcmalloc" >&5 -echo "${ECHO_T}tcmalloc" >&6; } + echo "$as_me:$LINENO: result: tcmalloc" >&5 +echo "${ECHO_T}tcmalloc" >&6 if ! echo $build_cpu | grep -E 'i[3456]86' 2>/dev/null >/dev/null; then { { echo "$as_me:$LINENO: error: tcmalloc only available/usable on ix86" >&5 echo "$as_me: error: tcmalloc only available/usable on ix86" >&2;} { (exit 1); exit 1; }; } fi -{ echo "$as_me:$LINENO: checking for malloc in -ltcmalloc" >&5 -echo $ECHO_N "checking for malloc in -ltcmalloc... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for malloc in -ltcmalloc" >&5 +echo $ECHO_N "checking for malloc in -ltcmalloc... $ECHO_C" >&6 if test "${ac_cv_lib_tcmalloc_malloc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ltcmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char malloc (); int main () { -return malloc (); +malloc (); ; 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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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 + (exit $ac_status); }; }; then ac_cv_lib_tcmalloc_malloc=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_tcmalloc_malloc=no +ac_cv_lib_tcmalloc_malloc=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_tcmalloc_malloc" >&5 -echo "${ECHO_T}$ac_cv_lib_tcmalloc_malloc" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_lib_tcmalloc_malloc" >&5 +echo "${ECHO_T}$ac_cv_lib_tcmalloc_malloc" >&6 if test $ac_cv_lib_tcmalloc_malloc = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBTCMALLOC 1 @@ -11127,34 +9841,34 @@ fi ALLOC="TCMALLOC"; fi if test "$with_alloc" = "internal" -o -z "$with_alloc"; then - { echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 fi -{ echo "$as_me:$LINENO: checking whether to add custom build version" >&5 -echo $ECHO_N "checking whether to add custom build version... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to add custom build version" >&5 +echo $ECHO_N "checking whether to add custom build version... $ECHO_C" >&6 if test "z$with_build_version" != "z"; then BUILD_VER_STRING=$with_build_version - { echo "$as_me:$LINENO: result: yes, $BUILD_VER_STRING" >&5 -echo "${ECHO_T}yes, $BUILD_VER_STRING" >&6; } + echo "$as_me:$LINENO: result: yes, $BUILD_VER_STRING" >&5 +echo "${ECHO_T}yes, $BUILD_VER_STRING" >&6 else BUILD_VER_STRING= - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -{ echo "$as_me:$LINENO: checking whether to build with Java support" >&5 -echo $ECHO_N "checking whether to build with Java support... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to build with Java support" >&5 +echo $ECHO_N "checking whether to build with Java support... $ECHO_C" >&6 if test "$WITH_JAVA" != "no"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 SOLAR_JAVA="TRUE" else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 SOLAR_JAVA="" { echo "$as_me:$LINENO: WARNING: building without java will mean some features will not be available" >&5 @@ -11185,8 +9899,8 @@ if test "$SOLAR_JAVA" != ""; then if test -z "$with_jdk_home"; then # Extract the first word of "$WITH_JAVA", so it can be a program name with args. set dummy $WITH_JAVA; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_JAVAINTERPRETER+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -11201,28 +9915,27 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_JAVAINTERPRETER="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS ;; esac fi JAVAINTERPRETER=$ac_cv_path_JAVAINTERPRETER + if test -n "$JAVAINTERPRETER"; then - { echo "$as_me:$LINENO: result: $JAVAINTERPRETER" >&5 -echo "${ECHO_T}$JAVAINTERPRETER" >&6; } + echo "$as_me:$LINENO: result: $JAVAINTERPRETER" >&5 +echo "${ECHO_T}$JAVAINTERPRETER" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - else _java_path="$with_jdk_home/bin/$WITH_JAVA" if test -x "$_java_path"; then @@ -11244,8 +9957,8 @@ fi if test "$SOLAR_JAVA" != ""; then _gij_longver=0 - { echo "$as_me:$LINENO: checking the installed JDK" >&5 -echo $ECHO_N "checking the installed JDK... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking the installed JDK" >&5 +echo $ECHO_N "checking the installed JDK... $ECHO_C" >&6 if test -n "$JAVAINTERPRETER"; then if test `$JAVAINTERPRETER -version 2>&1 | grep -c "Kaffe"` -gt 0; then { { echo "$as_me:$LINENO: error: No valid check available. Please check the block for your desired java in configure.in" >&5 @@ -11270,8 +9983,8 @@ echo "$as_me: error: No valid check available. Please check the block for your d # JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*java,,p"` elif test `$JAVAINTERPRETER --version 2>&1 | grep -c "GNU libgcj"` -gt 0; then JDK=gcj - { echo "$as_me:$LINENO: result: checked (gcj)" >&5 -echo "${ECHO_T}checked (gcj)" >&6; } + echo "$as_me:$LINENO: result: checked (gcj)" >&5 +echo "${ECHO_T}checked (gcj)" >&6 _gij_version=`$JAVAINTERPRETER --version | grep GNU | $SED -e 's@^[^0-9]*@@' -e 's@ .*@@' -e 's@,.*@@'`; _gij_longver=`echo $_gij_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'` @@ -11313,8 +10026,8 @@ echo "$as_me: error: IBM JDK is too old, you need at least 1.6" >&2;} { (exit 1); exit 1; }; } fi - { echo "$as_me:$LINENO: result: checked (IBM JDK $_jdk)" >&5 -echo "${ECHO_T}checked (IBM JDK $_jdk)" >&6; } + echo "$as_me:$LINENO: result: checked (IBM JDK $_jdk)" >&5 +echo "${ECHO_T}checked (IBM JDK $_jdk)" >&6 if test "$with_jdk_home" = ""; then { { echo "$as_me:$LINENO: error: In order to successfully build OpenOffice.org using the IBM JDK, @@ -11337,8 +10050,8 @@ you must use the \"--with-jdk-home\" configure option explicitly" >&2;} echo "$as_me: error: JDK is too old, you need at least 1.5" >&2;} { (exit 1); exit 1; }; } fi - { echo "$as_me:$LINENO: result: checked (JDK $_jdk)" >&5 -echo "${ECHO_T}checked (JDK $_jdk)" >&6; } + echo "$as_me:$LINENO: result: checked (JDK $_jdk)" >&5 +echo "${ECHO_T}checked (JDK $_jdk)" >&6 JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*java,,p"` if test "$_os" = "WINNT"; then JAVA_HOME=`echo $JAVA_HOME | $SED "s,\.[eE][xX][eE]$,,"` @@ -11370,8 +10083,8 @@ if test "$SOLAR_JAVA" != ""; then if test -z "$with_jdk_home"; then # Extract the first word of "$javacompiler", so it can be a program name with args. set dummy $javacompiler; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_JAVACOMPILER+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -11386,28 +10099,27 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_JAVACOMPILER="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS ;; esac fi JAVACOMPILER=$ac_cv_path_JAVACOMPILER + if test -n "$JAVACOMPILER"; then - { echo "$as_me:$LINENO: result: $JAVACOMPILER" >&5 -echo "${ECHO_T}$JAVACOMPILER" >&6; } + echo "$as_me:$LINENO: result: $JAVACOMPILER" >&5 +echo "${ECHO_T}$JAVACOMPILER" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - else _javac_path="$with_jdk_home/bin/$javacompiler" if test -x "$_javac_path"; then @@ -11433,11 +10145,11 @@ echo "$as_me: error: $javacompiler not found set with_jdk_home" >&2;} fi if test `$JAVACOMPILER -version 2>&1 | grep -c "Eclipse Java Compiler"` -gt 0; then - { echo "$as_me:$LINENO: checking re-checking JDK" >&5 -echo $ECHO_N "checking re-checking JDK... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking re-checking JDK" >&5 +echo $ECHO_N "checking re-checking JDK... $ECHO_C" >&6 JDK=gcj - { echo "$as_me:$LINENO: result: checked (ecj)" >&5 -echo "${ECHO_T}checked (ecj)" >&6; } + echo "$as_me:$LINENO: result: checked (ecj)" >&5 +echo "${ECHO_T}checked (ecj)" >&6 #TODO: what's to do here? some switch to do 1.5 compiling? JAVAFLAGS="-source 1.5 -target 1.5" _gij_longver="50000" @@ -11456,8 +10168,8 @@ if test "$SOLAR_JAVA" != ""; then if test -z "$with_jdk_home"; then # Extract the first word of "javadoc", so it can be a program name with args. set dummy javadoc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_JAVADOC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -11472,28 +10184,27 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_JAVADOC="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS ;; esac fi JAVADOC=$ac_cv_path_JAVADOC + if test -n "$JAVADOC"; then - { echo "$as_me:$LINENO: result: $JAVADOC" >&5 -echo "${ECHO_T}$JAVADOC" >&6; } + echo "$as_me:$LINENO: result: $JAVADOC" >&5 +echo "${ECHO_T}$JAVADOC" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - else _javadoc_path="$with_jdk_home/bin/javadoc" if test "$_os" = "OS2"; then @@ -11506,8 +10217,8 @@ fi else # Extract the first word of "javadoc", so it can be a program name with args. set dummy javadoc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_JAVADOC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -11522,28 +10233,27 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_JAVADOC="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS ;; esac fi JAVADOC=$ac_cv_path_JAVADOC + if test -n "$JAVADOC"; then - { echo "$as_me:$LINENO: result: $JAVADOC" >&5 -echo "${ECHO_T}$JAVADOC" >&6; } + echo "$as_me:$LINENO: result: $JAVADOC" >&5 +echo "${ECHO_T}$JAVADOC" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi fi if test -z "$JAVADOC"; then @@ -11581,8 +10291,8 @@ class findhome } } _ACEOF - { echo "$as_me:$LINENO: checking if javac works" >&5 -echo $ECHO_N "checking if javac works... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking if javac works" >&5 +echo $ECHO_N "checking if javac works... $ECHO_C" >&6 javac_cmd="$JAVACOMPILER findhome.java 1>&2" { (eval echo "$as_me:$LINENO: \"$javac_cmd\"") >&5 (eval $javac_cmd) 2>&5 @@ -11590,8 +10300,8 @@ echo $ECHO_N "checking if javac works... $ECHO_C" >&6; } echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } if test $? = 0 && test -f ./findhome.class ; then - { echo "$as_me:$LINENO: result: javac works" >&5 -echo "${ECHO_T}javac works" >&6; } + echo "$as_me:$LINENO: result: javac works" >&5 +echo "${ECHO_T}javac works" >&6 else echo "configure: javac test failed" >&5 cat findhome.java >&5 @@ -11600,12 +10310,12 @@ echo "$as_me: error: javac does not work - java projects will not build!" >&2;} { (exit 1); exit 1; }; } fi - { echo "$as_me:$LINENO: checking if gij knows its java.home" >&5 -echo $ECHO_N "checking if gij knows its java.home... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking if gij knows its java.home" >&5 +echo $ECHO_N "checking if gij knows its java.home... $ECHO_C" >&6 JAVA_HOME=`$JAVAINTERPRETER findhome` if test $? = 0 && test "$JAVA_HOME" != "" ; then - { echo "$as_me:$LINENO: result: $JAVA_HOME" >&5 -echo "${ECHO_T}$JAVA_HOME" >&6; } + echo "$as_me:$LINENO: result: $JAVA_HOME" >&5 +echo "${ECHO_T}$JAVA_HOME" >&6 else echo "configure: java test failed" >&5 cat findhome.java >&5 @@ -11676,8 +10386,8 @@ fi AWTLIB= if test "$SOLAR_JAVA" != ""; then - { echo "$as_me:$LINENO: checking for jawt lib name" >&5 -echo $ECHO_N "checking for jawt lib name... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for jawt lib name" >&5 +echo $ECHO_N "checking for jawt lib name... $ECHO_C" >&6 if test "$JDK" = "gcj"; then save_CFLAGS=$CFLAGS save_LDFLAGS=$LDFLAGS @@ -11685,18 +10395,19 @@ echo $ECHO_N "checking for jawt lib name... $ECHO_C" >&6; } LDFLAGS="$LDFLAGS -L$JAVA_HOME/lib -lgcj" exec 6>/dev/null # no output if test "${ac_cv_header_jni_h+set}" = set; then - { echo "$as_me:$LINENO: checking for jni.h" >&5 -echo $ECHO_N "checking for jni.h... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for jni.h" >&5 +echo $ECHO_N "checking for jni.h... $ECHO_C" >&6 if test "${ac_cv_header_jni_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5 -echo "${ECHO_T}$ac_cv_header_jni_h" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5 +echo "${ECHO_T}$ac_cv_header_jni_h" >&6 else # Is the header compilable? -{ echo "$as_me:$LINENO: checking jni.h usability" >&5 -echo $ECHO_N "checking jni.h usability... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking jni.h usability" >&5 +echo $ECHO_N "checking jni.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -11706,38 +10417,33 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 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_objext; then - ac_header_compiler=yes -else + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no +ac_header_compiler=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 # Is the header present? -{ echo "$as_me:$LINENO: checking jni.h presence" >&5 -echo $ECHO_N "checking jni.h presence... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking jni.h presence" >&5 +echo $ECHO_N "checking jni.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -11745,22 +10451,23 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -11768,45 +10475,52 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi - rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) +case $ac_header_compiler:$ac_header_preproc in + yes:no ) { echo "$as_me:$LINENO: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: jni.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes + { echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: jni.h: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; - no:yes:* ) + no:yes ) { echo "$as_me:$LINENO: WARNING: jni.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: jni.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: jni.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: jni.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: jni.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: jni.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: jni.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: jni.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: jni.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: jni.h: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: jni.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: jni.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: jni.h: in the future, the compiler will take precedence" >&2;} - + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for jni.h" >&5 -echo $ECHO_N "checking for jni.h... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for jni.h" >&5 +echo $ECHO_N "checking for jni.h... $ECHO_C" >&6 if test "${ac_cv_header_jni_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_jni_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5 -echo "${ECHO_T}$ac_cv_header_jni_h" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5 +echo "${ECHO_T}$ac_cv_header_jni_h" >&6 fi if test $ac_cv_header_jni_h = yes; then @@ -11818,67 +10532,60 @@ echo "$as_me: error: jni.h could not be found. Mismatch between gcc and libgcj o fi - { echo "$as_me:$LINENO: checking for JAWT_GetAWT in -lgcjawt" >&5 -echo $ECHO_N "checking for JAWT_GetAWT in -lgcjawt... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for JAWT_GetAWT in -lgcjawt" >&5 +echo $ECHO_N "checking for JAWT_GetAWT in -lgcjawt... $ECHO_C" >&6 if test "${ac_cv_lib_gcjawt_JAWT_GetAWT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lgcjawt $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char JAWT_GetAWT (); int main () { -return JAWT_GetAWT (); +JAWT_GetAWT (); ; 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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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 + (exit $ac_status); }; }; then ac_cv_lib_gcjawt_JAWT_GetAWT=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_gcjawt_JAWT_GetAWT=no +ac_cv_lib_gcjawt_JAWT_GetAWT=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_gcjawt_JAWT_GetAWT" >&5 -echo "${ECHO_T}$ac_cv_lib_gcjawt_JAWT_GetAWT" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_lib_gcjawt_JAWT_GetAWT" >&5 +echo "${ECHO_T}$ac_cv_lib_gcjawt_JAWT_GetAWT" >&6 if test $ac_cv_lib_gcjawt_JAWT_GetAWT = yes; then AWTLIB="-lgcjawt -lgcj" fi @@ -11899,18 +10606,19 @@ fi export LD_LIBRARY_PATH exec 6>/dev/null # no output if test "${ac_cv_header_jni_h+set}" = set; then - { echo "$as_me:$LINENO: checking for jni.h" >&5 -echo $ECHO_N "checking for jni.h... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for jni.h" >&5 +echo $ECHO_N "checking for jni.h... $ECHO_C" >&6 if test "${ac_cv_header_jni_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5 -echo "${ECHO_T}$ac_cv_header_jni_h" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5 +echo "${ECHO_T}$ac_cv_header_jni_h" >&6 else # Is the header compilable? -{ echo "$as_me:$LINENO: checking jni.h usability" >&5 -echo $ECHO_N "checking jni.h usability... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking jni.h usability" >&5 +echo $ECHO_N "checking jni.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -11920,38 +10628,33 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_objext; then + (exit $ac_status); }; }; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no +ac_header_compiler=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 # Is the header present? -{ echo "$as_me:$LINENO: checking jni.h presence" >&5 -echo $ECHO_N "checking jni.h presence... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking jni.h presence" >&5 +echo $ECHO_N "checking jni.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -11959,22 +10662,23 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -11982,45 +10686,52 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi - rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) +case $ac_header_compiler:$ac_header_preproc in + yes:no ) { echo "$as_me:$LINENO: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: jni.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes + { echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: jni.h: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; - no:yes:* ) + no:yes ) { echo "$as_me:$LINENO: WARNING: jni.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: jni.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: jni.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: jni.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: jni.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: jni.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: jni.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: jni.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: jni.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: jni.h: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: jni.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: jni.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: jni.h: in the future, the compiler will take precedence" >&2;} - + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for jni.h" >&5 -echo $ECHO_N "checking for jni.h... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for jni.h" >&5 +echo $ECHO_N "checking for jni.h... $ECHO_C" >&6 if test "${ac_cv_header_jni_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_jni_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5 -echo "${ECHO_T}$ac_cv_header_jni_h" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5 +echo "${ECHO_T}$ac_cv_header_jni_h" >&6 fi if test $ac_cv_header_jni_h = yes; then @@ -12032,134 +10743,120 @@ echo "$as_me: error: jni.h could not be found." >&2;} fi - { echo "$as_me:$LINENO: checking for JAWT_GetAWT in -ljawt" >&5 -echo $ECHO_N "checking for JAWT_GetAWT in -ljawt... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for JAWT_GetAWT in -ljawt" >&5 +echo $ECHO_N "checking for JAWT_GetAWT in -ljawt... $ECHO_C" >&6 if test "${ac_cv_lib_jawt_JAWT_GetAWT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ljawt $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char JAWT_GetAWT (); int main () { -return JAWT_GetAWT (); +JAWT_GetAWT (); ; 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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 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 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_jawt_JAWT_GetAWT=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_jawt_JAWT_GetAWT=no +ac_cv_lib_jawt_JAWT_GetAWT=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_jawt_JAWT_GetAWT" >&5 -echo "${ECHO_T}$ac_cv_lib_jawt_JAWT_GetAWT" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_lib_jawt_JAWT_GetAWT" >&5 +echo "${ECHO_T}$ac_cv_lib_jawt_JAWT_GetAWT" >&6 if test $ac_cv_lib_jawt_JAWT_GetAWT = yes; then AWTLIB="-ljawt" fi if test -z "$AWTLIB"; then LDFLAGS="$LDFLAGS -L$JAVA_HOME/jre/bin/xawt -ljawt" - { echo "$as_me:$LINENO: checking for JAWT_GetAWT in -lmawt" >&5 -echo $ECHO_N "checking for JAWT_GetAWT in -lmawt... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for JAWT_GetAWT in -lmawt" >&5 +echo $ECHO_N "checking for JAWT_GetAWT in -lmawt... $ECHO_C" >&6 if test "${ac_cv_lib_mawt_JAWT_GetAWT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lmawt $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char JAWT_GetAWT (); int main () { -return JAWT_GetAWT (); +JAWT_GetAWT (); ; 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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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 + (exit $ac_status); }; }; then ac_cv_lib_mawt_JAWT_GetAWT=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_mawt_JAWT_GetAWT=no +ac_cv_lib_mawt_JAWT_GetAWT=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_mawt_JAWT_GetAWT" >&5 -echo "${ECHO_T}$ac_cv_lib_mawt_JAWT_GetAWT" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_lib_mawt_JAWT_GetAWT" >&5 +echo "${ECHO_T}$ac_cv_lib_mawt_JAWT_GetAWT" >&6 if test $ac_cv_lib_mawt_JAWT_GetAWT = yes; then AWTLIB="-L$JAVA_HOME/jre/bin/xawt -ljawt -lmawt" fi @@ -12173,24 +10870,24 @@ fi if test -z "$AWTLIB"; then AWTLIB=-ljawt fi - { echo "$as_me:$LINENO: result: $AWTLIB" >&5 -echo "${ECHO_T}$AWTLIB" >&6; } + echo "$as_me:$LINENO: result: $AWTLIB" >&5 +echo "${ECHO_T}$AWTLIB" >&6 fi if test "$SOLAR_JAVA" != ""; then - { echo "$as_me:$LINENO: checking whether to enable gcj aot compilation" >&5 -echo $ECHO_N "checking whether to enable gcj aot compilation... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking whether to enable gcj aot compilation" >&5 +echo $ECHO_N "checking whether to enable gcj aot compilation... $ECHO_C" >&6 if test -n "$enable_gcjaot" && test "$enable_gcjaot" != "no"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 if test `echo $WITH_JAVA | grep -c "gij"` -eq 0; then gcjaot="gcj" else gcjaot=`echo $WITH_JAVA | $SED -e "s/gij/gcj/g"` fi - { echo "$as_me:$LINENO: result: $gcjaot" >&5 -echo "${ECHO_T}$gcjaot" >&6; } + echo "$as_me:$LINENO: result: $gcjaot" >&5 +echo "${ECHO_T}$gcjaot" >&6 if test -n "$with_jdk_home"; then _javac_path="$with_jdk_home/bin/$gcjaot" if test -x "$_javac_path"; then @@ -12200,8 +10897,8 @@ echo "${ECHO_T}$gcjaot" >&6; } if test -z "$JAVAAOTCOMPILER"; then # Extract the first word of "$gcjaot", so it can be a program name with args. set dummy $gcjaot; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_JAVAAOTCOMPILER+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -12216,36 +10913,35 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_JAVAAOTCOMPILER="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS ;; esac fi JAVAAOTCOMPILER=$ac_cv_path_JAVAAOTCOMPILER + if test -n "$JAVAAOTCOMPILER"; then - { echo "$as_me:$LINENO: result: $JAVAAOTCOMPILER" >&5 -echo "${ECHO_T}$JAVAAOTCOMPILER" >&6; } + echo "$as_me:$LINENO: result: $JAVAAOTCOMPILER" >&5 +echo "${ECHO_T}$JAVAAOTCOMPILER" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test -z "$JAVAAOTCOMPILER"; then { echo "$as_me:$LINENO: WARNING: $gcjaot not found, set with_jdk_home" >&5 echo "$as_me: WARNING: $gcjaot not found, set with_jdk_home" >&2;} fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi fi @@ -12261,8 +10957,8 @@ fi # Extract the first word of "dmake", so it can be a program name with args. set dummy dmake; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_DMAKE+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -12277,35 +10973,34 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_DMAKE="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS test -z "$ac_cv_path_DMAKE" && ac_cv_path_DMAKE="no" ;; esac fi DMAKE=$ac_cv_path_DMAKE + if test -n "$DMAKE"; then - { echo "$as_me:$LINENO: result: $DMAKE" >&5 -echo "${ECHO_T}$DMAKE" >&6; } + echo "$as_me:$LINENO: result: $DMAKE" >&5 +echo "${ECHO_T}$DMAKE" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test "$DMAKE" = "no"; then BUILD_DMAKE=YES echo "dmake will be built on ./bootstrap" else - { echo "$as_me:$LINENO: checking whether the found dmake is the right dmake" >&5 -echo $ECHO_N "checking whether the found dmake is the right dmake... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking whether the found dmake is the right dmake" >&5 +echo $ECHO_N "checking whether the found dmake is the right dmake... $ECHO_C" >&6 # we need to find out whether that dmake we found is "our" dmake # or the dmake from Sun's SunStudio Compiler which is something # different @@ -12314,46 +11009,46 @@ echo $ECHO_N "checking whether the found dmake is the right dmake... $ECHO_C" >& $DMAKE -V 2>/dev/null | grep 'dmake .* Version .*' >/dev/null if test $? -eq 0; then BUILD_DMAKE=NO - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - { echo "$as_me:$LINENO: checking the dmake version" >&5 -echo $ECHO_N "checking the dmake version... $ECHO_C" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + echo "$as_me:$LINENO: checking the dmake version" >&5 +echo $ECHO_N "checking the dmake version... $ECHO_C" >&6 DMAKE_VERSION=`$DMAKE -V | $AWK '$3 == "Version" {print $4}'` if test "`echo $DMAKE_VERSION | cut -d'.' -f1`" -gt "4"; then - { echo "$as_me:$LINENO: result: OK, >= 4.11" >&5 -echo "${ECHO_T}OK, >= 4.11" >&6; } + echo "$as_me:$LINENO: result: OK, >= 4.11" >&5 +echo "${ECHO_T}OK, >= 4.11" >&6 elif test "`echo $DMAKE_VERSION | cut -d'.' -f1`" = "4" && \ test "`echo $DMAKE_VERSION | cut -d'.' -f2`" -ge "11"; then - { echo "$as_me:$LINENO: result: OK, >= 4.11" >&5 -echo "${ECHO_T}OK, >= 4.11" >&6; } + echo "$as_me:$LINENO: result: OK, >= 4.11" >&5 +echo "${ECHO_T}OK, >= 4.11" >&6 else - { echo "$as_me:$LINENO: result: too old. >= 4.11 is needed" >&5 -echo "${ECHO_T}too old. >= 4.11 is needed" >&6; } + echo "$as_me:$LINENO: result: too old. >= 4.11 is needed" >&5 +echo "${ECHO_T}too old. >= 4.11 is needed" >&6 echo "A newer dmake will be built on ./bootstrap" BUILD_DMAKE=YES fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 echo "dmake will be built on ./bootstrap" BUILD_DMAKE=YES fi fi -{ echo "$as_me:$LINENO: checking whether to enable EPM for packing" >&5 -echo $ECHO_N "checking whether to enable EPM for packing... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to enable EPM for packing" >&5 +echo $ECHO_N "checking whether to enable EPM for packing... $ECHO_C" >&6 if test "$_os" != "WINNT" -a \( "z$enable_epm" = "z" -o "$enable_epm" != "no" \) ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 if test "$_os" != "WINNT"; then if test -n "$with_epm"; then EPM=$with_epm else # Extract the first word of "epm", so it can be a program name with args. set dummy epm; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_EPM+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -12368,29 +11063,28 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_EPM="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS test -z "$ac_cv_path_EPM" && ac_cv_path_EPM="no" ;; esac fi EPM=$ac_cv_path_EPM + if test -n "$EPM"; then - { echo "$as_me:$LINENO: result: $EPM" >&5 -echo "${ECHO_T}$EPM" >&6; } + echo "$as_me:$LINENO: result: $EPM" >&5 +echo "${ECHO_T}$EPM" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$EPM" = "no" || test "$EPM" = "internal"; then echo "EPM will be built." @@ -12398,35 +11092,35 @@ fi BUILD_TYPE="$BUILD_TYPE EPM" else # Gentoo has some epm which is something different... - { echo "$as_me:$LINENO: checking whether the found epm is the right epm" >&5 -echo $ECHO_N "checking whether the found epm is the right epm... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking whether the found epm is the right epm" >&5 +echo $ECHO_N "checking whether the found epm is the right epm... $ECHO_C" >&6 if $EPM | grep "ESP Package Manager" >/dev/null 2>/dev/null; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else { { echo "$as_me:$LINENO: error: no. Install ESP Package Manager (www.easysw.com/epm) and/or specify the path to the right epm" >&5 echo "$as_me: error: no. Install ESP Package Manager (www.easysw.com/epm) and/or specify the path to the right epm" >&2;} { (exit 1); exit 1; }; } fi - { echo "$as_me:$LINENO: checking epm version" >&5 -echo $ECHO_N "checking epm version... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking epm version" >&5 +echo $ECHO_N "checking epm version... $ECHO_C" >&6 EPM_VERSION=`$EPM | grep 'ESP Package Manager' | cut -d' ' -f4 | $SED -e s/v//` if test "`echo $EPM_VERSION | cut -d'.' -f1`" -gt "3" || \ test "`echo $EPM_VERSION | cut -d'.' -f1`" -eq "3" -a "`echo $EPM_VERSION | cut -d'.' -f2`" -ge "7"; then - { echo "$as_me:$LINENO: result: OK, >= 3.7" >&5 -echo "${ECHO_T}OK, >= 3.7" >&6; } + echo "$as_me:$LINENO: result: OK, >= 3.7" >&5 +echo "${ECHO_T}OK, >= 3.7" >&6 BUILD_EPM=NO if test "$_os" = "Darwin"; then - { echo "$as_me:$LINENO: checking which PackageMaker EPM thinks to use" >&5 -echo $ECHO_N "checking which PackageMaker EPM thinks to use... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking which PackageMaker EPM thinks to use" >&5 +echo $ECHO_N "checking which PackageMaker EPM thinks to use... $ECHO_C" >&6 _pm=`strings $EPM | grep PackageMaker | cut -d" " -f1` if test "$_pm" = "/Developer/Applications/PackageMaker.app/Contents/MacOS/PackageMaker"; then { { echo "$as_me:$LINENO: error: $_pm; PackageMaker expected in wrong path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" >&5 echo "$as_me: error: $_pm; PackageMaker expected in wrong path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" >&2;} { (exit 1); exit 1; }; } elif test "$_pm" = "/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker"; then - { echo "$as_me:$LINENO: result: $_pm, ok" >&5 -echo "${ECHO_T}$_pm, ok" >&6; } + echo "$as_me:$LINENO: result: $_pm, ok" >&5 +echo "${ECHO_T}$_pm, ok" >&6 else # we never should get here, but go safe { { echo "$as_me:$LINENO: error: $_pm; PackageMaker expected in unknown path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" >&5 echo "$as_me: error: $_pm; PackageMaker expected in unknown path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" >&2;} @@ -12434,8 +11128,8 @@ echo "$as_me: error: $_pm; PackageMaker expected in unknown path. Either patch y fi fi else - { echo "$as_me:$LINENO: result: too old. epm >= 3.7 is required." >&5 -echo "${ECHO_T}too old. epm >= 3.7 is required." >&6; } + echo "$as_me:$LINENO: result: too old. epm >= 3.7 is required." >&5 +echo "${ECHO_T}too old. epm >= 3.7 is required." >&6 echo "EPM will be built." BUILD_EPM=YES BUILD_TYPE="$BUILD_TYPE EPM" @@ -12444,8 +11138,8 @@ echo "${ECHO_T}too old. epm >= 3.7 is required." >&6; } fi # test which package format to use - { echo "$as_me:$LINENO: checking which package format to use" >&5 -echo $ECHO_N "checking which package format to use... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking which package format to use" >&5 +echo $ECHO_N "checking which package format to use... $ECHO_C" >&6 # epm supports the following formats: # aix - AIX software distribution # bsd - FreeBSD, NetBSD, or OpenBSD software distribution @@ -12535,11 +11229,11 @@ portable - Portable software distribution done PKGFORMAT="$with_package_format" fi - { echo "$as_me:$LINENO: result: $PKGFORMAT" >&5 -echo "${ECHO_T}$PKGFORMAT" >&6; } + echo "$as_me:$LINENO: result: $PKGFORMAT" >&5 +echo "${ECHO_T}$PKGFORMAT" >&6 if echo "$PKGFORMAT" | $EGREP rpm 2>&1 >/dev/null; then - { echo "$as_me:$LINENO: checking for rpm" >&5 -echo $ECHO_N "checking for rpm... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for rpm" >&5 +echo $ECHO_N "checking for rpm... $ECHO_C" >&6 for a in "$RPM" rpmbuild rpm; do $a --usage >/dev/null 2> /dev/null if test $? -eq 0; then @@ -12559,15 +11253,15 @@ echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } else RPM_PATH=`which $RPM` - { echo "$as_me:$LINENO: result: $RPM_PATH" >&5 -echo "${ECHO_T}$RPM_PATH" >&6; } + echo "$as_me:$LINENO: result: $RPM_PATH" >&5 +echo "${ECHO_T}$RPM_PATH" >&6 fi fi if echo "$PKGFORMAT" | $EGREP deb 2>&1 >/dev/null; then # Extract the first word of "dpkg", so it can be a program name with args. set dummy dpkg; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_DPKG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -12582,29 +11276,28 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_DPKG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS test -z "$ac_cv_path_DPKG" && ac_cv_path_DPKG="no" ;; esac fi DPKG=$ac_cv_path_DPKG + if test -n "$DPKG"; then - { echo "$as_me:$LINENO: result: $DPKG" >&5 -echo "${ECHO_T}$DPKG" >&6; } + echo "$as_me:$LINENO: result: $DPKG" >&5 +echo "${ECHO_T}$DPKG" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test "$DPKG" = "no"; then { { echo "$as_me:$LINENO: error: dpkg needed for deb creation. Install dpkg." >&5 echo "$as_me: error: dpkg needed for deb creation. Install dpkg." >&2;} @@ -12613,15 +11306,15 @@ echo "$as_me: error: dpkg needed for deb creation. Install dpkg." >&2;} fi if echo "PKGFORMAT" | $EGREP osx 2>&1 >/dev/null; then if test "$_os" = "Darwin"; then - { echo "$as_me:$LINENO: checking for PackageMaker availability" >&5 -echo $ECHO_N "checking for PackageMaker availability... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for PackageMaker availability" >&5 +echo $ECHO_N "checking for PackageMaker availability... $ECHO_C" >&6 if ! test -x /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker; then { { echo "$as_me:$LINENO: error: not installed. Please install Apples Dev Tools" >&5 echo "$as_me: error: not installed. Please install Apples Dev Tools" >&2;} { (exit 1); exit 1; }; } else - { echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6; } + echo "$as_me:$LINENO: result: ok" >&5 +echo "${ECHO_T}ok" >&6 fi else { { echo "$as_me:$LINENO: error: PackageMaker needed to build OSX packages and you are not on OSX..." >&5 @@ -12633,14 +11326,14 @@ echo "$as_me: error: PackageMaker needed to build OSX packages and you are not o echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then if test "$EPM" != "no" && test "$EPM" != "internal"; then if test "`echo $EPM_VERSION | cut -d'.' -f1`" -lt "4"; then - { echo "$as_me:$LINENO: checking whether epm is patched for OOos needs" >&5 -echo $ECHO_N "checking whether epm is patched for OOos needs... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking whether epm is patched for OOos needs" >&5 +echo $ECHO_N "checking whether epm is patched for OOos needs... $ECHO_C" >&6 if grep "Patched for OpenOffice.org" $EPM >/dev/null 2>/dev/null; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 if echo "$PKGFORMAT" | grep -q rpm; then _pt="rpm" { echo "$as_me:$LINENO: WARNING: the rpms will need to be installed with --nodeps" >&5 @@ -12667,8 +11360,8 @@ echo "$as_me: WARNING: if you want to make sure installation without --nodeps an if echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then # Extract the first word of "pkgmk", so it can be a program name with args. set dummy pkgmk; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKGMK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -12683,29 +11376,28 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKGMK="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS test -z "$ac_cv_path_PKGMK" && ac_cv_path_PKGMK="no" ;; esac fi PKGMK=$ac_cv_path_PKGMK + if test -n "$PKGMK"; then - { echo "$as_me:$LINENO: result: $PKGMK" >&5 -echo "${ECHO_T}$PKGMK" >&6; } + echo "$as_me:$LINENO: result: $PKGMK" >&5 +echo "${ECHO_T}$PKGMK" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test "$PKGMK" = "no"; then { { echo "$as_me:$LINENO: error: pkgmk needed for Solaris pkg creation. Install it." >&5 echo "$as_me: error: pkgmk needed for Solaris pkg creation. Install it." >&2;} @@ -12718,16 +11410,16 @@ echo "$as_me: error: pkgmk needed for Solaris pkg creation. Install it." >&2;} else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 EPM=NO fi # Extract the first word of "gperf", so it can be a program name with args. set dummy gperf; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_GPERF+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -12742,65 +11434,64 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GPERF="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS ;; esac fi GPERF=$ac_cv_path_GPERF + if test -n "$GPERF"; then - { echo "$as_me:$LINENO: result: $GPERF" >&5 -echo "${ECHO_T}$GPERF" >&6; } + echo "$as_me:$LINENO: result: $GPERF" >&5 +echo "${ECHO_T}$GPERF" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test -z "$GPERF"; then { { echo "$as_me:$LINENO: error: gperf not found but needed. Install it." >&5 echo "$as_me: error: gperf not found but needed. Install it." >&2;} { (exit 1); exit 1; }; } fi -{ echo "$as_me:$LINENO: checking gperf version" >&5 -echo $ECHO_N "checking gperf version... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking gperf version" >&5 +echo $ECHO_N "checking gperf version... $ECHO_C" >&6 if test "`$GPERF --version | $EGREP ^GNU\ gperf | $AWK '{ print $3 }' | cut -d. -f1`" -ge "3"; then - { echo "$as_me:$LINENO: result: OK" >&5 -echo "${ECHO_T}OK" >&6; } + echo "$as_me:$LINENO: result: OK" >&5 +echo "${ECHO_T}OK" >&6 else { { echo "$as_me:$LINENO: error: too old, you need at least 3.0.0" >&5 echo "$as_me: error: too old, you need at least 3.0.0" >&2;} { (exit 1); exit 1; }; } fi -{ echo "$as_me:$LINENO: checking whether to build the ODK" >&5 -echo $ECHO_N "checking whether to build the ODK... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to build the ODK" >&5 +echo $ECHO_N "checking whether to build the ODK... $ECHO_C" >&6 if test "z$enable_odk" = "z" -o "$enable_odk" != "no"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 if test "$WITH_JAVA" != "no"; then - { echo "$as_me:$LINENO: checking for external/unowinreg/unowinreg.dll" >&5 -echo $ECHO_N "checking for external/unowinreg/unowinreg.dll... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for external/unowinreg/unowinreg.dll" >&5 +echo $ECHO_N "checking for external/unowinreg/unowinreg.dll... $ECHO_C" >&6 if ! test -f "./external/unowinreg/unowinreg.dll"; then HAVE_UNOWINREG_DLL=no else HAVE_UNOWINREG_DLL=yes fi if test "$HAVE_UNOWINREG_DLL" = "yes"; then - { echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6; } + echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6 BUILD_UNOWINREG=NO else if test "$_os" = "WINNT"; then - { echo "$as_me:$LINENO: result: not found, will be built" >&5 -echo "${ECHO_T}not found, will be built" >&6; } + echo "$as_me:$LINENO: result: not found, will be built" >&5 +echo "${ECHO_T}not found, will be built" >&6 else { echo "$as_me:$LINENO: WARNING: not found, will be cross-built using mingw32" >&5 echo "$as_me: WARNING: not found, will be cross-built using mingw32" >&2;} @@ -12825,8 +11516,8 @@ echo "$as_me: error: for rebuilding unowinreg.dll you need the mingw32 C++ compi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}$WITH_MINGWIN", so it can be a program name with args. set dummy ${ac_tool_prefix}$WITH_MINGWIN; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_MINGWCXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -12839,34 +11530,32 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_MINGWCXX="${ac_tool_prefix}$WITH_MINGWIN" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS fi fi MINGWCXX=$ac_cv_prog_MINGWCXX if test -n "$MINGWCXX"; then - { echo "$as_me:$LINENO: result: $MINGWCXX" >&5 -echo "${ECHO_T}$MINGWCXX" >&6; } + echo "$as_me:$LINENO: result: $MINGWCXX" >&5 +echo "${ECHO_T}$MINGWCXX" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test -z "$ac_cv_prog_MINGWCXX"; then ac_ct_MINGWCXX=$MINGWCXX # Extract the first word of "$WITH_MINGWIN", so it can be a program name with args. set dummy $WITH_MINGWIN; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +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_MINGWCXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -12879,41 +11568,27 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_MINGWCXX="$WITH_MINGWIN" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS + test -z "$ac_cv_prog_ac_ct_MINGWCXX" && ac_cv_prog_ac_ct_MINGWCXX="false" fi fi ac_ct_MINGWCXX=$ac_cv_prog_ac_ct_MINGWCXX if test -n "$ac_ct_MINGWCXX"; then - { echo "$as_me:$LINENO: result: $ac_ct_MINGWCXX" >&5 -echo "${ECHO_T}$ac_ct_MINGWCXX" >&6; } + echo "$as_me:$LINENO: result: $ac_ct_MINGWCXX" >&5 +echo "${ECHO_T}$ac_ct_MINGWCXX" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test "x$ac_ct_MINGWCXX" = x; then - MINGWCXX="false" - 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 - MINGWCXX=$ac_ct_MINGWCXX - fi + MINGWCXX=$ac_ct_MINGWCXX else MINGWCXX="$ac_cv_prog_MINGWCXX" fi @@ -12924,15 +11599,15 @@ fi echo "$as_me: error: specified MinGW32 C++ cross-compiler not found. Install it or correct name." >&2;} { (exit 1); exit 1; }; } fi - { echo "$as_me:$LINENO: checking whether we are using the MinGW32 cross C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the MinGW32 cross C++ compiler... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking whether we are using the MinGW32 cross C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the MinGW32 cross C++ compiler... $ECHO_C" >&6 if ! echo "`$MINGWCXX -dumpmachine`" | grep -q mingw32; then { { echo "$as_me:$LINENO: error: no" >&5 echo "$as_me: error: no" >&2;} { (exit 1); exit 1; }; } else - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 fi if echo "$WITH_MINGWIN" | $EGREP -q "/"; then if ! test -x "`echo $WITH_MINGWIN | $SED -e s/g++/strip/`"; then MINGSTRIP=false; else MINGWSTRIP=$(basename $(echo $WITH_MINGWIN | $SED -e s/g++/strip/)); fi @@ -12940,8 +11615,8 @@ echo "${ECHO_T}yes" >&6; } if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/`", so it can be a program name with args. set dummy ${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/`; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_MINGWSTRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -12954,34 +11629,32 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_MINGWSTRIP="${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/`" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS fi fi MINGWSTRIP=$ac_cv_prog_MINGWSTRIP if test -n "$MINGWSTRIP"; then - { echo "$as_me:$LINENO: result: $MINGWSTRIP" >&5 -echo "${ECHO_T}$MINGWSTRIP" >&6; } + echo "$as_me:$LINENO: result: $MINGWSTRIP" >&5 +echo "${ECHO_T}$MINGWSTRIP" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test -z "$ac_cv_prog_MINGWSTRIP"; then ac_ct_MINGWSTRIP=$MINGWSTRIP # Extract the first word of "`echo $WITH_MINGWIN | $SED -e s/g++/strip/`", so it can be a program name with args. set dummy `echo $WITH_MINGWIN | $SED -e s/g++/strip/`; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +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_MINGWSTRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -12994,41 +11667,27 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_MINGWSTRIP="`echo $WITH_MINGWIN | $SED -e s/g++/strip/`" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS + test -z "$ac_cv_prog_ac_ct_MINGWSTRIP" && ac_cv_prog_ac_ct_MINGWSTRIP="false" fi fi ac_ct_MINGWSTRIP=$ac_cv_prog_ac_ct_MINGWSTRIP if test -n "$ac_ct_MINGWSTRIP"; then - { echo "$as_me:$LINENO: result: $ac_ct_MINGWSTRIP" >&5 -echo "${ECHO_T}$ac_ct_MINGWSTRIP" >&6; } + echo "$as_me:$LINENO: result: $ac_ct_MINGWSTRIP" >&5 +echo "${ECHO_T}$ac_ct_MINGWSTRIP" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test "x$ac_ct_MINGWSTRIP" = x; then - MINGWSTRIP="false" - 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 - MINGWSTRIP=$ac_ct_MINGWSTRIP - fi + MINGWSTRIP=$ac_ct_MINGWSTRIP else MINGWSTRIP="$ac_cv_prog_MINGWSTRIP" fi @@ -13039,7 +11698,7 @@ fi echo "$as_me: error: MinGW32 binutils needed. Install them." >&2;} { (exit 1); exit 1; }; } fi - ac_ext=cpp + ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -13058,14 +11717,15 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu save_LIBS=$LIBS LIBS="" -{ echo "$as_me:$LINENO: checking for main in -lkernel32" >&5 -echo $ECHO_N "checking for main in -lkernel32... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for main in -lkernel32" >&5 +echo $ECHO_N "checking for main in -lkernel32... $ECHO_C" >&6 if test "${ac_cv_lib_kernel32_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lkernel32 $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -13076,43 +11736,35 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -return main (); +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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); }; }; then ac_cv_lib_kernel32_main=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_kernel32_main=no +ac_cv_lib_kernel32_main=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_kernel32_main" >&5 -echo "${ECHO_T}$ac_cv_lib_kernel32_main" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_lib_kernel32_main" >&5 +echo "${ECHO_T}$ac_cv_lib_kernel32_main" >&6 if test $ac_cv_lib_kernel32_main = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBKERNEL32 1 @@ -13124,14 +11776,15 @@ fi ac_cv_lib_kernel32=ac_cv_lib_kernel32_main -{ echo "$as_me:$LINENO: checking for main in -ladvapi32" >&5 -echo $ECHO_N "checking for main in -ladvapi32... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for main in -ladvapi32" >&5 +echo $ECHO_N "checking for main in -ladvapi32... $ECHO_C" >&6 if test "${ac_cv_lib_advapi32_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ladvapi32 $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -13142,43 +11795,35 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -return main (); +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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); }; }; then ac_cv_lib_advapi32_main=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_advapi32_main=no +ac_cv_lib_advapi32_main=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_advapi32_main" >&5 -echo "${ECHO_T}$ac_cv_lib_advapi32_main" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_lib_advapi32_main" >&5 +echo "${ECHO_T}$ac_cv_lib_advapi32_main" >&6 if test $ac_cv_lib_advapi32_main = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBADVAPI32 1 @@ -13190,18 +11835,19 @@ fi ac_cv_lib_advapi32=ac_cv_lib_advapi32_main if test "${ac_cv_header_windows_h+set}" = set; then - { echo "$as_me:$LINENO: checking for windows.h" >&5 -echo $ECHO_N "checking for windows.h... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for windows.h" >&5 +echo $ECHO_N "checking for windows.h... $ECHO_C" >&6 if test "${ac_cv_header_windows_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_windows_h" >&5 -echo "${ECHO_T}$ac_cv_header_windows_h" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_windows_h" >&5 +echo "${ECHO_T}$ac_cv_header_windows_h" >&6 else # Is the header compilable? -{ echo "$as_me:$LINENO: checking windows.h usability" >&5 -echo $ECHO_N "checking windows.h usability... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking windows.h usability" >&5 +echo $ECHO_N "checking windows.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -13211,38 +11857,33 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); }; }; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no +ac_header_compiler=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 # Is the header present? -{ echo "$as_me:$LINENO: checking windows.h presence" >&5 -echo $ECHO_N "checking windows.h presence... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking windows.h presence" >&5 +echo $ECHO_N "checking windows.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -13250,22 +11891,23 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -13273,45 +11915,52 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi - rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in - yes:no: ) +case $ac_header_compiler:$ac_header_preproc in + yes:no ) { echo "$as_me:$LINENO: WARNING: windows.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: windows.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: windows.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: windows.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes + { echo "$as_me:$LINENO: WARNING: windows.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: windows.h: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; - no:yes:* ) + no:yes ) { echo "$as_me:$LINENO: WARNING: windows.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: windows.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: windows.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: windows.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: windows.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: windows.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: windows.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: windows.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: windows.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: windows.h: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: windows.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: windows.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: windows.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: windows.h: in the future, the compiler will take precedence" >&2;} - + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for windows.h" >&5 -echo $ECHO_N "checking for windows.h... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for windows.h" >&5 +echo $ECHO_N "checking for windows.h... $ECHO_C" >&6 if test "${ac_cv_header_windows_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_windows_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_windows_h" >&5 -echo "${ECHO_T}$ac_cv_header_windows_h" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_windows_h" >&5 +echo "${ECHO_T}$ac_cv_header_windows_h" >&6 fi if test $ac_cv_header_windows_h = yes; then @@ -13338,25 +11987,25 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi BUILD_TYPE="$BUILD_TYPE ODK" else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 BUILD_UNOWINREG=NO fi -{ echo "$as_me:$LINENO: checking whether to build qadevOOo" >&5 -echo $ECHO_N "checking whether to build qadevOOo... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to build qadevOOo" >&5 +echo $ECHO_N "checking whether to build qadevOOo... $ECHO_C" >&6 if test "z$enable_qadevooo" = "z" -o "$enable_qadevooo" != "no"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 BUILD_QADEVOOO="YES" BUILD_TYPE="$BUILD_TYPE QADEVOOO" else BUILD_QADEVOOO="NO" - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi @@ -13369,16 +12018,16 @@ echo "$as_me: WARNING: prelinked libgcc_s.so.1, enabling --with-system-stdlibs, fi fi -{ echo "$as_me:$LINENO: checking whether to provide libstdc++/libgcc_s in the installset" >&5 -echo $ECHO_N "checking whether to provide libstdc++/libgcc_s in the installset... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to provide libstdc++/libgcc_s in the installset" >&5 +echo $ECHO_N "checking whether to provide libstdc++/libgcc_s in the installset... $ECHO_C" >&6 if test -n "$with_system_stdlibs" -o -n "$with_system_libs" && \ test "$with_system_stdlibs" != "no"; then - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 SYSTEM_STDLIBS=YES else - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 SYSTEM_STDLIBS=NO fi @@ -13386,26 +12035,27 @@ fi if test "$_os" = "Darwin" && test "$with_system_zlib" != "no"; then with_system_zlib=yes fi -{ echo "$as_me:$LINENO: checking which zlib to use" >&5 -echo $ECHO_N "checking which zlib to use... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking which zlib to use" >&5 +echo $ECHO_N "checking which zlib to use... $ECHO_C" >&6 if test -n "$with_system_zlib" -o -n "$with_system_libs" && \ test "$with_system_zlib" != "no"; then - { echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_ZLIB=YES if test "${ac_cv_header_zlib_h+set}" = set; then - { echo "$as_me:$LINENO: checking for zlib.h" >&5 -echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for zlib.h" >&5 +echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6 if test "${ac_cv_header_zlib_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 -echo "${ECHO_T}$ac_cv_header_zlib_h" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 +echo "${ECHO_T}$ac_cv_header_zlib_h" >&6 else # Is the header compilable? -{ echo "$as_me:$LINENO: checking zlib.h usability" >&5 -echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking zlib.h usability" >&5 +echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -13415,38 +12065,33 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_objext; then + (exit $ac_status); }; }; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no +ac_header_compiler=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 # Is the header present? -{ echo "$as_me:$LINENO: checking zlib.h presence" >&5 -echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking zlib.h presence" >&5 +echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -13454,22 +12099,23 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -13477,45 +12123,52 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi - rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) +case $ac_header_compiler:$ac_header_preproc in + yes:no ) { echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes + { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; - no:yes:* ) + no:yes ) { echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;} - + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for zlib.h" >&5 -echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for zlib.h" >&5 +echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6 if test "${ac_cv_header_zlib_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_zlib_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 -echo "${ECHO_T}$ac_cv_header_zlib_h" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 +echo "${ECHO_T}$ac_cv_header_zlib_h" >&6 fi if test $ac_cv_header_zlib_h = yes; then @@ -13527,67 +12180,60 @@ echo "$as_me: error: zlib.h not found. install zlib" >&2;} fi - { echo "$as_me:$LINENO: checking for deflate in -lz" >&5 -echo $ECHO_N "checking for deflate in -lz... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for deflate in -lz" >&5 +echo $ECHO_N "checking for deflate in -lz... $ECHO_C" >&6 if test "${ac_cv_lib_z_deflate+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lz $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char deflate (); int main () { -return deflate (); +deflate (); ; 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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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 + (exit $ac_status); }; }; then ac_cv_lib_z_deflate=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_z_deflate=no +ac_cv_lib_z_deflate=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_deflate" >&5 -echo "${ECHO_T}$ac_cv_lib_z_deflate" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_lib_z_deflate" >&5 +echo "${ECHO_T}$ac_cv_lib_z_deflate" >&6 if test $ac_cv_lib_z_deflate = yes; then ZLIB=-lz else @@ -13597,33 +12243,34 @@ echo "$as_me: error: zlib not found or functional" >&2;} fi else - { echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_ZLIB=NO BUILD_TYPE="$BUILD_TYPE ZLIB" fi -{ echo "$as_me:$LINENO: checking which jpeg to use" >&5 -echo $ECHO_N "checking which jpeg to use... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking which jpeg to use" >&5 +echo $ECHO_N "checking which jpeg to use... $ECHO_C" >&6 if test -n "$with_system_jpeg" -o -n "$with_system_libs" && \ test "$with_system_jpeg" != "no"; then - { echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_JPEG=YES if test "${ac_cv_header_jpeglib_h+set}" = set; then - { echo "$as_me:$LINENO: checking for jpeglib.h" >&5 -echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for jpeglib.h" >&5 +echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6 if test "${ac_cv_header_jpeglib_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5 -echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5 +echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6 else # Is the header compilable? -{ echo "$as_me:$LINENO: checking jpeglib.h usability" >&5 -echo $ECHO_N "checking jpeglib.h usability... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking jpeglib.h usability" >&5 +echo $ECHO_N "checking jpeglib.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -13633,38 +12280,33 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_objext; then + (exit $ac_status); }; }; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no +ac_header_compiler=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 # Is the header present? -{ echo "$as_me:$LINENO: checking jpeglib.h presence" >&5 -echo $ECHO_N "checking jpeglib.h presence... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking jpeglib.h presence" >&5 +echo $ECHO_N "checking jpeglib.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -13672,22 +12314,23 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -13695,45 +12338,52 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi - rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) +case $ac_header_compiler:$ac_header_preproc in + yes:no ) { echo "$as_me:$LINENO: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: jpeglib.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes + { echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; - no:yes:* ) + no:yes ) { echo "$as_me:$LINENO: WARNING: jpeglib.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: jpeglib.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: jpeglib.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: jpeglib.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: jpeglib.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: jpeglib.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: jpeglib.h: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&2;} - + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for jpeglib.h" >&5 -echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for jpeglib.h" >&5 +echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6 if test "${ac_cv_header_jpeglib_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_jpeglib_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5 -echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5 +echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6 fi if test $ac_cv_header_jpeglib_h = yes; then @@ -13745,102 +12395,96 @@ echo "$as_me: error: jpeg.h not found. install libjpeg" >&2;} fi - { echo "$as_me:$LINENO: checking for jpeg_resync_to_restart in -ljpeg" >&5 -echo $ECHO_N "checking for jpeg_resync_to_restart in -ljpeg... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for jpeg_resync_to_restart in -ljpeg" >&5 +echo $ECHO_N "checking for jpeg_resync_to_restart in -ljpeg... $ECHO_C" >&6 if test "${ac_cv_lib_jpeg_jpeg_resync_to_restart+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ljpeg $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char jpeg_resync_to_restart (); int main () { -return jpeg_resync_to_restart (); +jpeg_resync_to_restart (); ; 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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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 + (exit $ac_status); }; }; then ac_cv_lib_jpeg_jpeg_resync_to_restart=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_jpeg_jpeg_resync_to_restart=no +ac_cv_lib_jpeg_jpeg_resync_to_restart=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_resync_to_restart" >&5 -echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_resync_to_restart" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_resync_to_restart" >&5 +echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_resync_to_restart" >&6 if test $ac_cv_lib_jpeg_jpeg_resync_to_restart = yes; then JPEG3RDLIB=-ljpeg else - { echo "$as_me:$LINENO: checking jpeg library not found or fuctional" >&5 -echo $ECHO_N "checking jpeg library not found or fuctional... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking jpeg library not found or fuctional" >&5 +echo $ECHO_N "checking jpeg library not found or fuctional... $ECHO_C" >&6 fi else - { echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_JPEG=NO BUILD_TYPE="$BUILD_TYPE JPEG" fi -{ echo "$as_me:$LINENO: checking which expat to use" >&5 -echo $ECHO_N "checking which expat to use... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking which expat to use" >&5 +echo $ECHO_N "checking which expat to use... $ECHO_C" >&6 if test -n "$with_system_expat" -o -n "$with_system_libs" && \ test "$with_system_expat" != "no"; then - { echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_EXPAT=YES if test "${ac_cv_header_expat_h+set}" = set; then - { echo "$as_me:$LINENO: checking for expat.h" >&5 -echo $ECHO_N "checking for expat.h... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for expat.h" >&5 +echo $ECHO_N "checking for expat.h... $ECHO_C" >&6 if test "${ac_cv_header_expat_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5 -echo "${ECHO_T}$ac_cv_header_expat_h" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5 +echo "${ECHO_T}$ac_cv_header_expat_h" >&6 else # Is the header compilable? -{ echo "$as_me:$LINENO: checking expat.h usability" >&5 -echo $ECHO_N "checking expat.h usability... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking expat.h usability" >&5 +echo $ECHO_N "checking expat.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -13850,38 +12494,33 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_objext; then + (exit $ac_status); }; }; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no +ac_header_compiler=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 # Is the header present? -{ echo "$as_me:$LINENO: checking expat.h presence" >&5 -echo $ECHO_N "checking expat.h presence... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking expat.h presence" >&5 +echo $ECHO_N "checking expat.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -13889,22 +12528,23 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -13912,45 +12552,52 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi - rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) +case $ac_header_compiler:$ac_header_preproc in + yes:no ) { echo "$as_me:$LINENO: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: expat.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes + { echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: expat.h: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; - no:yes:* ) + no:yes ) { echo "$as_me:$LINENO: WARNING: expat.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: expat.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: expat.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: expat.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: expat.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: expat.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: expat.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: expat.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: expat.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: expat.h: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: expat.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: expat.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: expat.h: in the future, the compiler will take precedence" >&2;} - + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for expat.h" >&5 -echo $ECHO_N "checking for expat.h... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for expat.h" >&5 +echo $ECHO_N "checking for expat.h... $ECHO_C" >&6 if test "${ac_cv_header_expat_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_expat_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5 -echo "${ECHO_T}$ac_cv_header_expat_h" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5 +echo "${ECHO_T}$ac_cv_header_expat_h" >&6 fi if test $ac_cv_header_expat_h = yes; then @@ -13963,67 +12610,60 @@ fi -{ echo "$as_me:$LINENO: checking for XML_ParserCreate in -lexpat" >&5 -echo $ECHO_N "checking for XML_ParserCreate in -lexpat... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for XML_ParserCreate in -lexpat" >&5 +echo $ECHO_N "checking for XML_ParserCreate in -lexpat... $ECHO_C" >&6 if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lexpat $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char XML_ParserCreate (); int main () { -return XML_ParserCreate (); +XML_ParserCreate (); ; 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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 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 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_expat_XML_ParserCreate=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_expat_XML_ParserCreate=no +ac_cv_lib_expat_XML_ParserCreate=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_expat_XML_ParserCreate" >&5 -echo "${ECHO_T}$ac_cv_lib_expat_XML_ParserCreate" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_lib_expat_XML_ParserCreate" >&5 +echo "${ECHO_T}$ac_cv_lib_expat_XML_ParserCreate" >&6 if test $ac_cv_lib_expat_XML_ParserCreate = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBEXPAT 1 @@ -14032,24 +12672,24 @@ _ACEOF LIBS="-lexpat $LIBS" else - { echo "$as_me:$LINENO: result: expat library not found or functional." >&5 -echo "${ECHO_T}expat library not found or functional." >&6; } + echo "$as_me:$LINENO: result: expat library not found or functional." >&5 +echo "${ECHO_T}expat library not found or functional." >&6 fi else - { echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_EXPAT=NO BUILD_TYPE="$BUILD_TYPE EXPAT" fi -{ echo "$as_me:$LINENO: checking which libwpd to use" >&5 -echo $ECHO_N "checking which libwpd to use... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking which libwpd to use" >&5 +echo $ECHO_N "checking which libwpd to use... $ECHO_C" >&6 if test -n "$with_system_libwpd" -o -n "$with_system_libs" && \ test "$with_system_libwpd" != "no"; then - { echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_LIBWPD=YES succeeded=no @@ -14057,8 +12697,8 @@ echo "${ECHO_T}external" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -14073,29 +12713,28 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -14106,25 +12745,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { echo "$as_me:$LINENO: checking for libwpd-0.8 " >&5 -echo $ECHO_N "checking for libwpd-0.8 ... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for libwpd-0.8 " >&5 +echo $ECHO_N "checking for libwpd-0.8 ... $ECHO_C" >&6 if $PKG_CONFIG --exists "libwpd-0.8 " ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { echo "$as_me:$LINENO: checking LIBWPD_CFLAGS" >&5 -echo $ECHO_N "checking LIBWPD_CFLAGS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking LIBWPD_CFLAGS" >&5 +echo $ECHO_N "checking LIBWPD_CFLAGS... $ECHO_C" >&6 LIBWPD_CFLAGS=`$PKG_CONFIG --cflags "libwpd-0.8 "` - { echo "$as_me:$LINENO: result: $LIBWPD_CFLAGS" >&5 -echo "${ECHO_T}$LIBWPD_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $LIBWPD_CFLAGS" >&5 +echo "${ECHO_T}$LIBWPD_CFLAGS" >&6 - { echo "$as_me:$LINENO: checking LIBWPD_LIBS" >&5 -echo $ECHO_N "checking LIBWPD_LIBS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking LIBWPD_LIBS" >&5 +echo $ECHO_N "checking LIBWPD_LIBS... $ECHO_C" >&6 LIBWPD_LIBS=`$PKG_CONFIG --libs "libwpd-0.8 "` - { echo "$as_me:$LINENO: result: $LIBWPD_LIBS" >&5 -echo "${ECHO_T}$LIBWPD_LIBS" >&6; } + echo "$as_me:$LINENO: result: $LIBWPD_LIBS" >&5 +echo "${ECHO_T}$LIBWPD_LIBS" >&6 else LIBWPD_CFLAGS="" LIBWPD_LIBS="" @@ -14151,8 +12790,8 @@ echo "$as_me: error: Library requirements (libwpd-0.8 ) not met; consider adjust fi else - { echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_LIBWPD=NO BUILD_TYPE="$BUILD_TYPE LIBWPD" fi @@ -14161,16 +12800,16 @@ fi if test "$test_freetype" = "yes"; then - { echo "$as_me:$LINENO: checking whether freetype is available" >&5 -echo $ECHO_N "checking whether freetype is available... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking whether freetype is available" >&5 +echo $ECHO_N "checking whether freetype is available... $ECHO_C" >&6 succeeded=no if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -14185,29 +12824,28 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -14218,25 +12856,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { echo "$as_me:$LINENO: checking for freetype2 >= 2.0 " >&5 -echo $ECHO_N "checking for freetype2 >= 2.0 ... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for freetype2 >= 2.0 " >&5 +echo $ECHO_N "checking for freetype2 >= 2.0 ... $ECHO_C" >&6 if $PKG_CONFIG --exists "freetype2 >= 2.0 " ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { echo "$as_me:$LINENO: checking FREETYPE_CFLAGS" >&5 -echo $ECHO_N "checking FREETYPE_CFLAGS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking FREETYPE_CFLAGS" >&5 +echo $ECHO_N "checking FREETYPE_CFLAGS... $ECHO_C" >&6 FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2 >= 2.0 "` - { echo "$as_me:$LINENO: result: $FREETYPE_CFLAGS" >&5 -echo "${ECHO_T}$FREETYPE_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $FREETYPE_CFLAGS" >&5 +echo "${ECHO_T}$FREETYPE_CFLAGS" >&6 - { echo "$as_me:$LINENO: checking FREETYPE_LIBS" >&5 -echo $ECHO_N "checking FREETYPE_LIBS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking FREETYPE_LIBS" >&5 +echo $ECHO_N "checking FREETYPE_LIBS... $ECHO_C" >&6 FREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2 >= 2.0 "` - { echo "$as_me:$LINENO: result: $FREETYPE_LIBS" >&5 -echo "${ECHO_T}$FREETYPE_LIBS" >&6; } + echo "$as_me:$LINENO: result: $FREETYPE_LIBS" >&5 +echo "${ECHO_T}$FREETYPE_LIBS" >&6 else FREETYPE_CFLAGS="" FREETYPE_LIBS="" @@ -14272,67 +12910,60 @@ if test "$test_freetype" = "yes"; then save_LIBS="$LIBS" CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS" LDFLAGS="$LDFLAGS $FREETYPE_LIBS" - { echo "$as_me:$LINENO: checking for FT_GlyphSlot_Embolden in -lfreetype" >&5 -echo $ECHO_N "checking for FT_GlyphSlot_Embolden in -lfreetype... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for FT_GlyphSlot_Embolden in -lfreetype" >&5 +echo $ECHO_N "checking for FT_GlyphSlot_Embolden in -lfreetype... $ECHO_C" >&6 if test "${ac_cv_lib_freetype_FT_GlyphSlot_Embolden+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lfreetype $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char FT_GlyphSlot_Embolden (); int main () { -return FT_GlyphSlot_Embolden (); +FT_GlyphSlot_Embolden (); ; 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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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 + (exit $ac_status); }; }; then ac_cv_lib_freetype_FT_GlyphSlot_Embolden=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_freetype_FT_GlyphSlot_Embolden=no +ac_cv_lib_freetype_FT_GlyphSlot_Embolden=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_freetype_FT_GlyphSlot_Embolden" >&5 -echo "${ECHO_T}$ac_cv_lib_freetype_FT_GlyphSlot_Embolden" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_lib_freetype_FT_GlyphSlot_Embolden" >&5 +echo "${ECHO_T}$ac_cv_lib_freetype_FT_GlyphSlot_Embolden" >&6 if test $ac_cv_lib_freetype_FT_GlyphSlot_Embolden = yes; then USE_FT_EMBOLDEN="YES" else @@ -14366,26 +12997,26 @@ if test -n "$with_system_libxml" -o -n "$with_system_libs" && \ fi fi -{ echo "$as_me:$LINENO: checking which libxslt to use" >&5 -echo $ECHO_N "checking which libxslt to use... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking which libxslt to use" >&5 +echo $ECHO_N "checking which libxslt to use... $ECHO_C" >&6 if test -n "$with_system_libxslt" -o -n "$with_system_libs" -o \ "$_os" = "Darwin" && \ test "$with_system_libxslt" != "no"; then - { echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_LIBXSLT=YES if test "$_os" = "Darwin"; then - { echo "$as_me:$LINENO: checking LIBXSLT_CFLAGS" >&5 -echo $ECHO_N "checking LIBXSLT_CFLAGS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking LIBXSLT_CFLAGS" >&5 +echo $ECHO_N "checking LIBXSLT_CFLAGS... $ECHO_C" >&6 LIBXSLT_CFLAGS=`xslt-config --cflags` - { echo "$as_me:$LINENO: result: $LIBXSLT_CFLAGS" >&5 -echo "${ECHO_T}$LIBXSLT_CFLAGS" >&6; } - { echo "$as_me:$LINENO: checking LIBXSLT_LIBS" >&5 -echo $ECHO_N "checking LIBXSLT_LIBS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: result: $LIBXSLT_CFLAGS" >&5 +echo "${ECHO_T}$LIBXSLT_CFLAGS" >&6 + echo "$as_me:$LINENO: checking LIBXSLT_LIBS" >&5 +echo $ECHO_N "checking LIBXSLT_LIBS... $ECHO_C" >&6 LIBXSLT_LIBS=`xslt-config --libs` - { echo "$as_me:$LINENO: result: $LIBXSLT_LIBS" >&5 -echo "${ECHO_T}$LIBXSLT_LIBS" >&6; } + echo "$as_me:$LINENO: result: $LIBXSLT_LIBS" >&5 +echo "${ECHO_T}$LIBXSLT_LIBS" >&6 else @@ -14395,8 +13026,8 @@ echo "${ECHO_T}$LIBXSLT_LIBS" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -14411,29 +13042,28 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -14444,25 +13074,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { echo "$as_me:$LINENO: checking for libxslt" >&5 -echo $ECHO_N "checking for libxslt... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for libxslt" >&5 +echo $ECHO_N "checking for libxslt... $ECHO_C" >&6 if $PKG_CONFIG --exists "libxslt" ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { echo "$as_me:$LINENO: checking LIBXSLT_CFLAGS" >&5 -echo $ECHO_N "checking LIBXSLT_CFLAGS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking LIBXSLT_CFLAGS" >&5 +echo $ECHO_N "checking LIBXSLT_CFLAGS... $ECHO_C" >&6 LIBXSLT_CFLAGS=`$PKG_CONFIG --cflags "libxslt"` - { echo "$as_me:$LINENO: result: $LIBXSLT_CFLAGS" >&5 -echo "${ECHO_T}$LIBXSLT_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $LIBXSLT_CFLAGS" >&5 +echo "${ECHO_T}$LIBXSLT_CFLAGS" >&6 - { echo "$as_me:$LINENO: checking LIBXSLT_LIBS" >&5 -echo $ECHO_N "checking LIBXSLT_LIBS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking LIBXSLT_LIBS" >&5 +echo $ECHO_N "checking LIBXSLT_LIBS... $ECHO_C" >&6 LIBXSLT_LIBS=`$PKG_CONFIG --libs "libxslt"` - { echo "$as_me:$LINENO: result: $LIBXSLT_LIBS" >&5 -echo "${ECHO_T}$LIBXSLT_LIBS" >&6; } + echo "$as_me:$LINENO: result: $LIBXSLT_LIBS" >&5 +echo "${ECHO_T}$LIBXSLT_LIBS" >&6 else LIBXSLT_CFLAGS="" LIBXSLT_LIBS="" @@ -14493,8 +13123,8 @@ echo "$as_me: error: Library requirements (libxslt) not met; consider adjusting # Extract the first word of "xsltproc", so it can be a program name with args. set dummy xsltproc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_XSLTPROC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -14509,37 +13139,36 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS test -z "$ac_cv_path_XSLTPROC" && ac_cv_path_XSLTPROC="no" ;; esac fi XSLTPROC=$ac_cv_path_XSLTPROC + if test -n "$XSLTPROC"; then - { echo "$as_me:$LINENO: result: $XSLTPROC" >&5 -echo "${ECHO_T}$XSLTPROC" >&6; } + echo "$as_me:$LINENO: result: $XSLTPROC" >&5 +echo "${ECHO_T}$XSLTPROC" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test "$XSLTPROC" = "no"; then { { echo "$as_me:$LINENO: error: xsltproc is required" >&5 echo "$as_me: error: xsltproc is required" >&2;} { (exit 1); exit 1; }; } fi else - { echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_LIBXSLT=NO BUILD_TYPE="$BUILD_TYPE LIBXSLT" fi @@ -14548,25 +13177,25 @@ fi -{ echo "$as_me:$LINENO: checking which libxml to use" >&5 -echo $ECHO_N "checking which libxml to use... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking which libxml to use" >&5 +echo $ECHO_N "checking which libxml to use... $ECHO_C" >&6 if test -n "$with_system_libxml" -o -n "$with_system_libs" -o \ "$_os" = "Darwin" && \ test "$with_system_libxml" != "no"; then - { echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_LIBXML=YES if test "$_os" = "Darwin"; then - { echo "$as_me:$LINENO: checking LIBXML_CFLAGS" >&5 -echo $ECHO_N "checking LIBXML_CFLAGS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking LIBXML_CFLAGS" >&5 +echo $ECHO_N "checking LIBXML_CFLAGS... $ECHO_C" >&6 LIBXML_CFLAGS=`xml2-config --cflags` - { echo "$as_me:$LINENO: result: $LIBXML_CFLAGS" >&5 -echo "${ECHO_T}$LIBXML_CFLAGS" >&6; } - { echo "$as_me:$LINENO: checking LIBXML_LIBS" >&5 -echo $ECHO_N "checking LIBXML_LIBS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: result: $LIBXML_CFLAGS" >&5 +echo "${ECHO_T}$LIBXML_CFLAGS" >&6 + echo "$as_me:$LINENO: checking LIBXML_LIBS" >&5 +echo $ECHO_N "checking LIBXML_LIBS... $ECHO_C" >&6 LIBXML_LIBS=`xml2-config --libs` - { echo "$as_me:$LINENO: result: $LIBXML_LIBS" >&5 -echo "${ECHO_T}$LIBXML_LIBS" >&6; } + echo "$as_me:$LINENO: result: $LIBXML_LIBS" >&5 +echo "${ECHO_T}$LIBXML_LIBS" >&6 else @@ -14576,8 +13205,8 @@ echo "${ECHO_T}$LIBXML_LIBS" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -14592,29 +13221,28 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -14625,25 +13253,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { echo "$as_me:$LINENO: checking for libxml-2.0 >= 2.0" >&5 -echo $ECHO_N "checking for libxml-2.0 >= 2.0... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for libxml-2.0 >= 2.0" >&5 +echo $ECHO_N "checking for libxml-2.0 >= 2.0... $ECHO_C" >&6 if $PKG_CONFIG --exists "libxml-2.0 >= 2.0" ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { echo "$as_me:$LINENO: checking LIBXML_CFLAGS" >&5 -echo $ECHO_N "checking LIBXML_CFLAGS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking LIBXML_CFLAGS" >&5 +echo $ECHO_N "checking LIBXML_CFLAGS... $ECHO_C" >&6 LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.0"` - { echo "$as_me:$LINENO: result: $LIBXML_CFLAGS" >&5 -echo "${ECHO_T}$LIBXML_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $LIBXML_CFLAGS" >&5 +echo "${ECHO_T}$LIBXML_CFLAGS" >&6 - { echo "$as_me:$LINENO: checking LIBXML_LIBS" >&5 -echo $ECHO_N "checking LIBXML_LIBS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking LIBXML_LIBS" >&5 +echo $ECHO_N "checking LIBXML_LIBS... $ECHO_C" >&6 LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.0"` - { echo "$as_me:$LINENO: result: $LIBXML_LIBS" >&5 -echo "${ECHO_T}$LIBXML_LIBS" >&6; } + echo "$as_me:$LINENO: result: $LIBXML_LIBS" >&5 +echo "${ECHO_T}$LIBXML_LIBS" >&6 else LIBXML_CFLAGS="" LIBXML_LIBS="" @@ -14673,8 +13301,8 @@ echo "$as_me: error: Library requirements (libxml-2.0 >= 2.0) not met; consider BUILD_TYPE="$BUILD_TYPE LIBXMLSEC" else - { echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_LIBXML=NO BUILD_TYPE="$BUILD_TYPE LIBXML2 LIBXMLSEC" fi @@ -14685,21 +13313,21 @@ fi if test "$_os" = "Darwin" && test "$with_system_python" != "no"; then with_system_python=yes fi -{ echo "$as_me:$LINENO: checking which python to use" >&5 -echo $ECHO_N "checking which python to use... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking which python to use" >&5 +echo $ECHO_N "checking which python to use... $ECHO_C" >&6 if test -n "$with_system_python" -o -n "$with_system_libs" && \ test "$with_system_python" != "no"; then SYSTEM_PYTHON=YES - { echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 if test -n "$PYTHON"; then # If the user set $PYTHON, use it and don't search something else. - { echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.2" >&5 -echo $ECHO_N "checking whether $PYTHON version >= 2.2... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.2" >&5 +echo $ECHO_N "checking whether $PYTHON version >= 2.2... $ECHO_C" >&6 prog="import sys, string # split strings by '.' and convert to numeric. Append some zeros # because we need at least 4 digits for the hex conversion. @@ -14712,8 +13340,8 @@ sys.exit(sys.hexversion < minverhex)" ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else { { echo "$as_me:$LINENO: error: too old" >&5 echo "$as_me: error: too old" >&2;} @@ -14724,8 +13352,8 @@ fi else # Otherwise, try each interpreter until we find one that satisfies # VERSION. - { echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.2" >&5 -echo $ECHO_N "checking for a Python interpreter with version >= 2.2... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.2" >&5 +echo $ECHO_N "checking for a Python interpreter with version >= 2.2... $ECHO_C" >&6 if test "${am_cv_pathless_PYTHON+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -14749,16 +13377,16 @@ fi done fi -{ echo "$as_me:$LINENO: result: $am_cv_pathless_PYTHON" >&5 -echo "${ECHO_T}$am_cv_pathless_PYTHON" >&6; } +echo "$as_me:$LINENO: result: $am_cv_pathless_PYTHON" >&5 +echo "${ECHO_T}$am_cv_pathless_PYTHON" >&6 # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. if test "$am_cv_pathless_PYTHON" = none; then PYTHON=: else # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args. set dummy $am_cv_pathless_PYTHON; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PYTHON+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -14773,28 +13401,27 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS ;; esac fi PYTHON=$ac_cv_path_PYTHON + if test -n "$PYTHON"; then - { echo "$as_me:$LINENO: result: $PYTHON" >&5 -echo "${ECHO_T}$PYTHON" >&6; } + echo "$as_me:$LINENO: result: $PYTHON" >&5 +echo "${ECHO_T}$PYTHON" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi am_display_PYTHON=$am_cv_pathless_PYTHON fi @@ -14807,15 +13434,15 @@ echo "$as_me: error: no suitable Python interpreter found" >&2;} else - { echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5 -echo $ECHO_N "checking for $am_display_PYTHON version... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5 +echo $ECHO_N "checking for $am_display_PYTHON version... $ECHO_C" >&6 if test "${am_cv_python_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else am_cv_python_version=`$PYTHON -c "import sys; print sys.version[:3]"` fi -{ echo "$as_me:$LINENO: result: $am_cv_python_version" >&5 -echo "${ECHO_T}$am_cv_python_version" >&6; } +echo "$as_me:$LINENO: result: $am_cv_python_version" >&5 +echo "${ECHO_T}$am_cv_python_version" >&6 PYTHON_VERSION=$am_cv_python_version @@ -14826,30 +13453,30 @@ echo "${ECHO_T}$am_cv_python_version" >&6; } - { echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5 -echo $ECHO_N "checking for $am_display_PYTHON platform... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5 +echo $ECHO_N "checking for $am_display_PYTHON platform... $ECHO_C" >&6 if test "${am_cv_python_platform+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"` fi -{ echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5 -echo "${ECHO_T}$am_cv_python_platform" >&6; } +echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5 +echo "${ECHO_T}$am_cv_python_platform" >&6 PYTHON_PLATFORM=$am_cv_python_platform - { echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5 -echo $ECHO_N "checking for $am_display_PYTHON script directory... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5 +echo $ECHO_N "checking for $am_display_PYTHON script directory... $ECHO_C" >&6 if test "${am_cv_python_pythondir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null || echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` fi -{ echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5 -echo "${ECHO_T}$am_cv_python_pythondir" >&6; } +echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5 +echo "${ECHO_T}$am_cv_python_pythondir" >&6 pythondir=$am_cv_python_pythondir @@ -14857,16 +13484,16 @@ echo "${ECHO_T}$am_cv_python_pythondir" >&6; } pkgpythondir=\${pythondir}/$PACKAGE - { echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5 -echo $ECHO_N "checking for $am_display_PYTHON extension module directory... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5 +echo $ECHO_N "checking for $am_display_PYTHON extension module directory... $ECHO_C" >&6 if test "${am_cv_python_pyexecdir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null || echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"` fi -{ echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5 -echo "${ECHO_T}$am_cv_python_pyexecdir" >&6; } +echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5 +echo "${ECHO_T}$am_cv_python_pyexecdir" >&6 pyexecdir=$am_cv_python_pyexecdir @@ -14892,18 +13519,19 @@ echo "${ECHO_T}$am_cv_python_pyexecdir" >&6; } save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS" if test "${ac_cv_header_Python_h+set}" = set; then - { echo "$as_me:$LINENO: checking for Python.h" >&5 -echo $ECHO_N "checking for Python.h... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for Python.h" >&5 +echo $ECHO_N "checking for Python.h... $ECHO_C" >&6 if test "${ac_cv_header_Python_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_Python_h" >&5 -echo "${ECHO_T}$ac_cv_header_Python_h" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_Python_h" >&5 +echo "${ECHO_T}$ac_cv_header_Python_h" >&6 else # Is the header compilable? -{ echo "$as_me:$LINENO: checking Python.h usability" >&5 -echo $ECHO_N "checking Python.h usability... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking Python.h usability" >&5 +echo $ECHO_N "checking Python.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -14913,38 +13541,33 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_objext; then + (exit $ac_status); }; }; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no +ac_header_compiler=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 # Is the header present? -{ echo "$as_me:$LINENO: checking Python.h presence" >&5 -echo $ECHO_N "checking Python.h presence... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking Python.h presence" >&5 +echo $ECHO_N "checking Python.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -14952,22 +13575,23 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -14975,45 +13599,52 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi - rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) +case $ac_header_compiler:$ac_header_preproc in + yes:no ) { echo "$as_me:$LINENO: WARNING: Python.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: Python.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: Python.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: Python.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes + { echo "$as_me:$LINENO: WARNING: Python.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: Python.h: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; - no:yes:* ) + no:yes ) { echo "$as_me:$LINENO: WARNING: Python.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: Python.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: Python.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: Python.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: Python.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: Python.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: Python.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: Python.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: Python.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: Python.h: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: Python.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: Python.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: Python.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: Python.h: in the future, the compiler will take precedence" >&2;} - + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for Python.h" >&5 -echo $ECHO_N "checking for Python.h... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for Python.h" >&5 +echo $ECHO_N "checking for Python.h... $ECHO_C" >&6 if test "${ac_cv_header_Python_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_Python_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_Python_h" >&5 -echo "${ECHO_T}$ac_cv_header_Python_h" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_Python_h" >&5 +echo "${ECHO_T}$ac_cv_header_Python_h" >&6 fi if test $ac_cv_header_Python_h = yes; then @@ -15029,8 +13660,8 @@ fi else SYSTEM_PYTHON=NO BUILD_TYPE="$BUILD_TYPE PYTHON" - { echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 # Embedded python dies without Home set if test "z$HOME" = "z"; then export HOME=""; @@ -15039,8 +13670,8 @@ echo "${ECHO_T}internal" >&6; } if test -z "$BZIP2"; then # Extract the first word of "bzip2", so it can be a program name with args. set dummy bzip2; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_BZIP2+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -15055,28 +13686,27 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_BZIP2="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS ;; esac fi BZIP2=$ac_cv_path_BZIP2 + if test -n "$BZIP2"; then - { echo "$as_me:$LINENO: result: $BZIP2" >&5 -echo "${ECHO_T}$BZIP2" >&6; } + echo "$as_me:$LINENO: result: $BZIP2" >&5 +echo "${ECHO_T}$BZIP2" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test -z "$BZIP2"; then { { echo "$as_me:$LINENO: error: the internal Python module has a .tar.bz2. You need bzip2" >&5 echo "$as_me: error: the internal Python module has a .tar.bz2. You need bzip2" >&2;} @@ -15090,19 +13720,20 @@ fi HOME=`echo $HOME | sed 's:\\\\:/:g'` -{ echo "$as_me:$LINENO: checking which db to use" >&5 -echo $ECHO_N "checking which db to use... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking which db to use" >&5 +echo $ECHO_N "checking which db to use... $ECHO_C" >&6 if test -n "$with_system_db" -o -n "$with_system_libs" && \ test "$with_system_db" != "no"; then SYSTEM_DB=YES - { echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6; } - { echo "$as_me:$LINENO: checking for db.h" >&5 -echo $ECHO_N "checking for db.h... $ECHO_C" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 + echo "$as_me:$LINENO: checking for db.h" >&5 +echo $ECHO_N "checking for db.h... $ECHO_C" >&6 if test "${ac_cv_header_db_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -15114,45 +13745,40 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_objext; then + (exit $ac_status); }; }; then ac_cv_header_db_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_header_db_h=no +ac_cv_header_db_h=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5 -echo "${ECHO_T}$ac_cv_header_db_h" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5 +echo "${ECHO_T}$ac_cv_header_db_h" >&6 if test $ac_cv_header_db_h = yes; then DB_INCLUDES=/usr/include else CFLAGS=-I/usr/include/db4 - { echo "$as_me:$LINENO: checking for db4/db.h" >&5 -echo $ECHO_N "checking for db4/db.h... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for db4/db.h" >&5 +echo $ECHO_N "checking for db4/db.h... $ECHO_C" >&6 if test "${ac_cv_header_db4_db_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -15163,34 +13789,28 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_objext; then + (exit $ac_status); }; }; then ac_cv_header_db4_db_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_header_db4_db_h=no +ac_cv_header_db4_db_h=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_db4_db_h" >&5 -echo "${ECHO_T}$ac_cv_header_db4_db_h" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_db4_db_h" >&5 +echo "${ECHO_T}$ac_cv_header_db4_db_h" >&6 if test $ac_cv_header_db4_db_h = yes; then DB_INCLUDES=/usr/include/db4 else @@ -15204,8 +13824,8 @@ fi fi - { echo "$as_me:$LINENO: checking whether db is at least 4.1" >&5 -echo $ECHO_N "checking whether db is at least 4.1... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking whether db is at least 4.1" >&5 +echo $ECHO_N "checking whether db is at least 4.1... $ECHO_C" >&6 for v in `seq 1 7`; do if test "$cross_compiling" = yes; then { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling @@ -15215,6 +13835,7 @@ See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -15230,22 +13851,13 @@ int main(int argc, char **argv) { _ACEOF rm -f 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>&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (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_try") 2>&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -15256,14 +13868,12 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - - done if test "$DB_VERSION_MINOR" -gt "1"; then - { echo "$as_me:$LINENO: result: OK" >&5 -echo "${ECHO_T}OK" >&6; } + echo "$as_me:$LINENO: result: OK" >&5 +echo "${ECHO_T}OK" >&6 DB_VERSION=4.$DB_VERSION_MINOR else { { echo "$as_me:$LINENO: error: no. you need at least db 4.1" >&5 @@ -15274,14 +13884,15 @@ echo "$as_me: error: no. you need at least db 4.1" >&2;} #AC_CHECK_LIB(db, db_create, [], # [AC_MSG_ERROR([db library not installed or functional])], []) -{ echo "$as_me:$LINENO: checking for main in -ldb" >&5 -echo $ECHO_N "checking for main in -ldb... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for main in -ldb" >&5 +echo $ECHO_N "checking for main in -ldb... $ECHO_C" >&6 if test "${ac_cv_lib_db_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldb $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -15292,43 +13903,35 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -return main (); +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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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 + (exit $ac_status); }; }; then ac_cv_lib_db_main=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_db_main=no +ac_cv_lib_db_main=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_db_main" >&5 -echo "${ECHO_T}$ac_cv_lib_db_main" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_lib_db_main" >&5 +echo "${ECHO_T}$ac_cv_lib_db_main" >&6 if test $ac_cv_lib_db_main = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBDB 1 @@ -15345,8 +13948,8 @@ ac_cv_lib_db=ac_cv_lib_db_main SCPDEFS="$SCPDEFS -DSYSTEM_DB" else - { echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_DB=NO BUILD_TYPE="$BUILD_TYPE BERKELEYDB" fi @@ -15355,16 +13958,16 @@ fi -{ echo "$as_me:$LINENO: checking which lucene to use" >&5 -echo $ECHO_N "checking which lucene to use... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking which lucene to use" >&5 +echo $ECHO_N "checking which lucene to use... $ECHO_C" >&6 if test -n "$with_system_lucene" -o -n "$with_system_libs" && \ test "$with_system_lucene" != "no" && test "$with_system_jars" != "no"; then - { echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_LUCENE=YES if test -z $LUCENE_CORE_JAR; then - { echo "$as_me:$LINENO: checking for /usr/share/java/lucene-core-2.3.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/lucene-core-2.3.jar... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for /usr/share/java/lucene-core-2.3.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/lucene-core-2.3.jar... $ECHO_C" >&6 if test "${ac_cv_file__usr_share_java_lucene_core_2_3_jar+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -15378,14 +13981,14 @@ else ac_cv_file__usr_share_java_lucene_core_2_3_jar=no fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_core_2_3_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_lucene_core_2_3_jar" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_core_2_3_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_lucene_core_2_3_jar" >&6 if test $ac_cv_file__usr_share_java_lucene_core_2_3_jar = yes; then LUCENE_CORE_JAR=/usr/share/java/lucene-core-2.3.jar else - { echo "$as_me:$LINENO: checking for /usr/share/java/lucene.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/lucene.jar... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for /usr/share/java/lucene.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/lucene.jar... $ECHO_C" >&6 if test "${ac_cv_file__usr_share_java_lucene_jar+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -15399,8 +14002,8 @@ else ac_cv_file__usr_share_java_lucene_jar=no fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_lucene_jar" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_lucene_jar" >&6 if test $ac_cv_file__usr_share_java_lucene_jar = yes; then LUCENE_CORE_JAR=/usr/share/java/lucene.jar else @@ -15416,9 +14019,9 @@ fi else as_ac_File=`echo "ac_cv_file_$LUCENE_CORE_JAR" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $LUCENE_CORE_JAR" >&5 -echo $ECHO_N "checking for $LUCENE_CORE_JAR... $ECHO_C" >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then +echo "$as_me:$LINENO: checking for $LUCENE_CORE_JAR" >&5 +echo $ECHO_N "checking for $LUCENE_CORE_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && @@ -15431,9 +14034,8 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval echo '${'$as_ac_File'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 if test `eval echo '${'$as_ac_File'}'` = yes; then : else @@ -15445,8 +14047,8 @@ fi fi if test -z $LUCENE_ANALYZERS_JAR; then - { echo "$as_me:$LINENO: checking for /usr/share/java/lucene-analyzers-2.3.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/lucene-analyzers-2.3.jar... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for /usr/share/java/lucene-analyzers-2.3.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/lucene-analyzers-2.3.jar... $ECHO_C" >&6 if test "${ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -15460,14 +14062,14 @@ else ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar=no fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar" >&6 if test $ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar = yes; then LUCENE_ANALYZERS_JAR=/usr/share/java/lucene-analyzers-2.3.jar else - { echo "$as_me:$LINENO: checking for /usr/share/java/lucene-contrib/lucene-analyzers.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/lucene-contrib/lucene-analyzers.jar... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for /usr/share/java/lucene-contrib/lucene-analyzers.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/lucene-contrib/lucene-analyzers.jar... $ECHO_C" >&6 if test "${ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -15481,8 +14083,8 @@ else ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar=no fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar" >&6 if test $ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar = yes; then LUCENE_ANALYZERS_JAR=/usr/share/java/lucene-contrib/lucene-analyzers.jar else @@ -15498,9 +14100,9 @@ fi else as_ac_File=`echo "ac_cv_file_$LUCENE_CORE_JAR" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $LUCENE_CORE_JAR" >&5 -echo $ECHO_N "checking for $LUCENE_CORE_JAR... $ECHO_C" >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then +echo "$as_me:$LINENO: checking for $LUCENE_CORE_JAR" >&5 +echo $ECHO_N "checking for $LUCENE_CORE_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && @@ -15513,9 +14115,8 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval echo '${'$as_ac_File'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 if test `eval echo '${'$as_ac_File'}'` = yes; then : else @@ -15526,8 +14127,8 @@ fi fi else - { echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_LUCENE=NO BUILD_TYPE="$BUILD_TYPE LUCENE" fi @@ -15535,20 +14136,20 @@ fi -{ echo "$as_me:$LINENO: checking which hsqldb to use" >&5 -echo $ECHO_N "checking which hsqldb to use... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking which hsqldb to use" >&5 +echo $ECHO_N "checking which hsqldb to use... $ECHO_C" >&6 if test -n "$with_system_hsqldb" -o -n "$with_system_libs" && \ test "$with_system_hsqldb" != "no" && test "$with_system_jars" != "no"; then - { echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_HSQLDB=YES if test -z $HSQLDB_JAR; then HSQLDB_JAR=/usr/share/java/hsqldb.jar fi as_ac_File=`echo "ac_cv_file_$HSQLDB_JAR" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $HSQLDB_JAR" >&5 -echo $ECHO_N "checking for $HSQLDB_JAR... $ECHO_C" >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then +echo "$as_me:$LINENO: checking for $HSQLDB_JAR" >&5 +echo $ECHO_N "checking for $HSQLDB_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && @@ -15561,9 +14162,8 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval echo '${'$as_ac_File'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 if test `eval echo '${'$as_ac_File'}'` = yes; then : else @@ -15572,8 +14172,8 @@ echo "$as_me: error: hsqldb.jar not found." >&2;} { (exit 1); exit 1; }; } fi - { echo "$as_me:$LINENO: checking whether hsqldb is >= 1.8.0.9" >&5 -echo $ECHO_N "checking whether hsqldb is >= 1.8.0.9... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking whether hsqldb is >= 1.8.0.9" >&5 +echo $ECHO_N "checking whether hsqldb is >= 1.8.0.9... $ECHO_C" >&6 export HSQLDB_JAR if $PERL -e 'use Archive::Zip; my $file = "$ENV{'HSQLDB_JAR'}"; @@ -15596,36 +14196,36 @@ echo $ECHO_N "checking whether hsqldb is >= 1.8.0.9... $ECHO_C" >&6; } } else { exit 1; }'; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else { { echo "$as_me:$LINENO: error: no, hsqldb >= 1.8.0.9 is needed" >&5 echo "$as_me: error: no, hsqldb >= 1.8.0.9 is needed" >&2;} { (exit 1); exit 1; }; } fi else - { echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_HSQLDB=NO BUILD_TYPE="$BUILD_TYPE HSQLDB" fi -{ echo "$as_me:$LINENO: checking which beanshell to use" >&5 -echo $ECHO_N "checking which beanshell to use... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking which beanshell to use" >&5 +echo $ECHO_N "checking which beanshell to use... $ECHO_C" >&6 if test -n "$with_system_beanshell" -o -n "$with_system_libs" && \ test "$with_system_beanshell" != "no" && test "$with_system_jars" != "no"; then - { echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_BSH=YES if test -z $BSH_JAR; then BSH_JAR=/usr/share/java/bsh.jar fi as_ac_File=`echo "ac_cv_file_$BSH_JAR" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $BSH_JAR" >&5 -echo $ECHO_N "checking for $BSH_JAR... $ECHO_C" >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then +echo "$as_me:$LINENO: checking for $BSH_JAR" >&5 +echo $ECHO_N "checking for $BSH_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && @@ -15638,9 +14238,8 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval echo '${'$as_ac_File'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 if test `eval echo '${'$as_ac_File'}'` = yes; then : else @@ -15650,8 +14249,8 @@ echo "$as_me: error: bsh.jar not found." >&2;} fi else - { echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_BSH=NO BUILD_TYPE="$BUILD_TYPE BSH" fi @@ -15659,16 +14258,16 @@ fi -{ echo "$as_me:$LINENO: checking which saxon to use" >&5 -echo $ECHO_N "checking which saxon to use... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking which saxon to use" >&5 +echo $ECHO_N "checking which saxon to use... $ECHO_C" >&6 if test -n "$with_system_saxon" -o -n "$with_system_libs" && \ test "$with_system_saxon" != "no" && test "$with_system_jars" != "no"; then - { echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_SAXON=YES if test -z $SAXON_JAR; then - { echo "$as_me:$LINENO: checking for /usr/share/java/saxon9.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/saxon9.jar... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for /usr/share/java/saxon9.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/saxon9.jar... $ECHO_C" >&6 if test "${ac_cv_file__usr_share_java_saxon9_jar+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -15682,14 +14281,14 @@ else ac_cv_file__usr_share_java_saxon9_jar=no fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_saxon9_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_saxon9_jar" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_saxon9_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_saxon9_jar" >&6 if test $ac_cv_file__usr_share_java_saxon9_jar = yes; then SAXON_JAR=/usr/share/java/saxon9.jar else - { echo "$as_me:$LINENO: checking for /usr/share/java/saxon.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/saxon.jar... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for /usr/share/java/saxon.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/saxon.jar... $ECHO_C" >&6 if test "${ac_cv_file__usr_share_java_saxon_jar+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -15703,13 +14302,13 @@ else ac_cv_file__usr_share_java_saxon_jar=no fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_saxon_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_saxon_jar" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_saxon_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_saxon_jar" >&6 if test $ac_cv_file__usr_share_java_saxon_jar = yes; then SAXON_JAR=/usr/share/java/saxon.jar else - { echo "$as_me:$LINENO: checking for /usr/share/java/saxon9.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/saxon9.jar... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for /usr/share/java/saxon9.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/saxon9.jar... $ECHO_C" >&6 if test "${ac_cv_file__usr_share_java_saxon9_jar+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -15723,8 +14322,8 @@ else ac_cv_file__usr_share_java_saxon9_jar=no fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_saxon9_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_saxon9_jar" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_saxon9_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_saxon9_jar" >&6 if test $ac_cv_file__usr_share_java_saxon9_jar = yes; then SAXON_JAR=/usr/share/java/saxon9.jar else @@ -15744,9 +14343,9 @@ fi else as_ac_File=`echo "ac_cv_file_$SAXON_JAR" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $SAXON_JAR" >&5 -echo $ECHO_N "checking for $SAXON_JAR... $ECHO_C" >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then +echo "$as_me:$LINENO: checking for $SAXON_JAR" >&5 +echo $ECHO_N "checking for $SAXON_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && @@ -15759,9 +14358,8 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval echo '${'$as_ac_File'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 if test `eval echo '${'$as_ac_File'}'` = yes; then : else @@ -15773,9 +14371,9 @@ fi fi if test -n "$SERIALIZER_JAR"; then as_ac_File=`echo "ac_cv_file_$SERIALIZER_JAR" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $SERIALIZER_JAR" >&5 -echo $ECHO_N "checking for $SERIALIZER_JAR... $ECHO_C" >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then +echo "$as_me:$LINENO: checking for $SERIALIZER_JAR" >&5 +echo $ECHO_N "checking for $SERIALIZER_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && @@ -15788,9 +14386,8 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval echo '${'$as_ac_File'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 if test `eval echo '${'$as_ac_File'}'` = yes; then : else @@ -15802,8 +14399,8 @@ fi fi else - { echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_SAXON=NO NEED_SAXON=TRUE fi @@ -15817,18 +14414,18 @@ fi if test "$_os" = "Darwin" && test "$with_system_curl" != "no"; then with_system_curl=yes fi -{ echo "$as_me:$LINENO: checking which curl to use" >&5 -echo $ECHO_N "checking which curl to use... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking which curl to use" >&5 +echo $ECHO_N "checking which curl to use... $ECHO_C" >&6 if test -n "$with_system_curl" -o -n "$with_system_libs" && \ test "$with_system_curl" != "no"; then - { echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_CURL=YES # Extract the first word of "curl-config", so it can be a program name with args. set dummy curl-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_CURLCONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -15843,28 +14440,27 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_CURLCONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS ;; esac fi CURLCONFIG=$ac_cv_path_CURLCONFIG + if test -n "$CURLCONFIG"; then - { echo "$as_me:$LINENO: result: $CURLCONFIG" >&5 -echo "${ECHO_T}$CURLCONFIG" >&6; } + echo "$as_me:$LINENO: result: $CURLCONFIG" >&5 +echo "${ECHO_T}$CURLCONFIG" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test -z "$CURLCONFIG"; then { { echo "$as_me:$LINENO: error: install curl to run this script" >&5 echo "$as_me: error: install curl to run this script" >&2;} @@ -15872,8 +14468,8 @@ echo "$as_me: error: install curl to run this script" >&2;} fi # check curl version - { echo "$as_me:$LINENO: checking whether curl is >= 7.9.8" >&5 -echo $ECHO_N "checking whether curl is >= 7.9.8... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking whether curl is >= 7.9.8" >&5 +echo $ECHO_N "checking whether curl is >= 7.9.8... $ECHO_C" >&6 if test "`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $1 }'`" -gt "7" -a \ "`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $2 }'`" -gt "9" -a \ "`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $3 }'`" -gt "8"; then @@ -15881,14 +14477,14 @@ echo $ECHO_N "checking whether curl is >= 7.9.8... $ECHO_C" >&6; } echo "$as_me: error: no, you need at least curl 7.9,8" >&2;} { (exit 1); exit 1; }; } else - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 fi CURL_LIBS=`$CURLCONFIG --libs` CURL_CFLAGS=`$CURLCONFIG --cflags` else - { echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_CURL=NO BUILD_TYPE="$BUILD_TYPE CURL" fi @@ -15896,32 +14492,33 @@ fi -{ echo "$as_me:$LINENO: checking which boost to use" >&5 -echo $ECHO_N "checking which boost to use... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking which boost to use" >&5 +echo $ECHO_N "checking which boost to use... $ECHO_C" >&6 if test -n "$with_system_boost" -o -n "$with_system_headers" && \ test "$with_system_boost" != "no"; then - { echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_BOOST=YES - ac_ext=cpp + ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu if test "${ac_cv_header_boost_shared_ptr_hpp+set}" = set; then - { echo "$as_me:$LINENO: checking for boost/shared_ptr.hpp" >&5 -echo $ECHO_N "checking for boost/shared_ptr.hpp... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for boost/shared_ptr.hpp" >&5 +echo $ECHO_N "checking for boost/shared_ptr.hpp... $ECHO_C" >&6 if test "${ac_cv_header_boost_shared_ptr_hpp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_boost_shared_ptr_hpp" >&5 -echo "${ECHO_T}$ac_cv_header_boost_shared_ptr_hpp" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_boost_shared_ptr_hpp" >&5 +echo "${ECHO_T}$ac_cv_header_boost_shared_ptr_hpp" >&6 else # Is the header compilable? -{ echo "$as_me:$LINENO: checking boost/shared_ptr.hpp usability" >&5 -echo $ECHO_N "checking boost/shared_ptr.hpp usability... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking boost/shared_ptr.hpp usability" >&5 +echo $ECHO_N "checking boost/shared_ptr.hpp usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -15931,38 +14528,33 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); }; }; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no +ac_header_compiler=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 # Is the header present? -{ echo "$as_me:$LINENO: checking boost/shared_ptr.hpp presence" >&5 -echo $ECHO_N "checking boost/shared_ptr.hpp presence... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking boost/shared_ptr.hpp presence" >&5 +echo $ECHO_N "checking boost/shared_ptr.hpp presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -15970,22 +14562,23 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -15993,45 +14586,52 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi - rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in - yes:no: ) +case $ac_header_compiler:$ac_header_preproc in + yes:no ) { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: boost/shared_ptr.hpp: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: boost/shared_ptr.hpp: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes + { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: boost/shared_ptr.hpp: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; - no:yes:* ) + no:yes ) { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: present but cannot be compiled" >&5 echo "$as_me: WARNING: boost/shared_ptr.hpp: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: boost/shared_ptr.hpp: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: boost/shared_ptr.hpp: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: boost/shared_ptr.hpp: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: boost/shared_ptr.hpp: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: boost/shared_ptr.hpp: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: boost/shared_ptr.hpp: in the future, the compiler will take precedence" >&2;} - + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for boost/shared_ptr.hpp" >&5 -echo $ECHO_N "checking for boost/shared_ptr.hpp... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for boost/shared_ptr.hpp" >&5 +echo $ECHO_N "checking for boost/shared_ptr.hpp... $ECHO_C" >&6 if test "${ac_cv_header_boost_shared_ptr_hpp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_boost_shared_ptr_hpp=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_boost_shared_ptr_hpp" >&5 -echo "${ECHO_T}$ac_cv_header_boost_shared_ptr_hpp" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_boost_shared_ptr_hpp" >&5 +echo "${ECHO_T}$ac_cv_header_boost_shared_ptr_hpp" >&6 fi if test $ac_cv_header_boost_shared_ptr_hpp = yes; then @@ -16044,18 +14644,19 @@ fi if test "${ac_cv_header_boost_spirit_core_hpp+set}" = set; then - { echo "$as_me:$LINENO: checking for boost/spirit/core.hpp" >&5 -echo $ECHO_N "checking for boost/spirit/core.hpp... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for boost/spirit/core.hpp" >&5 +echo $ECHO_N "checking for boost/spirit/core.hpp... $ECHO_C" >&6 if test "${ac_cv_header_boost_spirit_core_hpp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_boost_spirit_core_hpp" >&5 -echo "${ECHO_T}$ac_cv_header_boost_spirit_core_hpp" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_boost_spirit_core_hpp" >&5 +echo "${ECHO_T}$ac_cv_header_boost_spirit_core_hpp" >&6 else # Is the header compilable? -{ echo "$as_me:$LINENO: checking boost/spirit/core.hpp usability" >&5 -echo $ECHO_N "checking boost/spirit/core.hpp usability... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking boost/spirit/core.hpp usability" >&5 +echo $ECHO_N "checking boost/spirit/core.hpp usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -16065,38 +14666,33 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 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_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no +ac_header_compiler=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 # Is the header present? -{ echo "$as_me:$LINENO: checking boost/spirit/core.hpp presence" >&5 -echo $ECHO_N "checking boost/spirit/core.hpp presence... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking boost/spirit/core.hpp presence" >&5 +echo $ECHO_N "checking boost/spirit/core.hpp presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -16104,22 +14700,23 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -16127,45 +14724,52 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi - rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in - yes:no: ) +case $ac_header_compiler:$ac_header_preproc in + yes:no ) { echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: boost/spirit/core.hpp: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: boost/spirit/core.hpp: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes + { echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: boost/spirit/core.hpp: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; - no:yes:* ) + no:yes ) { echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: present but cannot be compiled" >&5 echo "$as_me: WARNING: boost/spirit/core.hpp: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: boost/spirit/core.hpp: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: boost/spirit/core.hpp: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: boost/spirit/core.hpp: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: boost/spirit/core.hpp: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: boost/spirit/core.hpp: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: boost/spirit/core.hpp: in the future, the compiler will take precedence" >&2;} - + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for boost/spirit/core.hpp" >&5 -echo $ECHO_N "checking for boost/spirit/core.hpp... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for boost/spirit/core.hpp" >&5 +echo $ECHO_N "checking for boost/spirit/core.hpp... $ECHO_C" >&6 if test "${ac_cv_header_boost_spirit_core_hpp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_boost_spirit_core_hpp=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_boost_spirit_core_hpp" >&5 -echo "${ECHO_T}$ac_cv_header_boost_spirit_core_hpp" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_boost_spirit_core_hpp" >&5 +echo "${ECHO_T}$ac_cv_header_boost_spirit_core_hpp" >&6 fi if test $ac_cv_header_boost_spirit_core_hpp = yes; then @@ -16184,39 +14788,40 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu else - { echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 BUILD_TYPE="$BUILD_TYPE BOOST" SYSTEM_BOOST=NO fi -{ echo "$as_me:$LINENO: checking which vigra to use" >&5 -echo $ECHO_N "checking which vigra to use... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking which vigra to use" >&5 +echo $ECHO_N "checking which vigra to use... $ECHO_C" >&6 if test -n "$with_system_vigra" -o -n "$with_system_headers" && \ test "$with_system_vigra" != "no"; then - { echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_VIGRA=YES - ac_ext=cpp + ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu if test "${ac_cv_header_vigra_copyimage_hxx+set}" = set; then - { echo "$as_me:$LINENO: checking for vigra/copyimage.hxx" >&5 -echo $ECHO_N "checking for vigra/copyimage.hxx... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for vigra/copyimage.hxx" >&5 +echo $ECHO_N "checking for vigra/copyimage.hxx... $ECHO_C" >&6 if test "${ac_cv_header_vigra_copyimage_hxx+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_vigra_copyimage_hxx" >&5 -echo "${ECHO_T}$ac_cv_header_vigra_copyimage_hxx" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_vigra_copyimage_hxx" >&5 +echo "${ECHO_T}$ac_cv_header_vigra_copyimage_hxx" >&6 else # Is the header compilable? -{ echo "$as_me:$LINENO: checking vigra/copyimage.hxx usability" >&5 -echo $ECHO_N "checking vigra/copyimage.hxx usability... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking vigra/copyimage.hxx usability" >&5 +echo $ECHO_N "checking vigra/copyimage.hxx usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -16226,38 +14831,33 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); }; }; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no +ac_header_compiler=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 # Is the header present? -{ echo "$as_me:$LINENO: checking vigra/copyimage.hxx presence" >&5 -echo $ECHO_N "checking vigra/copyimage.hxx presence... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking vigra/copyimage.hxx presence" >&5 +echo $ECHO_N "checking vigra/copyimage.hxx presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -16265,22 +14865,23 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -16288,45 +14889,52 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi - rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in - yes:no: ) +case $ac_header_compiler:$ac_header_preproc in + yes:no ) { echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: vigra/copyimage.hxx: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: vigra/copyimage.hxx: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes + { echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: vigra/copyimage.hxx: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; - no:yes:* ) + no:yes ) { echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: present but cannot be compiled" >&5 echo "$as_me: WARNING: vigra/copyimage.hxx: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: vigra/copyimage.hxx: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: vigra/copyimage.hxx: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: vigra/copyimage.hxx: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: vigra/copyimage.hxx: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: vigra/copyimage.hxx: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: vigra/copyimage.hxx: in the future, the compiler will take precedence" >&2;} - + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for vigra/copyimage.hxx" >&5 -echo $ECHO_N "checking for vigra/copyimage.hxx... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for vigra/copyimage.hxx" >&5 +echo $ECHO_N "checking for vigra/copyimage.hxx... $ECHO_C" >&6 if test "${ac_cv_header_vigra_copyimage_hxx+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_vigra_copyimage_hxx=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_vigra_copyimage_hxx" >&5 -echo "${ECHO_T}$ac_cv_header_vigra_copyimage_hxx" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_vigra_copyimage_hxx" >&5 +echo "${ECHO_T}$ac_cv_header_vigra_copyimage_hxx" >&6 fi if test $ac_cv_header_vigra_copyimage_hxx = yes; then @@ -16345,34 +14953,35 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu else - { echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 BUILD_TYPE="$BUILD_TYPE VIGRA" SYSTEM_VIGRA=NO fi -{ echo "$as_me:$LINENO: checking which odbc headers to use" >&5 -echo $ECHO_N "checking which odbc headers to use... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking which odbc headers to use" >&5 +echo $ECHO_N "checking which odbc headers to use... $ECHO_C" >&6 if test -n "$with_system_odbc_headers" -o -n "$with_system_headers" && \ test "$with_system_odbc_headers" != "no"; then - { echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_ODBC_HEADERS=YES if test "${ac_cv_header_sqlext_h+set}" = set; then - { echo "$as_me:$LINENO: checking for sqlext.h" >&5 -echo $ECHO_N "checking for sqlext.h... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for sqlext.h" >&5 +echo $ECHO_N "checking for sqlext.h... $ECHO_C" >&6 if test "${ac_cv_header_sqlext_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sqlext_h" >&5 -echo "${ECHO_T}$ac_cv_header_sqlext_h" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_sqlext_h" >&5 +echo "${ECHO_T}$ac_cv_header_sqlext_h" >&6 else # Is the header compilable? -{ echo "$as_me:$LINENO: checking sqlext.h usability" >&5 -echo $ECHO_N "checking sqlext.h usability... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking sqlext.h usability" >&5 +echo $ECHO_N "checking sqlext.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -16382,38 +14991,33 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_objext; then + (exit $ac_status); }; }; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no +ac_header_compiler=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 # Is the header present? -{ echo "$as_me:$LINENO: checking sqlext.h presence" >&5 -echo $ECHO_N "checking sqlext.h presence... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking sqlext.h presence" >&5 +echo $ECHO_N "checking sqlext.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -16421,22 +15025,23 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -16444,45 +15049,52 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi - rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) +case $ac_header_compiler:$ac_header_preproc in + yes:no ) { echo "$as_me:$LINENO: WARNING: sqlext.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: sqlext.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: sqlext.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: sqlext.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes + { echo "$as_me:$LINENO: WARNING: sqlext.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: sqlext.h: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; - no:yes:* ) + no:yes ) { echo "$as_me:$LINENO: WARNING: sqlext.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: sqlext.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: sqlext.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: sqlext.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: sqlext.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: sqlext.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: sqlext.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: sqlext.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: sqlext.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: sqlext.h: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: sqlext.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: sqlext.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: sqlext.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: sqlext.h: in the future, the compiler will take precedence" >&2;} - + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for sqlext.h" >&5 -echo $ECHO_N "checking for sqlext.h... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for sqlext.h" >&5 +echo $ECHO_N "checking for sqlext.h... $ECHO_C" >&6 if test "${ac_cv_header_sqlext_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_sqlext_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sqlext_h" >&5 -echo "${ECHO_T}$ac_cv_header_sqlext_h" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_sqlext_h" >&5 +echo "${ECHO_T}$ac_cv_header_sqlext_h" >&6 fi if test $ac_cv_header_sqlext_h = yes; then @@ -16495,92 +15107,92 @@ fi else - { echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_ODBC_HEADERS=NO BUILD_TYPE="$BUILD_TYPE UNIXODBC" fi -{ echo "$as_me:$LINENO: checking whether to enable build of Mozilla/Mozilla NSS-using components" >&5 -echo $ECHO_N "checking whether to enable build of Mozilla/Mozilla NSS-using components... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to enable build of Mozilla/Mozilla NSS-using components" >&5 +echo $ECHO_N "checking whether to enable build of Mozilla/Mozilla NSS-using components... $ECHO_C" >&6 if test "$enable_mozilla" = "no"; then - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 WITH_MOZILLA=NO else - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 WITH_MOZILLA=YES fi -{ echo "$as_me:$LINENO: checking whether to build Mozilla addressbook connectivity" >&5 -echo $ECHO_N "checking whether to build Mozilla addressbook connectivity... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to build Mozilla addressbook connectivity" >&5 +echo $ECHO_N "checking whether to build Mozilla addressbook connectivity... $ECHO_C" >&6 if test "$enable_mozilla" = "no"; then - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 elif test "$with_system_mozilla" = "yes"; then - { echo "$as_me:$LINENO: result: no, not possible with system-mozilla" >&5 -echo "${ECHO_T}no, not possible with system-mozilla" >&6; } + echo "$as_me:$LINENO: result: no, not possible with system-mozilla" >&5 +echo "${ECHO_T}no, not possible with system-mozilla" >&6 else - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 fi -{ echo "$as_me:$LINENO: checking whether to build XML Security support" >&5 -echo $ECHO_N "checking whether to build XML Security support... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to build XML Security support" >&5 +echo $ECHO_N "checking whether to build XML Security support... $ECHO_C" >&6 if test "$enable_mozilla" = "no"; then - { echo "$as_me:$LINENO: result: no, since Mozilla (NSS) disabled but needed" >&5 -echo "${ECHO_T}no, since Mozilla (NSS) disabled but needed" >&6; } + echo "$as_me:$LINENO: result: no, since Mozilla (NSS) disabled but needed" >&5 +echo "${ECHO_T}no, since Mozilla (NSS) disabled but needed" >&6 else - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 fi -{ echo "$as_me:$LINENO: checking whether to build LDAP configuration backend" >&5 -echo $ECHO_N "checking whether to build LDAP configuration backend... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to build LDAP configuration backend" >&5 +echo $ECHO_N "checking whether to build LDAP configuration backend... $ECHO_C" >&6 if test -z "$enable_ldap" || test "$enable_ldap" = "yes"; then if test "$enable_mozilla" = "yes" || test "$with_openldap" = "yes"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 WITH_LDAP=YES else - { echo "$as_me:$LINENO: result: no. Either Mozilla or OpenLDAP needed" >&5 -echo "${ECHO_T}no. Either Mozilla or OpenLDAP needed" >&6; } + echo "$as_me:$LINENO: result: no. Either Mozilla or OpenLDAP needed" >&5 +echo "${ECHO_T}no. Either Mozilla or OpenLDAP needed" >&6 WITH_LDAP=NO fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 WITH_LDAP=NO fi if test "$WITH_LDAP" = "YES"; then - { echo "$as_me:$LINENO: checking which LDAP SDK to use" >&5 -echo $ECHO_N "checking which LDAP SDK to use... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking which LDAP SDK to use" >&5 +echo $ECHO_N "checking which LDAP SDK to use... $ECHO_C" >&6 if test -n "$with_openldap" && test "$with_openldap" != "no"; then - { echo "$as_me:$LINENO: result: OpenLDAP" >&5 -echo "${ECHO_T}OpenLDAP" >&6; } + echo "$as_me:$LINENO: result: OpenLDAP" >&5 +echo "${ECHO_T}OpenLDAP" >&6 WITH_OPENLDAP=YES for ac_header in ldap.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -16590,38 +15202,33 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_objext; then + (exit $ac_status); }; }; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no +ac_header_compiler=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 # Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -16629,22 +15236,23 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -16652,46 +15260,52 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi - rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) +case $ac_header_compiler:$ac_header_preproc in + yes:no ) { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; - no:yes:* ) + no:yes ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - eval "$as_ac_Header=\$ac_header_preproc" + eval "$as_ac_Header=$ac_header_preproc" fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -16708,67 +15322,60 @@ fi done -{ echo "$as_me:$LINENO: checking for ldap_simple_bind_s in -lldap" >&5 -echo $ECHO_N "checking for ldap_simple_bind_s in -lldap... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for ldap_simple_bind_s in -lldap" >&5 +echo $ECHO_N "checking for ldap_simple_bind_s in -lldap... $ECHO_C" >&6 if test "${ac_cv_lib_ldap_ldap_simple_bind_s+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lldap $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char ldap_simple_bind_s (); int main () { -return ldap_simple_bind_s (); +ldap_simple_bind_s (); ; 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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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 + (exit $ac_status); }; }; then ac_cv_lib_ldap_ldap_simple_bind_s=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_ldap_ldap_simple_bind_s=no +ac_cv_lib_ldap_ldap_simple_bind_s=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_simple_bind_s" >&5 -echo "${ECHO_T}$ac_cv_lib_ldap_ldap_simple_bind_s" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_simple_bind_s" >&5 +echo "${ECHO_T}$ac_cv_lib_ldap_ldap_simple_bind_s" >&6 if test $ac_cv_lib_ldap_ldap_simple_bind_s = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBLDAP 1 @@ -16785,67 +15392,60 @@ fi # rumours say that OpenLDAP doesn't have that function. I looked and # it has it. Test for it to be sure -{ echo "$as_me:$LINENO: checking for ldap_set_option in -lldap" >&5 -echo $ECHO_N "checking for ldap_set_option in -lldap... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for ldap_set_option in -lldap" >&5 +echo $ECHO_N "checking for ldap_set_option in -lldap... $ECHO_C" >&6 if test "${ac_cv_lib_ldap_ldap_set_option+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lldap $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char ldap_set_option (); int main () { -return ldap_set_option (); +ldap_set_option (); ; 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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 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 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_ldap_ldap_set_option=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_ldap_ldap_set_option=no +ac_cv_lib_ldap_ldap_set_option=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_set_option" >&5 -echo "${ECHO_T}$ac_cv_lib_ldap_ldap_set_option" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_set_option" >&5 +echo "${ECHO_T}$ac_cv_lib_ldap_ldap_set_option" >&6 if test $ac_cv_lib_ldap_ldap_set_option = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBLDAP 1 @@ -16860,8 +15460,8 @@ echo "$as_me: error: openldap lib not found or functional" >&2;} fi else - { echo "$as_me:$LINENO: result: Netscape/Mozilla" >&5 -echo "${ECHO_T}Netscape/Mozilla" >&6; } + echo "$as_me:$LINENO: result: Netscape/Mozilla" >&5 +echo "${ECHO_T}Netscape/Mozilla" >&6 # TODO. Actually do a sanity check and check for # LDAP_OPT_SIZELIMIT and LDAP_X_OPT_CONNECT_TIMEOUT WITH_OPENLDAP=NO @@ -16870,14 +15470,14 @@ fi -{ echo "$as_me:$LINENO: checking which mozilla to use" >&5 -echo $ECHO_N "checking which mozilla to use... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking which mozilla to use" >&5 +echo $ECHO_N "checking which mozilla to use... $ECHO_C" >&6 if test -n "$with_system_mozilla" && test "$with_system_mozilla" != "no"; then - { echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_MOZILLA=YES - { echo "$as_me:$LINENO: checking which Mozilla flavour to use" >&5 -echo $ECHO_N "checking which Mozilla flavour to use... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking which Mozilla flavour to use" >&5 +echo $ECHO_N "checking which Mozilla flavour to use... $ECHO_C" >&6 if test -n "$with_system_mozilla" && test "$with_system_mozilla" = "libxul"; then MOZ_FLAVOUR=libxul elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "xulrunner"; then @@ -16892,8 +15492,8 @@ echo $ECHO_N "checking which Mozilla flavour to use... $ECHO_C" >&6; } MOZ_FLAVOUR=libxul fi tmp=`echo $MOZ_FLAVOUR | $PERL -e 'print ucfirst();'` - { echo "$as_me:$LINENO: result: $tmp" >&5 -echo "${ECHO_T}$tmp" >&6; } + echo "$as_me:$LINENO: result: $tmp" >&5 +echo "${ECHO_T}$tmp" >&6 succeeded=no @@ -16901,8 +15501,8 @@ echo "${ECHO_T}$tmp" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -16917,29 +15517,28 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -16950,25 +15549,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { echo "$as_me:$LINENO: checking for nss" >&5 -echo $ECHO_N "checking for nss... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for nss" >&5 +echo $ECHO_N "checking for nss... $ECHO_C" >&6 if $PKG_CONFIG --exists "nss" ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { echo "$as_me:$LINENO: checking MOZ_NSS_CFLAGS" >&5 -echo $ECHO_N "checking MOZ_NSS_CFLAGS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking MOZ_NSS_CFLAGS" >&5 +echo $ECHO_N "checking MOZ_NSS_CFLAGS... $ECHO_C" >&6 MOZ_NSS_CFLAGS=`$PKG_CONFIG --cflags "nss"` - { echo "$as_me:$LINENO: result: $MOZ_NSS_CFLAGS" >&5 -echo "${ECHO_T}$MOZ_NSS_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $MOZ_NSS_CFLAGS" >&5 +echo "${ECHO_T}$MOZ_NSS_CFLAGS" >&6 - { echo "$as_me:$LINENO: checking MOZ_NSS_LIBS" >&5 -echo $ECHO_N "checking MOZ_NSS_LIBS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking MOZ_NSS_LIBS" >&5 +echo $ECHO_N "checking MOZ_NSS_LIBS... $ECHO_C" >&6 MOZ_NSS_LIBS=`$PKG_CONFIG --libs "nss"` - { echo "$as_me:$LINENO: result: $MOZ_NSS_LIBS" >&5 -echo "${ECHO_T}$MOZ_NSS_LIBS" >&6; } + echo "$as_me:$LINENO: result: $MOZ_NSS_LIBS" >&5 +echo "${ECHO_T}$MOZ_NSS_LIBS" >&6 else MOZ_NSS_CFLAGS="" MOZ_NSS_LIBS="" @@ -16999,8 +15598,8 @@ echo "${ECHO_T}$MOZ_NSS_LIBS" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -17015,29 +15614,28 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -17048,25 +15646,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-nss " >&5 -echo $ECHO_N "checking for $MOZ_FLAVOUR-nss ... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-nss " >&5 +echo $ECHO_N "checking for $MOZ_FLAVOUR-nss ... $ECHO_C" >&6 if $PKG_CONFIG --exists "$MOZ_FLAVOUR-nss " ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { echo "$as_me:$LINENO: checking MOZ_NSS_CFLAGS" >&5 -echo $ECHO_N "checking MOZ_NSS_CFLAGS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking MOZ_NSS_CFLAGS" >&5 +echo $ECHO_N "checking MOZ_NSS_CFLAGS... $ECHO_C" >&6 MOZ_NSS_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-nss "` - { echo "$as_me:$LINENO: result: $MOZ_NSS_CFLAGS" >&5 -echo "${ECHO_T}$MOZ_NSS_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $MOZ_NSS_CFLAGS" >&5 +echo "${ECHO_T}$MOZ_NSS_CFLAGS" >&6 - { echo "$as_me:$LINENO: checking MOZ_NSS_LIBS" >&5 -echo $ECHO_N "checking MOZ_NSS_LIBS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking MOZ_NSS_LIBS" >&5 +echo $ECHO_N "checking MOZ_NSS_LIBS... $ECHO_C" >&6 MOZ_NSS_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-nss "` - { echo "$as_me:$LINENO: result: $MOZ_NSS_LIBS" >&5 -echo "${ECHO_T}$MOZ_NSS_LIBS" >&6; } + echo "$as_me:$LINENO: result: $MOZ_NSS_LIBS" >&5 +echo "${ECHO_T}$MOZ_NSS_LIBS" >&6 else MOZ_NSS_CFLAGS="" MOZ_NSS_LIBS="" @@ -17104,8 +15702,8 @@ echo "$as_me: error: Library requirements ($MOZ_FLAVOUR-nss ) not met; consider if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -17120,29 +15718,28 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -17153,25 +15750,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { echo "$as_me:$LINENO: checking for nspr " >&5 -echo $ECHO_N "checking for nspr ... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for nspr " >&5 +echo $ECHO_N "checking for nspr ... $ECHO_C" >&6 if $PKG_CONFIG --exists "nspr " ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { echo "$as_me:$LINENO: checking MOZ_NSPR_CFLAGS" >&5 -echo $ECHO_N "checking MOZ_NSPR_CFLAGS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking MOZ_NSPR_CFLAGS" >&5 +echo $ECHO_N "checking MOZ_NSPR_CFLAGS... $ECHO_C" >&6 MOZ_NSPR_CFLAGS=`$PKG_CONFIG --cflags "nspr "` - { echo "$as_me:$LINENO: result: $MOZ_NSPR_CFLAGS" >&5 -echo "${ECHO_T}$MOZ_NSPR_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $MOZ_NSPR_CFLAGS" >&5 +echo "${ECHO_T}$MOZ_NSPR_CFLAGS" >&6 - { echo "$as_me:$LINENO: checking MOZ_NSPR_LIBS" >&5 -echo $ECHO_N "checking MOZ_NSPR_LIBS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking MOZ_NSPR_LIBS" >&5 +echo $ECHO_N "checking MOZ_NSPR_LIBS... $ECHO_C" >&6 MOZ_NSPR_LIBS=`$PKG_CONFIG --libs "nspr "` - { echo "$as_me:$LINENO: result: $MOZ_NSPR_LIBS" >&5 -echo "${ECHO_T}$MOZ_NSPR_LIBS" >&6; } + echo "$as_me:$LINENO: result: $MOZ_NSPR_LIBS" >&5 +echo "${ECHO_T}$MOZ_NSPR_LIBS" >&6 else MOZ_NSPR_CFLAGS="" MOZ_NSPR_LIBS="" @@ -17206,8 +15803,8 @@ echo "$as_me: error: Library requirements (nspr ) not met; consider adjusting th if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -17222,29 +15819,28 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -17255,25 +15851,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-nspr " >&5 -echo $ECHO_N "checking for $MOZ_FLAVOUR-nspr ... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-nspr " >&5 +echo $ECHO_N "checking for $MOZ_FLAVOUR-nspr ... $ECHO_C" >&6 if $PKG_CONFIG --exists "$MOZ_FLAVOUR-nspr " ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { echo "$as_me:$LINENO: checking MOZ_NSPR_CFLAGS" >&5 -echo $ECHO_N "checking MOZ_NSPR_CFLAGS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking MOZ_NSPR_CFLAGS" >&5 +echo $ECHO_N "checking MOZ_NSPR_CFLAGS... $ECHO_C" >&6 MOZ_NSPR_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-nspr "` - { echo "$as_me:$LINENO: result: $MOZ_NSPR_CFLAGS" >&5 -echo "${ECHO_T}$MOZ_NSPR_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $MOZ_NSPR_CFLAGS" >&5 +echo "${ECHO_T}$MOZ_NSPR_CFLAGS" >&6 - { echo "$as_me:$LINENO: checking MOZ_NSPR_LIBS" >&5 -echo $ECHO_N "checking MOZ_NSPR_LIBS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking MOZ_NSPR_LIBS" >&5 +echo $ECHO_N "checking MOZ_NSPR_LIBS... $ECHO_C" >&6 MOZ_NSPR_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-nspr "` - { echo "$as_me:$LINENO: result: $MOZ_NSPR_LIBS" >&5 -echo "${ECHO_T}$MOZ_NSPR_LIBS" >&6; } + echo "$as_me:$LINENO: result: $MOZ_NSPR_LIBS" >&5 +echo "${ECHO_T}$MOZ_NSPR_LIBS" >&6 else MOZ_NSPR_CFLAGS="" MOZ_NSPR_LIBS="" @@ -17308,8 +15904,8 @@ echo "$as_me: error: Library requirements ($MOZ_FLAVOUR-nspr ) not met; consider if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -17324,29 +15920,28 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -17357,25 +15952,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-xpcom" >&5 -echo $ECHO_N "checking for $MOZ_FLAVOUR-xpcom... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-xpcom" >&5 +echo $ECHO_N "checking for $MOZ_FLAVOUR-xpcom... $ECHO_C" >&6 if $PKG_CONFIG --exists "$MOZ_FLAVOUR-xpcom" ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { echo "$as_me:$LINENO: checking MOZILLAXPCOM_CFLAGS" >&5 -echo $ECHO_N "checking MOZILLAXPCOM_CFLAGS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking MOZILLAXPCOM_CFLAGS" >&5 +echo $ECHO_N "checking MOZILLAXPCOM_CFLAGS... $ECHO_C" >&6 MOZILLAXPCOM_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-xpcom"` - { echo "$as_me:$LINENO: result: $MOZILLAXPCOM_CFLAGS" >&5 -echo "${ECHO_T}$MOZILLAXPCOM_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $MOZILLAXPCOM_CFLAGS" >&5 +echo "${ECHO_T}$MOZILLAXPCOM_CFLAGS" >&6 - { echo "$as_me:$LINENO: checking MOZILLAXPCOM_LIBS" >&5 -echo $ECHO_N "checking MOZILLAXPCOM_LIBS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking MOZILLAXPCOM_LIBS" >&5 +echo $ECHO_N "checking MOZILLAXPCOM_LIBS... $ECHO_C" >&6 MOZILLAXPCOM_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-xpcom"` - { echo "$as_me:$LINENO: result: $MOZILLAXPCOM_LIBS" >&5 -echo "${ECHO_T}$MOZILLAXPCOM_LIBS" >&6; } + echo "$as_me:$LINENO: result: $MOZILLAXPCOM_LIBS" >&5 +echo "${ECHO_T}$MOZILLAXPCOM_LIBS" >&6 else MOZILLAXPCOM_CFLAGS="" MOZILLAXPCOM_LIBS="" @@ -17410,8 +16005,8 @@ echo "${ECHO_T}$MOZILLAXPCOM_LIBS" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -17426,29 +16021,28 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -17459,25 +16053,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { echo "$as_me:$LINENO: checking for libxul " >&5 -echo $ECHO_N "checking for libxul ... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for libxul " >&5 +echo $ECHO_N "checking for libxul ... $ECHO_C" >&6 if $PKG_CONFIG --exists "libxul " ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { echo "$as_me:$LINENO: checking MOZILLAXPCOM_CFLAGS" >&5 -echo $ECHO_N "checking MOZILLAXPCOM_CFLAGS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking MOZILLAXPCOM_CFLAGS" >&5 +echo $ECHO_N "checking MOZILLAXPCOM_CFLAGS... $ECHO_C" >&6 MOZILLAXPCOM_CFLAGS=`$PKG_CONFIG --cflags "libxul "` - { echo "$as_me:$LINENO: result: $MOZILLAXPCOM_CFLAGS" >&5 -echo "${ECHO_T}$MOZILLAXPCOM_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $MOZILLAXPCOM_CFLAGS" >&5 +echo "${ECHO_T}$MOZILLAXPCOM_CFLAGS" >&6 - { echo "$as_me:$LINENO: checking MOZILLAXPCOM_LIBS" >&5 -echo $ECHO_N "checking MOZILLAXPCOM_LIBS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking MOZILLAXPCOM_LIBS" >&5 +echo $ECHO_N "checking MOZILLAXPCOM_LIBS... $ECHO_C" >&6 MOZILLAXPCOM_LIBS=`$PKG_CONFIG --libs "libxul "` - { echo "$as_me:$LINENO: result: $MOZILLAXPCOM_LIBS" >&5 -echo "${ECHO_T}$MOZILLAXPCOM_LIBS" >&6; } + echo "$as_me:$LINENO: result: $MOZILLAXPCOM_LIBS" >&5 +echo "${ECHO_T}$MOZILLAXPCOM_LIBS" >&6 else MOZILLAXPCOM_CFLAGS="" MOZILLAXPCOM_LIBS="" @@ -17519,67 +16113,60 @@ echo "$as_me: error: Library requirements (libxul ) not met; consider adjusting CPPFLAGS="$CPPFLAGS $MOZ_NSS_CFLAGS" LDFLAGS="$LDFLAGS $MOZ_NSS_LIBS" -{ echo "$as_me:$LINENO: checking for PK11_GetCertFromPrivateKey in -lnss3" >&5 -echo $ECHO_N "checking for PK11_GetCertFromPrivateKey in -lnss3... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for PK11_GetCertFromPrivateKey in -lnss3" >&5 +echo $ECHO_N "checking for PK11_GetCertFromPrivateKey in -lnss3... $ECHO_C" >&6 if test "${ac_cv_lib_nss3_PK11_GetCertFromPrivateKey+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lnss3 $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char PK11_GetCertFromPrivateKey (); int main () { -return PK11_GetCertFromPrivateKey (); +PK11_GetCertFromPrivateKey (); ; 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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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 + (exit $ac_status); }; }; then ac_cv_lib_nss3_PK11_GetCertFromPrivateKey=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_nss3_PK11_GetCertFromPrivateKey=no +ac_cv_lib_nss3_PK11_GetCertFromPrivateKey=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_nss3_PK11_GetCertFromPrivateKey" >&5 -echo "${ECHO_T}$ac_cv_lib_nss3_PK11_GetCertFromPrivateKey" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_lib_nss3_PK11_GetCertFromPrivateKey" >&5 +echo "${ECHO_T}$ac_cv_lib_nss3_PK11_GetCertFromPrivateKey" >&6 if test $ac_cv_lib_nss3_PK11_GetCertFromPrivateKey = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBNSS3 1 @@ -17603,11 +16190,11 @@ fi MOZ_LIB_XPCOM=$MOZILLAXPCOM_LIBS if test "$WITH_LDAP" != "NO" && test "$WITH_OPENLDAP" != "YES"; then - { echo "$as_me:$LINENO: checking whether $tmp was compiled with --enable-ldap" >&5 -echo $ECHO_N "checking whether $tmp was compiled with --enable-ldap... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking whether $tmp was compiled with --enable-ldap" >&5 +echo $ECHO_N "checking whether $tmp was compiled with --enable-ldap... $ECHO_C" >&6 if test -d "$MOZ_INC/ldap"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 MOZ_LDAP_CFLAGS="-I$MOZ_INC" else { { echo "$as_me:$LINENO: error: no. @@ -17627,46 +16214,46 @@ Please recompile $tmp with --enable-ldap or use --with-openldap." >&2;} fi elif test "$enable_mozilla" = "no"; then - { echo "$as_me:$LINENO: result: none" >&5 -echo "${ECHO_T}none" >&6; } + echo "$as_me:$LINENO: result: none" >&5 +echo "${ECHO_T}none" >&6 WITH_MOZILLA=NO else - { echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_MOZILLA=NO BUILD_TYPE="$BUILD_TYPE MOZ" if test -z "$with_mozilla_version"; then MOZILLA_VERSION= else - { echo "$as_me:$LINENO: checking which mozilla version to build" >&5 -echo $ECHO_N "checking which mozilla version to build... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking which mozilla version to build" >&5 +echo $ECHO_N "checking which mozilla version to build... $ECHO_C" >&6 MOZILLA_VERSION=$with_mozilla_version enable_build_mozilla=1 - { echo "$as_me:$LINENO: result: $MOZILLA_VERSION" >&5 -echo "${ECHO_T}$MOZILLA_VERSION" >&6; } + echo "$as_me:$LINENO: result: $MOZILLA_VERSION" >&5 +echo "${ECHO_T}$MOZILLA_VERSION" >&6 fi -{ echo "$as_me:$LINENO: checking for toolkit mozilla should use" >&5 -echo $ECHO_N "checking for toolkit mozilla should use... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for toolkit mozilla should use" >&5 +echo $ECHO_N "checking for toolkit mozilla should use... $ECHO_C" >&6 if test -z "$with_mozilla_toolkit"; then if test "$_os" != "WINNT" ; then if test "$_os" = "Darwin" ; then MOZILLA_TOOLKIT=mac - { echo "$as_me:$LINENO: result: mac" >&5 -echo "${ECHO_T}mac" >&6; } + echo "$as_me:$LINENO: result: mac" >&5 +echo "${ECHO_T}mac" >&6 else MOZILLA_TOOLKIT=gtk2 - { echo "$as_me:$LINENO: result: gtk2" >&5 -echo "${ECHO_T}gtk2" >&6; } + echo "$as_me:$LINENO: result: gtk2" >&5 +echo "${ECHO_T}gtk2" >&6 fi fi else MOZILLA_TOOLKIT=$with_mozilla_toolkit enable_build_mozilla=1 - { echo "$as_me:$LINENO: result: $MOZILLA_TOOLKIT" >&5 -echo "${ECHO_T}$MOZILLA_TOOLKIT" >&6; } + echo "$as_me:$LINENO: result: $MOZILLA_TOOLKIT" >&5 +echo "${ECHO_T}$MOZILLA_TOOLKIT" >&6 fi #if test "$_os" = "Darwin" && test "$MOZILLA_TOOLKIT" != "gtk2"; then # #only gtk2 toolkit supported - xlib or cocoa nees glib1 and libIDL1 - the latter is not @@ -17683,16 +16270,16 @@ else enable_build_mozilla= fi -{ echo "$as_me:$LINENO: checking whether to build Mozilla/SeaMonkey" >&5 -echo $ECHO_N "checking whether to build Mozilla/SeaMonkey... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to build Mozilla/SeaMonkey" >&5 +echo $ECHO_N "checking whether to build Mozilla/SeaMonkey... $ECHO_C" >&6 if test -n "$enable_build_mozilla"; then BUILD_MOZAB="TRUE" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else BUILD_MOZAB="" - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi if test "$BUILD_MOZAB" = "TRUE"; then @@ -17716,15 +16303,15 @@ echo "$as_me: WARNING: Building SeaMonkey with mingwin is not tested, and likely fi MOZILLA_SOURCE_VERSION="seamonkey-${MOZILLA_VERSION}.source" for e in gz bz2; do - { echo "$as_me:$LINENO: checking for $MOZILLA_SOURCE_VERSION.tar.$e" >&5 -echo $ECHO_N "checking for $MOZILLA_SOURCE_VERSION.tar.$e... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for $MOZILLA_SOURCE_VERSION.tar.$e" >&5 +echo $ECHO_N "checking for $MOZILLA_SOURCE_VERSION.tar.$e... $ECHO_C" >&6 if test ! -e "moz/download/$MOZILLA_SOURCE_VERSION.tar.$e" && test "$HAVE_MOZILLA_TARBALL" != "y"; then - { echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6; } + echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6 HAVE_MOZILLA_TARBALL=n else - { echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6; } + echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6 HAVE_MOZILLA_TARBALL=y fi done @@ -17740,8 +16327,8 @@ http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/$MOZILLA_VERSION/ { (exit 1); exit 1; }; } fi if test "$_os" = "WINNT"; then - { echo "$as_me:$LINENO: checking for moztools binaries" >&5 -echo $ECHO_N "checking for moztools binaries... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for moztools binaries" >&5 +echo $ECHO_N "checking for moztools binaries... $ECHO_C" >&6 if test ! -e "moz/download/vc8-moztools.zip" ; then { { echo "$as_me:$LINENO: error: The following file is missing in moz/download: vc8-moztools.zip (from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc8/)" >&5 @@ -17749,8 +16336,8 @@ echo "$as_me: error: The following file is missing in moz/download: vc8-moztools (from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc8/)" >&2;} { (exit 1); exit 1; }; } else - { echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6; } + echo "$as_me:$LINENO: result: ok" >&5 +echo "${ECHO_T}ok" >&6 fi elif test "$_os" = "Darwin"; then if test "$MOZILLA_TOOLKIT" = "gtk2"; then @@ -17762,8 +16349,8 @@ echo "$as_me: checking whether mozilla can be built..." >&6;} if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -17778,29 +16365,28 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -17811,25 +16397,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { echo "$as_me:$LINENO: checking for gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8" >&5 -echo $ECHO_N "checking for gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8" >&5 +echo $ECHO_N "checking for gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8... $ECHO_C" >&6 if $PKG_CONFIG --exists "gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8" ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { echo "$as_me:$LINENO: checking MOZGTK2_CFLAGS" >&5 -echo $ECHO_N "checking MOZGTK2_CFLAGS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking MOZGTK2_CFLAGS" >&5 +echo $ECHO_N "checking MOZGTK2_CFLAGS... $ECHO_C" >&6 MOZGTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8"` - { echo "$as_me:$LINENO: result: $MOZGTK2_CFLAGS" >&5 -echo "${ECHO_T}$MOZGTK2_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $MOZGTK2_CFLAGS" >&5 +echo "${ECHO_T}$MOZGTK2_CFLAGS" >&6 - { echo "$as_me:$LINENO: checking MOZGTK2_LIBS" >&5 -echo $ECHO_N "checking MOZGTK2_LIBS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking MOZGTK2_LIBS" >&5 +echo $ECHO_N "checking MOZGTK2_LIBS... $ECHO_C" >&6 MOZGTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8"` - { echo "$as_me:$LINENO: result: $MOZGTK2_LIBS" >&5 -echo "${ECHO_T}$MOZGTK2_LIBS" >&6; } + echo "$as_me:$LINENO: result: $MOZGTK2_LIBS" >&5 +echo "${ECHO_T}$MOZGTK2_LIBS" >&6 else MOZGTK2_CFLAGS="" MOZGTK2_LIBS="" @@ -17863,8 +16449,8 @@ echo "$as_me: error: Prerequisites to build mozilla not met. Either use the prec if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -17879,29 +16465,28 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -17912,25 +16497,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { echo "$as_me:$LINENO: checking for libIDL >= 0.6.3 libIDL <= 0.6.8" >&5 -echo $ECHO_N "checking for libIDL >= 0.6.3 libIDL <= 0.6.8... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for libIDL >= 0.6.3 libIDL <= 0.6.8" >&5 +echo $ECHO_N "checking for libIDL >= 0.6.3 libIDL <= 0.6.8... $ECHO_C" >&6 if $PKG_CONFIG --exists "libIDL >= 0.6.3 libIDL <= 0.6.8" ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5 -echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5 +echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6 MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "libIDL >= 0.6.3 libIDL <= 0.6.8"` - { echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5 -echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5 +echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6 - { echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5 -echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5 +echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6 MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "libIDL >= 0.6.3 libIDL <= 0.6.8"` - { echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5 -echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6; } + echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5 +echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6 else MOZLIBREQ_CFLAGS="" MOZLIBREQ_LIBS="" @@ -17969,8 +16554,8 @@ echo "$as_me: error: libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -17985,29 +16570,28 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -18018,25 +16602,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { echo "$as_me:$LINENO: checking for gtk+-2.0" >&5 -echo $ECHO_N "checking for gtk+-2.0... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for gtk+-2.0" >&5 +echo $ECHO_N "checking for gtk+-2.0... $ECHO_C" >&6 if $PKG_CONFIG --exists "gtk+-2.0" ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5 -echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5 +echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6 MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0"` - { echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5 -echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5 +echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6 - { echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5 -echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5 +echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6 MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "gtk+-2.0"` - { echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5 -echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6; } + echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5 +echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6 else MOZLIBREQ_CFLAGS="" MOZLIBREQ_LIBS="" @@ -18071,8 +16655,8 @@ echo "$as_me: error: GTK2 is needed to build mozilla." >&2;} if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -18087,29 +16671,28 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -18120,25 +16703,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { echo "$as_me:$LINENO: checking for libIDL-2.0 >= 0.8.0" >&5 -echo $ECHO_N "checking for libIDL-2.0 >= 0.8.0... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for libIDL-2.0 >= 0.8.0" >&5 +echo $ECHO_N "checking for libIDL-2.0 >= 0.8.0... $ECHO_C" >&6 if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5 -echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5 +echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6 MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"` - { echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5 -echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5 +echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6 - { echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5 -echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5 +echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6 MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "libIDL-2.0 >= 0.8.0"` - { echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5 -echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6; } + echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5 +echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6 else MOZLIBREQ_CFLAGS="" MOZLIBREQ_LIBS="" @@ -18174,8 +16757,8 @@ echo "$as_me: error: libIDL >= 0.8.0 is needed when using GTK2 to build mozilla. if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -18190,29 +16773,28 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -18223,25 +16805,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { echo "$as_me:$LINENO: checking for gtk+ >= 1.2.3" >&5 -echo $ECHO_N "checking for gtk+ >= 1.2.3... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for gtk+ >= 1.2.3" >&5 +echo $ECHO_N "checking for gtk+ >= 1.2.3... $ECHO_C" >&6 if $PKG_CONFIG --exists "gtk+ >= 1.2.3" ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5 -echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5 +echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6 MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "gtk+ >= 1.2.3"` - { echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5 -echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5 +echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6 - { echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5 -echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5 +echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6 MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "gtk+ >= 1.2.3"` - { echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5 -echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6; } + echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5 +echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6 else MOZLIBREQ_CFLAGS="" MOZLIBREQ_LIBS="" @@ -18276,8 +16858,8 @@ echo "$as_me: error: gtk 1.2 is needed when not using GTK2 to build mozilla." >& if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -18292,29 +16874,28 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -18325,25 +16906,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { echo "$as_me:$LINENO: checking for libidl >= 0.6.3 libidl <= 0.6.8" >&5 -echo $ECHO_N "checking for libidl >= 0.6.3 libidl <= 0.6.8... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for libidl >= 0.6.3 libidl <= 0.6.8" >&5 +echo $ECHO_N "checking for libidl >= 0.6.3 libidl <= 0.6.8... $ECHO_C" >&6 if $PKG_CONFIG --exists "libidl >= 0.6.3 libidl <= 0.6.8" ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5 -echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5 +echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6 MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "libidl >= 0.6.3 libidl <= 0.6.8"` - { echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5 -echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5 +echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6 - { echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5 -echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5 +echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6 MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "libidl >= 0.6.3 libidl <= 0.6.8"` - { echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5 -echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6; } + echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5 +echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6 else MOZLIBREQ_CFLAGS="" MOZLIBREQ_LIBS="" @@ -18388,26 +16969,27 @@ fi -{ echo "$as_me:$LINENO: checking which sane header to use" >&5 -echo $ECHO_N "checking which sane header to use... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking which sane header to use" >&5 +echo $ECHO_N "checking which sane header to use... $ECHO_C" >&6 if test -n "$with_system_sane_header" -o -n "$with_system_headers" && \ test "$with_system_sane_header" != "no"; then - { echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_SANE_HEADER=YES if test "${ac_cv_header_sane_sane_h+set}" = set; then - { echo "$as_me:$LINENO: checking for sane/sane.h" >&5 -echo $ECHO_N "checking for sane/sane.h... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for sane/sane.h" >&5 +echo $ECHO_N "checking for sane/sane.h... $ECHO_C" >&6 if test "${ac_cv_header_sane_sane_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sane_sane_h" >&5 -echo "${ECHO_T}$ac_cv_header_sane_sane_h" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_sane_sane_h" >&5 +echo "${ECHO_T}$ac_cv_header_sane_sane_h" >&6 else # Is the header compilable? -{ echo "$as_me:$LINENO: checking sane/sane.h usability" >&5 -echo $ECHO_N "checking sane/sane.h usability... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking sane/sane.h usability" >&5 +echo $ECHO_N "checking sane/sane.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -18417,38 +16999,33 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_objext; then + (exit $ac_status); }; }; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no +ac_header_compiler=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 # Is the header present? -{ echo "$as_me:$LINENO: checking sane/sane.h presence" >&5 -echo $ECHO_N "checking sane/sane.h presence... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking sane/sane.h presence" >&5 +echo $ECHO_N "checking sane/sane.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -18456,22 +17033,23 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -18479,45 +17057,52 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi - rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) +case $ac_header_compiler:$ac_header_preproc in + yes:no ) { echo "$as_me:$LINENO: WARNING: sane/sane.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: sane/sane.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: sane/sane.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: sane/sane.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes + { echo "$as_me:$LINENO: WARNING: sane/sane.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: sane/sane.h: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; - no:yes:* ) + no:yes ) { echo "$as_me:$LINENO: WARNING: sane/sane.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: sane/sane.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: sane/sane.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: sane/sane.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: sane/sane.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: sane/sane.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: sane/sane.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: sane/sane.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: sane/sane.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: sane/sane.h: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: sane/sane.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: sane/sane.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: sane/sane.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: sane/sane.h: in the future, the compiler will take precedence" >&2;} - + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for sane/sane.h" >&5 -echo $ECHO_N "checking for sane/sane.h... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for sane/sane.h" >&5 +echo $ECHO_N "checking for sane/sane.h... $ECHO_C" >&6 if test "${ac_cv_header_sane_sane_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_sane_sane_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sane_sane_h" >&5 -echo "${ECHO_T}$ac_cv_header_sane_sane_h" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_sane_sane_h" >&5 +echo "${ECHO_T}$ac_cv_header_sane_sane_h" >&6 fi if test $ac_cv_header_sane_sane_h = yes; then @@ -18530,29 +17115,30 @@ fi else - { echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_SANE_HEADER=NO BUILD_TYPE="$BUILD_TYPE SANE" fi -{ echo "$as_me:$LINENO: checking which icu to use" >&5 -echo $ECHO_N "checking which icu to use... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking which icu to use" >&5 +echo $ECHO_N "checking which icu to use... $ECHO_C" >&6 if test -n "$with_system_icu" -o -n "$with_system_libs" && \ test "$with_system_icu" != "no"; then - { echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_ICU=YES - ac_ext=cpp + ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - { echo "$as_me:$LINENO: checking for unicode/rbbi.h" >&5 -echo $ECHO_N "checking for unicode/rbbi.h... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for unicode/rbbi.h" >&5 +echo $ECHO_N "checking for unicode/rbbi.h... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -18560,24 +17146,25 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ unicode/rbbi.h _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - { echo "$as_me:$LINENO: result: checked." >&5 -echo "${ECHO_T}checked." >&6; } + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + echo "$as_me:$LINENO: result: checked." >&5 +echo "${ECHO_T}checked." >&6 else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -18586,12 +17173,11 @@ sed 's/^/| /' conftest.$ac_ext >&5 echo "$as_me: error: icu headers not found." >&2;} { (exit 1); exit 1; }; } fi - rm -f conftest.err conftest.$ac_ext # Extract the first word of "genbrk", so it can be a program name with args. set dummy genbrk; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_SYSTEM_GENBRK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -18607,28 +17193,27 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_SYSTEM_GENBRK="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS ;; esac fi SYSTEM_GENBRK=$ac_cv_path_SYSTEM_GENBRK + if test -n "$SYSTEM_GENBRK"; then - { echo "$as_me:$LINENO: result: $SYSTEM_GENBRK" >&5 -echo "${ECHO_T}$SYSTEM_GENBRK" >&6; } + echo "$as_me:$LINENO: result: $SYSTEM_GENBRK" >&5 +echo "${ECHO_T}$SYSTEM_GENBRK" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test -z "$SYSTEM_GENBRK"; then { { echo "$as_me:$LINENO: error: \\"genbrk\\" not found in \$PATH, install the icu development tool \\"genbrk\"\" >&5 echo "$as_me: error: \\"genbrk\\" not found in \$PATH, install the icu development tool \\"genbrk\"\" >&2;} @@ -18636,8 +17221,8 @@ echo "$as_me: error: \\"genbrk\\" not found in \$PATH, install the icu developme fi # Extract the first word of "genccode", so it can be a program name with args. set dummy genccode; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_SYSTEM_GENCCODE+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -18653,28 +17238,27 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_SYSTEM_GENCCODE="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS ;; esac fi SYSTEM_GENCCODE=$ac_cv_path_SYSTEM_GENCCODE + if test -n "$SYSTEM_GENCCODE"; then - { echo "$as_me:$LINENO: result: $SYSTEM_GENCCODE" >&5 -echo "${ECHO_T}$SYSTEM_GENCCODE" >&6; } + echo "$as_me:$LINENO: result: $SYSTEM_GENCCODE" >&5 +echo "${ECHO_T}$SYSTEM_GENCCODE" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test -z "$SYSTEM_GENCCODE"; then { { echo "$as_me:$LINENO: error: \\"genccode\\" not found in \$PATH, install the icu development tool \\"genccode\"\" >&5 echo "$as_me: error: \\"genccode\\" not found in \$PATH, install the icu development tool \\"genccode\"\" >&2;} @@ -18682,8 +17266,8 @@ echo "$as_me: error: \\"genccode\\" not found in \$PATH, install the icu develop fi # Extract the first word of "gencmn", so it can be a program name with args. set dummy gencmn; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_SYSTEM_GENCMN+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -18699,35 +17283,34 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_SYSTEM_GENCMN="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS ;; esac fi SYSTEM_GENCMN=$ac_cv_path_SYSTEM_GENCMN + if test -n "$SYSTEM_GENCMN"; then - { echo "$as_me:$LINENO: result: $SYSTEM_GENCMN" >&5 -echo "${ECHO_T}$SYSTEM_GENCMN" >&6; } + echo "$as_me:$LINENO: result: $SYSTEM_GENCMN" >&5 +echo "${ECHO_T}$SYSTEM_GENCMN" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test -z "$SYSTEM_GENCMN"; then { { echo "$as_me:$LINENO: error: \\"gencmn\\" not found in \$PATH, install the icu development tool \\"gencmn\"\" >&5 echo "$as_me: error: \\"gencmn\\" not found in \$PATH, install the icu development tool \\"gencmn\"\" >&2;} { (exit 1); exit 1; }; } fi - { echo "$as_me:$LINENO: checking ICU version" >&5 -echo $ECHO_N "checking ICU version... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking ICU version" >&5 +echo $ECHO_N "checking ICU version... $ECHO_C" >&6 if test "$cross_compiling" = yes; then { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling See \`config.log' for more details." >&5 @@ -18736,6 +17319,7 @@ See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -18753,27 +17337,18 @@ int main(int argc, char **argv) { _ACEOF rm -f 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>&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (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_try") 2>&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { echo "$as_me:$LINENO: result: OK" >&5 -echo "${ECHO_T}OK" >&6; } + echo "$as_me:$LINENO: result: OK" >&5 +echo "${ECHO_T}OK" >&6 else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 @@ -18784,10 +17359,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 echo "$as_me: error: not suitable, only >= 4.0 supported currently" >&2;} { (exit 1); exit 1; }; } fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -18795,8 +17368,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu else - { echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_ICU=NO BUILD_TYPE="$BUILD_TYPE ICU" fi @@ -18812,11 +17385,11 @@ if test "$_os" = "Darwin"; then echo "$as_me: error: X11 build is no longer supported on MacOSX, please use the native aqua build" >&2;} { (exit 1); exit 1; }; } else - { echo "$as_me:$LINENO: checking for /System/Library/Frameworks/AppKit.framework" >&5 -echo $ECHO_N "checking for /System/Library/Frameworks/AppKit.framework... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for /System/Library/Frameworks/AppKit.framework" >&5 +echo $ECHO_N "checking for /System/Library/Frameworks/AppKit.framework... $ECHO_C" >&6 if test -d "/System/Library/Frameworks/AppKit.framework/"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 x_includes="no_x_includes" x_libraries="no_x_libraries" enable_gtk=no @@ -18838,57 +17411,52 @@ elif test "$_os" = "OS2" ; then echo "Do Nothing for _os = OS2. Don't check for X11." : elif test "$_os" != "WINNT" ; then - { echo "$as_me:$LINENO: checking for X" >&5 -echo $ECHO_N "checking for X... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for X" >&5 +echo $ECHO_N "checking for X... $ECHO_C" >&6 -# Check whether --with-x was given. +# Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then - withval=$with_x; -fi + withval="$with_x" +fi; # $have_x is `yes', `no', `disabled', or empty when we do not yet know. if test "x$with_x" = xno; then # The user explicitly disabled X. have_x=disabled else - case $x_includes,$x_libraries in #( - *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5 -echo "$as_me: error: Cannot use X directory names containing '" >&2;} - { (exit 1); exit 1; }; };; #( - *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then + if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then + # Both variables are already set. + have_x=yes + else + if test "${ac_cv_have_x+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else # One or both of the vars are not set, and there is no cached value. ac_x_includes=no ac_x_libraries=no -rm -f -r conftest.dir +rm -fr conftest.dir if mkdir conftest.dir; then cd conftest.dir + # Make sure to not put "make" in the Imakefile rules, since we grep it out. cat >Imakefile <<'_ACEOF' -incroot: - @echo incroot='${INCROOT}' -usrlibdir: - @echo usrlibdir='${USRLIBDIR}' -libdir: - @echo libdir='${LIBDIR}' -_ACEOF - if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then +acfindx: + @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' +_ACEOF + if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then # GNU make sometimes prints "make[1]: Entering...", which would confuse us. - for ac_var in incroot usrlibdir libdir; do - eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" - done + eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. for ac_extension in a so sl; do - if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && - test -f "$ac_im_libdir/libX11.$ac_extension"; then - ac_im_usrlibdir=$ac_im_libdir; break + if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && + test -f $ac_im_libdir/libX11.$ac_extension; then + ac_im_usrlibdir=$ac_im_libdir; break fi done # Screen out bogus values from the imake configuration. They are # bogus both because they are the default anyway, and because # using them would break gcc on systems where it needs fixed includes. case $ac_im_incroot in - /usr/include) ac_x_includes= ;; + /usr/include) ;; *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; esac case $ac_im_usrlibdir in @@ -18897,7 +17465,7 @@ _ACEOF esac fi cd .. - rm -f -r conftest.dir + rm -fr conftest.dir fi # Standard set of common directories for X headers. @@ -18938,32 +17506,34 @@ ac_x_header_dirs=' /usr/openwin/share/include' if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Xlib.h. + # Guess where to find include files, by looking for Intrinsic.h. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then # We can compile using X headers with no special include directory. ac_x_includes= else @@ -18971,13 +17541,12 @@ else sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Xlib.h"; then + if test -r "$ac_dir/X11/Intrinsic.h"; then ac_x_includes=$ac_dir break fi done fi - rm -f conftest.err conftest.$ac_ext fi # $ac_x_includes = no @@ -18986,40 +17555,35 @@ if test "$ac_x_libraries" = no; then # See if we find them without any special options. # Don't add to $LIBS permanently. ac_save_LIBS=$LIBS - LIBS="-lX11 $LIBS" + LIBS="-lXt $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include int main () { -XrmInitialize () +XtMalloc (0) ; 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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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 + (exit $ac_status); }; }; then LIBS=$ac_save_LIBS # We can link X programs with no special library path. ac_x_libraries= @@ -19027,54 +17591,48 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - LIBS=$ac_save_LIBS +LIBS=$ac_save_LIBS for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` do # Don't even attempt the hair of trying to link an X program! for ac_extension in a so sl; do - if test -r "$ac_dir/libX11.$ac_extension"; then + if test -r $ac_dir/libXt.$ac_extension; then ac_x_libraries=$ac_dir break 2 fi done done fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi # $ac_x_libraries = no -case $ac_x_includes,$ac_x_libraries in #( - no,* | *,no | *\'*) - # Didn't find X, or a directory has "'" in its name. - ac_cv_have_x="have_x=no";; #( - *) - # Record where we found X for the cache. - ac_cv_have_x="have_x=yes\ - ac_x_includes='$ac_x_includes'\ - ac_x_libraries='$ac_x_libraries'" -esac +if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then + # Didn't find X anywhere. Cache the known absence of X. + ac_cv_have_x="have_x=no" +else + # Record where we found X for the cache. + ac_cv_have_x="have_x=yes \ + ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" fi -;; #( - *) have_x=yes;; - esac +fi + + fi eval "$ac_cv_have_x" fi # $with_x != no if test "$have_x" != yes; then - { echo "$as_me:$LINENO: result: $have_x" >&5 -echo "${ECHO_T}$have_x" >&6; } + echo "$as_me:$LINENO: result: $have_x" >&5 +echo "${ECHO_T}$have_x" >&6 no_x=yes else # If each of the values was on the command line, it overrides each guess. test "x$x_includes" = xNONE && x_includes=$ac_x_includes test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries # Update the cache value to reflect the command line values. - ac_cv_have_x="have_x=yes\ - ac_x_includes='$x_includes'\ - ac_x_libraries='$x_libraries'" - { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 -echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; } + ac_cv_have_x="have_x=yes \ + ac_x_includes=$x_includes ac_x_libraries=$x_libraries" + echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 +echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 fi if test "$no_x" = yes; then @@ -19095,12 +17653,13 @@ else X_LIBS="$X_LIBS -L$x_libraries" # For Solaris; some versions of Sun CC require a space after -R and # others require no space. Words are not sufficient . . . . - { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 -echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; } - ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" - ac_xsave_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - cat >conftest.$ac_ext <<_ACEOF + case `(uname -sr) 2>/dev/null` in + "SunOS 5"*) + echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 +echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 + ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19116,32 +17675,33 @@ main () } _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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 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 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - X_LIBS="$X_LIBS -R$x_libraries" + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_R_nospace=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 +ac_R_nospace=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + if test $ac_R_nospace = yes; then + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + X_LIBS="$X_LIBS -R$x_libraries" + else LIBS="$ac_xsave_LIBS -R $x_libraries" - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19157,42 +17717,36 @@ main () } _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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 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 - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - X_LIBS="$X_LIBS -R $x_libraries" + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_R_space=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { echo "$as_me:$LINENO: result: neither works" >&5 -echo "${ECHO_T}neither works" >&6; } -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +ac_R_space=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - ac_c_werror_flag=$ac_xsave_c_werror_flag - LIBS=$ac_xsave_LIBS +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + if test $ac_R_space = yes; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + X_LIBS="$X_LIBS -R $x_libraries" + else + echo "$as_me:$LINENO: result: neither works" >&5 +echo "${ECHO_T}neither works" >&6 + fi + fi + LIBS=$ac_xsave_LIBS + esac fi # Check for system-dependent libraries X programs must link with. @@ -19207,186 +17761,165 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ # the Alpha needs dnet_stub (dnet does not exist). ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char XOpenDisplay (); int main () { -return XOpenDisplay (); +XOpenDisplay (); ; 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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 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 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 -echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 +echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char dnet_ntoa (); int main () { -return dnet_ntoa (); +dnet_ntoa (); ; 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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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 + (exit $ac_status); }; }; then ac_cv_lib_dnet_dnet_ntoa=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_dnet_dnet_ntoa=no +ac_cv_lib_dnet_dnet_ntoa=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 if test $ac_cv_lib_dnet_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then - { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 -echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 +echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char dnet_ntoa (); int main () { -return dnet_ntoa (); +dnet_ntoa (); ; 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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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 + (exit $ac_status); }; }; then ac_cv_lib_dnet_stub_dnet_ntoa=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_dnet_stub_dnet_ntoa=no +ac_cv_lib_dnet_stub_dnet_ntoa=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" fi fi fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$ac_xsave_LIBS" # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, @@ -19397,216 +17930,193 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ # on Irix 5.2, according to T.E. Dickey. # The functions gethostbyname, getservbyname, and inet_addr are # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. - { echo "$as_me:$LINENO: checking for gethostbyname" >&5 -echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for gethostbyname" >&5 +echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 if test "${ac_cv_func_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define gethostbyname to an innocuous variant, in case declares gethostbyname. - For example, HP-UX 11i declares gettimeofday. */ -#define gethostbyname innocuous_gethostbyname - /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ - #ifdef __STDC__ # include #else # include #endif - -#undef gethostbyname - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char gethostbyname (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined __stub_gethostbyname || defined __stub___gethostbyname +#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname) choke me +#else +char (*f) () = gethostbyname; +#endif +#ifdef __cplusplus +} #endif int main () { -return gethostbyname (); +return f != gethostbyname; ; 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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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 + (exit $ac_status); }; }; then ac_cv_func_gethostbyname=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_func_gethostbyname=no +ac_cv_func_gethostbyname=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 if test $ac_cv_func_gethostbyname = no; then - { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 -echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 +echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char gethostbyname (); int main () { -return gethostbyname (); +gethostbyname (); ; 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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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 + (exit $ac_status); }; }; then ac_cv_lib_nsl_gethostbyname=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_nsl_gethostbyname=no +ac_cv_lib_nsl_gethostbyname=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 if test $ac_cv_lib_nsl_gethostbyname = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi if test $ac_cv_lib_nsl_gethostbyname = no; then - { echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 -echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 +echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char gethostbyname (); int main () { -return gethostbyname (); +gethostbyname (); ; 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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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 + (exit $ac_status); }; }; then ac_cv_lib_bsd_gethostbyname=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_bsd_gethostbyname=no +ac_cv_lib_bsd_gethostbyname=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 if test $ac_cv_lib_bsd_gethostbyname = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" fi @@ -19621,150 +18131,134 @@ fi # variants that don't use the name server (or something). -lsocket # must be given before -lnsl if both are needed. We assume that # if connect needs -lnsl, so does gethostbyname. - { echo "$as_me:$LINENO: checking for connect" >&5 -echo $ECHO_N "checking for connect... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for connect" >&5 +echo $ECHO_N "checking for connect... $ECHO_C" >&6 if test "${ac_cv_func_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define connect to an innocuous variant, in case declares connect. - For example, HP-UX 11i declares gettimeofday. */ -#define connect innocuous_connect - /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ - #ifdef __STDC__ # include #else # include #endif - -#undef connect - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char connect (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined __stub_connect || defined __stub___connect +#if defined (__stub_connect) || defined (__stub___connect) choke me +#else +char (*f) () = connect; +#endif +#ifdef __cplusplus +} #endif int main () { -return connect (); +return f != connect; ; 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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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 + (exit $ac_status); }; }; then ac_cv_func_connect=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_func_connect=no +ac_cv_func_connect=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 -echo "${ECHO_T}$ac_cv_func_connect" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 +echo "${ECHO_T}$ac_cv_func_connect" >&6 if test $ac_cv_func_connect = no; then - { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 -echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 +echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 if test "${ac_cv_lib_socket_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char connect (); int main () { -return connect (); +connect (); ; 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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 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 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_socket_connect=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_socket_connect=no +ac_cv_lib_socket_connect=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 -echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 +echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 if test $ac_cv_lib_socket_connect = yes; then X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" fi @@ -19772,150 +18266,134 @@ fi fi # Guillermo Gomez says -lposix is necessary on A/UX. - { echo "$as_me:$LINENO: checking for remove" >&5 -echo $ECHO_N "checking for remove... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for remove" >&5 +echo $ECHO_N "checking for remove... $ECHO_C" >&6 if test "${ac_cv_func_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define remove to an innocuous variant, in case declares remove. - For example, HP-UX 11i declares gettimeofday. */ -#define remove innocuous_remove - /* System header to define __stub macros and hopefully few prototypes, which can conflict with char remove (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ - #ifdef __STDC__ # include #else # include #endif - -#undef remove - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char remove (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined __stub_remove || defined __stub___remove +#if defined (__stub_remove) || defined (__stub___remove) choke me +#else +char (*f) () = remove; +#endif +#ifdef __cplusplus +} #endif int main () { -return remove (); +return f != remove; ; 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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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 + (exit $ac_status); }; }; then ac_cv_func_remove=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_func_remove=no +ac_cv_func_remove=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 -echo "${ECHO_T}$ac_cv_func_remove" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 +echo "${ECHO_T}$ac_cv_func_remove" >&6 if test $ac_cv_func_remove = no; then - { echo "$as_me:$LINENO: checking for remove in -lposix" >&5 -echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for remove in -lposix" >&5 +echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 if test "${ac_cv_lib_posix_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char remove (); int main () { -return remove (); +remove (); ; 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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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 + (exit $ac_status); }; }; then ac_cv_lib_posix_remove=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_posix_remove=no +ac_cv_lib_posix_remove=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 -echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 +echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 if test $ac_cv_lib_posix_remove = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" fi @@ -19923,150 +18401,134 @@ fi fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - { echo "$as_me:$LINENO: checking for shmat" >&5 -echo $ECHO_N "checking for shmat... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for shmat" >&5 +echo $ECHO_N "checking for shmat... $ECHO_C" >&6 if test "${ac_cv_func_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define shmat to an innocuous variant, in case declares shmat. - For example, HP-UX 11i declares gettimeofday. */ -#define shmat innocuous_shmat - /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shmat (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ - #ifdef __STDC__ # include #else # include #endif - -#undef shmat - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char shmat (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined __stub_shmat || defined __stub___shmat +#if defined (__stub_shmat) || defined (__stub___shmat) choke me +#else +char (*f) () = shmat; +#endif +#ifdef __cplusplus +} #endif int main () { -return shmat (); +return f != shmat; ; 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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 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 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_func_shmat=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_func_shmat=no +ac_cv_func_shmat=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 -echo "${ECHO_T}$ac_cv_func_shmat" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 +echo "${ECHO_T}$ac_cv_func_shmat" >&6 if test $ac_cv_func_shmat = no; then - { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 -echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 +echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 if test "${ac_cv_lib_ipc_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char shmat (); int main () { -return shmat (); +shmat (); ; 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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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 + (exit $ac_status); }; }; then ac_cv_lib_ipc_shmat=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_ipc_shmat=no +ac_cv_lib_ipc_shmat=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 -echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 +echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 if test $ac_cv_lib_ipc_shmat = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" fi @@ -20083,67 +18545,60 @@ fi # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. # John Interrante, Karl Berry - { echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 -echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 +echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char IceConnectionNumber (); int main () { -return IceConnectionNumber (); +IceConnectionNumber (); ; 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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 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 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_ICE_IceConnectionNumber=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_ICE_IceConnectionNumber=no +ac_cv_lib_ICE_IceConnectionNumber=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 -echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" fi @@ -20172,67 +18627,60 @@ echo "$as_me: error: No X includes found" >&2;} fi CFLAGS=$X_CFLAGS LDFLAGS="$X_LDFLAGS $X_LIBS" - { echo "$as_me:$LINENO: checking for XOpenDisplay in -lX11" >&5 -echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for XOpenDisplay in -lX11" >&5 +echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char XOpenDisplay (); int main () { -return XOpenDisplay (); +XOpenDisplay (); ; 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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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 + (exit $ac_status); }; }; then ac_cv_lib_X11_XOpenDisplay=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_X11_XOpenDisplay=no +ac_cv_lib_X11_XOpenDisplay=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XOpenDisplay" >&5 -echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6 if test $ac_cv_lib_X11_XOpenDisplay = yes; then x_libs="-lX11 $X_EXTRA_LIBS" else @@ -20241,67 +18689,60 @@ echo "$as_me: error: X Development libraries not found" >&2;} { (exit 1); exit 1; }; } fi - { echo "$as_me:$LINENO: checking for XauDisposeAuth in -lXau" >&5 -echo $ECHO_N "checking for XauDisposeAuth in -lXau... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for XauDisposeAuth in -lXau" >&5 +echo $ECHO_N "checking for XauDisposeAuth in -lXau... $ECHO_C" >&6 if test "${ac_cv_lib_Xau_XauDisposeAuth+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lXau $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char XauDisposeAuth (); int main () { -return XauDisposeAuth (); +XauDisposeAuth (); ; 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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 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 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_Xau_XauDisposeAuth=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_Xau_XauDisposeAuth=no +ac_cv_lib_Xau_XauDisposeAuth=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xau_XauDisposeAuth" >&5 -echo "${ECHO_T}$ac_cv_lib_Xau_XauDisposeAuth" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_lib_Xau_XauDisposeAuth" >&5 +echo "${ECHO_T}$ac_cv_lib_Xau_XauDisposeAuth" >&6 if test $ac_cv_lib_Xau_XauDisposeAuth = yes; then XAU_LIBS="-lXau" fi @@ -20334,22 +18775,23 @@ fi if test "$_os" != "WINNT" -a "$_os" != "OS2" -a "$_os" != "Darwin"; then - { echo "$as_me:$LINENO: checking whether to use Xaw" >&5 -echo $ECHO_N "checking whether to use Xaw... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking whether to use Xaw" >&5 +echo $ECHO_N "checking whether to use Xaw... $ECHO_C" >&6 if test "$enable_Xaw" = "no"; then DISABLE_XAW=TRUE - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 for ac_header in X11/Composite.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -20360,35 +18802,28 @@ cat >>conftest.$ac_ext <<_ACEOF #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 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_objext; then + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_Header=no" +eval "$as_ac_Header=no" fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 @@ -20403,26 +18838,26 @@ fi done else - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 for ac_header in X11/Xaw/Label.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -20432,38 +18867,33 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 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_objext; then + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no +ac_header_compiler=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 # Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -20471,22 +18901,23 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -20494,46 +18925,52 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi - rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) +case $ac_header_compiler:$ac_header_preproc in + yes:no ) { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; - no:yes:* ) + no:yes ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - eval "$as_ac_Header=\$ac_header_preproc" + eval "$as_ac_Header=$ac_header_preproc" fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -20550,14 +18987,15 @@ fi done -{ echo "$as_me:$LINENO: checking for main in -lXaw" >&5 -echo $ECHO_N "checking for main in -lXaw... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for main in -lXaw" >&5 +echo $ECHO_N "checking for main in -lXaw... $ECHO_C" >&6 if test "${ac_cv_lib_Xaw_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lXaw $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -20568,43 +19006,35 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -return main (); +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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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 + (exit $ac_status); }; }; then ac_cv_lib_Xaw_main=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_Xaw_main=no +ac_cv_lib_Xaw_main=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xaw_main" >&5 -echo "${ECHO_T}$ac_cv_lib_Xaw_main" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_lib_Xaw_main" >&5 +echo "${ECHO_T}$ac_cv_lib_Xaw_main" >&6 if test $ac_cv_lib_Xaw_main = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBXAW 1 @@ -20626,18 +19056,19 @@ fi if test "$ENABLE_FONTCONFIG" = "TRUE" ; then if test "${ac_cv_header_fontconfig_fontconfig_h+set}" = set; then - { echo "$as_me:$LINENO: checking for fontconfig/fontconfig.h" >&5 -echo $ECHO_N "checking for fontconfig/fontconfig.h... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for fontconfig/fontconfig.h" >&5 +echo $ECHO_N "checking for fontconfig/fontconfig.h... $ECHO_C" >&6 if test "${ac_cv_header_fontconfig_fontconfig_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_fontconfig_fontconfig_h" >&5 -echo "${ECHO_T}$ac_cv_header_fontconfig_fontconfig_h" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_fontconfig_fontconfig_h" >&5 +echo "${ECHO_T}$ac_cv_header_fontconfig_fontconfig_h" >&6 else # Is the header compilable? -{ echo "$as_me:$LINENO: checking fontconfig/fontconfig.h usability" >&5 -echo $ECHO_N "checking fontconfig/fontconfig.h usability... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking fontconfig/fontconfig.h usability" >&5 +echo $ECHO_N "checking fontconfig/fontconfig.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -20647,38 +19078,33 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_objext; then + (exit $ac_status); }; }; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no +ac_header_compiler=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 # Is the header present? -{ echo "$as_me:$LINENO: checking fontconfig/fontconfig.h presence" >&5 -echo $ECHO_N "checking fontconfig/fontconfig.h presence... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking fontconfig/fontconfig.h presence" >&5 +echo $ECHO_N "checking fontconfig/fontconfig.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -20686,22 +19112,23 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -20709,45 +19136,52 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi - rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) +case $ac_header_compiler:$ac_header_preproc in + yes:no ) { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: fontconfig/fontconfig.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: fontconfig/fontconfig.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes + { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: fontconfig/fontconfig.h: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; - no:yes:* ) + no:yes ) { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: fontconfig/fontconfig.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: fontconfig/fontconfig.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: fontconfig/fontconfig.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: fontconfig/fontconfig.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: fontconfig/fontconfig.h: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: fontconfig/fontconfig.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: fontconfig/fontconfig.h: in the future, the compiler will take precedence" >&2;} - + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for fontconfig/fontconfig.h" >&5 -echo $ECHO_N "checking for fontconfig/fontconfig.h... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for fontconfig/fontconfig.h" >&5 +echo $ECHO_N "checking for fontconfig/fontconfig.h... $ECHO_C" >&6 if test "${ac_cv_header_fontconfig_fontconfig_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_fontconfig_fontconfig_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_fontconfig_fontconfig_h" >&5 -echo "${ECHO_T}$ac_cv_header_fontconfig_fontconfig_h" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_fontconfig_fontconfig_h" >&5 +echo "${ECHO_T}$ac_cv_header_fontconfig_fontconfig_h" >&6 fi if test $ac_cv_header_fontconfig_fontconfig_h = yes; then @@ -20759,8 +19193,8 @@ echo "$as_me: error: fontconfig/fontconfig.h could not be found. libfontconfig1- fi - { echo "$as_me:$LINENO: checking whether fontconfig is >= 2.2.0" >&5 -echo $ECHO_N "checking whether fontconfig is >= 2.2.0... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking whether fontconfig is >= 2.2.0" >&5 +echo $ECHO_N "checking whether fontconfig is >= 2.2.0... $ECHO_C" >&6 if test "$cross_compiling" = yes; then { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling See \`config.log' for more details." >&5 @@ -20769,6 +19203,7 @@ See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -20784,27 +19219,18 @@ int main(int argc, char **argv) { _ACEOF rm -f 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>&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (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_try") 2>&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 @@ -20815,44 +19241,43 @@ sed 's/^/| /' conftest.$ac_ext >&5 echo "$as_me: error: no, fontconfig >= 2.2.0 needed" >&2;} { (exit 1); exit 1; }; } fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - - fi -{ echo "$as_me:$LINENO: checking whether to link to Xrender" >&5 -echo $ECHO_N "checking whether to link to Xrender... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to link to Xrender" >&5 +echo $ECHO_N "checking whether to link to Xrender... $ECHO_C" >&6 if test -n "$enable_xrender_link" -a "$enable_xrender_link" != "no"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 XRENDER_LINK=YES with_system_xrender_headers=yes else - { echo "$as_me:$LINENO: result: no, dynamically open it" >&5 -echo "${ECHO_T}no, dynamically open it" >&6; } + echo "$as_me:$LINENO: result: no, dynamically open it" >&5 +echo "${ECHO_T}no, dynamically open it" >&6 XRENDER_LINK=NO fi -{ echo "$as_me:$LINENO: checking which Xrender headers to use" >&5 -echo $ECHO_N "checking which Xrender headers to use... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking which Xrender headers to use" >&5 +echo $ECHO_N "checking which Xrender headers to use... $ECHO_C" >&6 if test -n "$with_system_xrender_headers" -o -n "$with_system_headers" && \ test "$with_system_xrender_headers" != "no"; then - { echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_XRENDER_HEADERS=YES if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then - { echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5 -echo $ECHO_N "checking for X11/extensions/Xrender.h... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5 +echo $ECHO_N "checking for X11/extensions/Xrender.h... $ECHO_C" >&6 if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrender_h" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrender_h" >&6 else # Is the header compilable? -{ echo "$as_me:$LINENO: checking X11/extensions/Xrender.h usability" >&5 -echo $ECHO_N "checking X11/extensions/Xrender.h usability... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking X11/extensions/Xrender.h usability" >&5 +echo $ECHO_N "checking X11/extensions/Xrender.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -20862,38 +19287,33 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_objext; then + (exit $ac_status); }; }; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no +ac_header_compiler=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 # Is the header present? -{ echo "$as_me:$LINENO: checking X11/extensions/Xrender.h presence" >&5 -echo $ECHO_N "checking X11/extensions/Xrender.h presence... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking X11/extensions/Xrender.h presence" >&5 +echo $ECHO_N "checking X11/extensions/Xrender.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -20901,22 +19321,23 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -20924,45 +19345,52 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi - rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) +case $ac_header_compiler:$ac_header_preproc in + yes:no ) { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: X11/extensions/Xrender.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: X11/extensions/Xrender.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: X11/extensions/Xrender.h: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; - no:yes:* ) + no:yes ) { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: X11/extensions/Xrender.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: X11/extensions/Xrender.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: X11/extensions/Xrender.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: X11/extensions/Xrender.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: X11/extensions/Xrender.h: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: X11/extensions/Xrender.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: X11/extensions/Xrender.h: in the future, the compiler will take precedence" >&2;} - + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5 -echo $ECHO_N "checking for X11/extensions/Xrender.h... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5 +echo $ECHO_N "checking for X11/extensions/Xrender.h... $ECHO_C" >&6 if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_X11_extensions_Xrender_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrender_h" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrender_h" >&6 fi if test $ac_cv_header_X11_extensions_Xrender_h = yes; then @@ -20975,74 +19403,67 @@ fi else - { echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_XRENDER_HEADERS=NO BUILD_TYPE="$BUILD_TYPE X11_EXTENSIONS" fi if test "$XRENDER_LINK" = "YES"; then -{ echo "$as_me:$LINENO: checking for XRenderQueryVersion in -lXrender" >&5 -echo $ECHO_N "checking for XRenderQueryVersion in -lXrender... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for XRenderQueryVersion in -lXrender" >&5 +echo $ECHO_N "checking for XRenderQueryVersion in -lXrender... $ECHO_C" >&6 if test "${ac_cv_lib_Xrender_XRenderQueryVersion+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lXrender $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char XRenderQueryVersion (); int main () { -return XRenderQueryVersion (); +XRenderQueryVersion (); ; 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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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 + (exit $ac_status); }; }; then ac_cv_lib_Xrender_XRenderQueryVersion=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_Xrender_XRenderQueryVersion=no +ac_cv_lib_Xrender_XRenderQueryVersion=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xrender_XRenderQueryVersion" >&5 -echo "${ECHO_T}$ac_cv_lib_Xrender_XRenderQueryVersion" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_lib_Xrender_XRenderQueryVersion" >&5 +echo "${ECHO_T}$ac_cv_lib_Xrender_XRenderQueryVersion" >&6 if test $ac_cv_lib_Xrender_XRenderQueryVersion = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBXRENDER 1 @@ -21060,13 +19481,13 @@ fi -{ echo "$as_me:$LINENO: checking whether to enable RandR support" >&5 -echo $ECHO_N "checking whether to enable RandR support... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to enable RandR support" >&5 +echo $ECHO_N "checking whether to enable RandR support... $ECHO_C" >&6 if test "$test_randr" = "yes" -a \( "$enable_randr" = "yes" -o "$enable_randr" = "TRUE" \) ; then if test -z "$enable_randr_link" -o "$enable_randr_link" = "no"; then XRANDR_DLOPEN="TRUE" - { echo "$as_me:$LINENO: result: resorting to dlopen libXrandr at runtime" >&5 -echo "${ECHO_T}resorting to dlopen libXrandr at runtime" >&6; } + echo "$as_me:$LINENO: result: resorting to dlopen libXrandr at runtime" >&5 +echo "${ECHO_T}resorting to dlopen libXrandr at runtime" >&6 else XRANDR_DLOPEN="FALSE" @@ -21075,8 +19496,8 @@ echo "${ECHO_T}resorting to dlopen libXrandr at runtime" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -21091,29 +19512,28 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -21124,25 +19544,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { echo "$as_me:$LINENO: checking for xrandr >= 1.2" >&5 -echo $ECHO_N "checking for xrandr >= 1.2... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for xrandr >= 1.2" >&5 +echo $ECHO_N "checking for xrandr >= 1.2... $ECHO_C" >&6 if $PKG_CONFIG --exists "xrandr >= 1.2" ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { echo "$as_me:$LINENO: checking XRANDR_CFLAGS" >&5 -echo $ECHO_N "checking XRANDR_CFLAGS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking XRANDR_CFLAGS" >&5 +echo $ECHO_N "checking XRANDR_CFLAGS... $ECHO_C" >&6 XRANDR_CFLAGS=`$PKG_CONFIG --cflags "xrandr >= 1.2"` - { echo "$as_me:$LINENO: result: $XRANDR_CFLAGS" >&5 -echo "${ECHO_T}$XRANDR_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $XRANDR_CFLAGS" >&5 +echo "${ECHO_T}$XRANDR_CFLAGS" >&6 - { echo "$as_me:$LINENO: checking XRANDR_LIBS" >&5 -echo $ECHO_N "checking XRANDR_LIBS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking XRANDR_LIBS" >&5 +echo $ECHO_N "checking XRANDR_LIBS... $ECHO_C" >&6 XRANDR_LIBS=`$PKG_CONFIG --libs "xrandr >= 1.2"` - { echo "$as_me:$LINENO: result: $XRANDR_LIBS" >&5 -echo "${ECHO_T}$XRANDR_LIBS" >&6; } + echo "$as_me:$LINENO: result: $XRANDR_LIBS" >&5 +echo "${ECHO_T}$XRANDR_LIBS" >&6 else XRANDR_CFLAGS="" XRANDR_LIBS="" @@ -21168,18 +19588,19 @@ echo "${ECHO_T}$XRANDR_LIBS" >&6; } if test "$ENABLE_RANDR" != "TRUE"; then if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then - { echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5 -echo $ECHO_N "checking for X11/extensions/Xrandr.h... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5 +echo $ECHO_N "checking for X11/extensions/Xrandr.h... $ECHO_C" >&6 if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrandr_h" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrandr_h" >&6 else # Is the header compilable? -{ echo "$as_me:$LINENO: checking X11/extensions/Xrandr.h usability" >&5 -echo $ECHO_N "checking X11/extensions/Xrandr.h usability... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking X11/extensions/Xrandr.h usability" >&5 +echo $ECHO_N "checking X11/extensions/Xrandr.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21189,38 +19610,33 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_objext; then + (exit $ac_status); }; }; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no +ac_header_compiler=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 # Is the header present? -{ echo "$as_me:$LINENO: checking X11/extensions/Xrandr.h presence" >&5 -echo $ECHO_N "checking X11/extensions/Xrandr.h presence... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking X11/extensions/Xrandr.h presence" >&5 +echo $ECHO_N "checking X11/extensions/Xrandr.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21228,22 +19644,23 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -21251,45 +19668,52 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi - rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) +case $ac_header_compiler:$ac_header_preproc in + yes:no ) { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: X11/extensions/Xrandr.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: X11/extensions/Xrandr.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: X11/extensions/Xrandr.h: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; - no:yes:* ) + no:yes ) { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: X11/extensions/Xrandr.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: X11/extensions/Xrandr.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: X11/extensions/Xrandr.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: X11/extensions/Xrandr.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: X11/extensions/Xrandr.h: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: X11/extensions/Xrandr.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: X11/extensions/Xrandr.h: in the future, the compiler will take precedence" >&2;} - + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5 -echo $ECHO_N "checking for X11/extensions/Xrandr.h... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5 +echo $ECHO_N "checking for X11/extensions/Xrandr.h... $ECHO_C" >&6 if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_X11_extensions_Xrandr_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrandr_h" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrandr_h" >&6 fi if test $ac_cv_header_X11_extensions_Xrandr_h = yes; then @@ -21303,67 +19727,60 @@ fi XRANDR_CFLAGS=" " -{ echo "$as_me:$LINENO: checking for XRRQueryExtension in -lXrandr" >&5 -echo $ECHO_N "checking for XRRQueryExtension in -lXrandr... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for XRRQueryExtension in -lXrandr" >&5 +echo $ECHO_N "checking for XRRQueryExtension in -lXrandr... $ECHO_C" >&6 if test "${ac_cv_lib_Xrandr_XRRQueryExtension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lXrandr $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char XRRQueryExtension (); int main () { -return XRRQueryExtension (); +XRRQueryExtension (); ; 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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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 + (exit $ac_status); }; }; then ac_cv_lib_Xrandr_XRRQueryExtension=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_Xrandr_XRRQueryExtension=no +ac_cv_lib_Xrandr_XRRQueryExtension=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRQueryExtension" >&5 -echo "${ECHO_T}$ac_cv_lib_Xrandr_XRRQueryExtension" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRQueryExtension" >&5 +echo "${ECHO_T}$ac_cv_lib_Xrandr_XRRQueryExtension" >&6 if test $ac_cv_lib_Xrandr_XRRQueryExtension = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBXRANDR 1 @@ -21379,44 +19796,44 @@ fi XRANDR_LIBS="-lXrandr " ENABLE_RANDR="TRUE" - { echo "$as_me:$LINENO: result: enabling RandR support" >&5 -echo "${ECHO_T}enabling RandR support" >&6; } + echo "$as_me:$LINENO: result: enabling RandR support" >&5 +echo "${ECHO_T}enabling RandR support" >&6 fi fi else ENABLE_RANDR="" - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -{ echo "$as_me:$LINENO: checking whether to use neon" >&5 -echo $ECHO_N "checking whether to use neon... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to use neon" >&5 +echo $ECHO_N "checking whether to use neon... $ECHO_C" >&6 if test "$enable_neon" = "no"; then - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 DISABLE_NEON=TRUE else - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -{ echo "$as_me:$LINENO: checking which neon to use" >&5 -echo $ECHO_N "checking which neon to use... $ECHO_C" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +echo "$as_me:$LINENO: checking which neon to use" >&5 +echo $ECHO_N "checking which neon to use... $ECHO_C" >&6 if test -n "$with_system_neon" -o -n "$with_system_libs" && \ test "$with_system_neon" != "no"; then - { echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 succeeded=no if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -21431,29 +19848,28 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -21464,25 +19880,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { echo "$as_me:$LINENO: checking for neon >= 0.24.0" >&5 -echo $ECHO_N "checking for neon >= 0.24.0... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for neon >= 0.24.0" >&5 +echo $ECHO_N "checking for neon >= 0.24.0... $ECHO_C" >&6 if $PKG_CONFIG --exists "neon >= 0.24.0" ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { echo "$as_me:$LINENO: checking NEON_CFLAGS" >&5 -echo $ECHO_N "checking NEON_CFLAGS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking NEON_CFLAGS" >&5 +echo $ECHO_N "checking NEON_CFLAGS... $ECHO_C" >&6 NEON_CFLAGS=`$PKG_CONFIG --cflags "neon >= 0.24.0"` - { echo "$as_me:$LINENO: result: $NEON_CFLAGS" >&5 -echo "${ECHO_T}$NEON_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $NEON_CFLAGS" >&5 +echo "${ECHO_T}$NEON_CFLAGS" >&6 - { echo "$as_me:$LINENO: checking NEON_LIBS" >&5 -echo $ECHO_N "checking NEON_LIBS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking NEON_LIBS" >&5 +echo $ECHO_N "checking NEON_LIBS... $ECHO_C" >&6 NEON_LIBS=`$PKG_CONFIG --libs "neon >= 0.24.0"` - { echo "$as_me:$LINENO: result: $NEON_LIBS" >&5 -echo "${ECHO_T}$NEON_LIBS" >&6; } + echo "$as_me:$LINENO: result: $NEON_LIBS" >&5 +echo "${ECHO_T}$NEON_LIBS" >&6 else NEON_CFLAGS="" NEON_LIBS="" @@ -21512,8 +19928,8 @@ echo "$as_me: error: you need neon >= 0.24.x for system-neon" >&2;} NEON_CFLAGS="$NEON_CFLAGS -DSYSTEM_NEON -DUSE_DAV_LOCKS=1" SYSTEM_NEON=YES else - { echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_NEON=NO NEON_LIBS=-lneon NEON_CFLAGS= @@ -21522,12 +19938,12 @@ fi if test "$_os" = "Darwin" && test "$with_system_openssl" != "no"; then with_system_openssl=yes fi -{ echo "$as_me:$LINENO: checking which libssl to use" >&5 -echo $ECHO_N "checking which libssl to use... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking which libssl to use" >&5 +echo $ECHO_N "checking which libssl to use... $ECHO_C" >&6 if test -n "$with_system_openssl" -o -n "$with_system_libs" && \ test "$with_system_openssl" != "no"; then - { echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 # Mac OS builds should get out without extra stuff is the Mac porters' # wish. And pkg-config is although Xcode ships a .pc for openssl if test "$_os" = "Darwin"; then @@ -21540,8 +19956,8 @@ echo "${ECHO_T}external" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -21556,29 +19972,28 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -21589,25 +20004,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { echo "$as_me:$LINENO: checking for openssl " >&5 -echo $ECHO_N "checking for openssl ... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for openssl " >&5 +echo $ECHO_N "checking for openssl ... $ECHO_C" >&6 if $PKG_CONFIG --exists "openssl " ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { echo "$as_me:$LINENO: checking OPENSSL_CFLAGS" >&5 -echo $ECHO_N "checking OPENSSL_CFLAGS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking OPENSSL_CFLAGS" >&5 +echo $ECHO_N "checking OPENSSL_CFLAGS... $ECHO_C" >&6 OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl "` - { echo "$as_me:$LINENO: result: $OPENSSL_CFLAGS" >&5 -echo "${ECHO_T}$OPENSSL_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $OPENSSL_CFLAGS" >&5 +echo "${ECHO_T}$OPENSSL_CFLAGS" >&6 - { echo "$as_me:$LINENO: checking OPENSSL_LIBS" >&5 -echo $ECHO_N "checking OPENSSL_LIBS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking OPENSSL_LIBS" >&5 +echo $ECHO_N "checking OPENSSL_LIBS... $ECHO_C" >&6 OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl "` - { echo "$as_me:$LINENO: result: $OPENSSL_LIBS" >&5 -echo "${ECHO_T}$OPENSSL_LIBS" >&6; } + echo "$as_me:$LINENO: result: $OPENSSL_LIBS" >&5 +echo "${ECHO_T}$OPENSSL_LIBS" >&6 else OPENSSL_CFLAGS="" OPENSSL_LIBS="" @@ -21636,8 +20051,8 @@ echo "$as_me: error: Library requirements (openssl ) not met; consider adjusting fi SYSTEM_OPENSSL=YES else - { echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_OPENSSL=NO BUILD_TYPE="$BUILD_TYPE OPENSSL" fi @@ -21651,31 +20066,31 @@ fi fi -{ echo "$as_me:$LINENO: checking whether to enable agg" >&5 -echo $ECHO_N "checking whether to enable agg... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to enable agg" >&5 +echo $ECHO_N "checking whether to enable agg... $ECHO_C" >&6 if test "$with_agg" = "no"; then - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 else - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 ENABLE_AGG=YES - { echo "$as_me:$LINENO: checking which AGG to use" >&5 -echo $ECHO_N "checking which AGG to use... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking which AGG to use" >&5 +echo $ECHO_N "checking which AGG to use... $ECHO_C" >&6 if test -n "$with_system_agg" -o -n "$with_system_libs" && \ test "$with_system_agg" != "no"; then - { echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 succeeded=no if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -21690,29 +20105,28 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -21723,25 +20137,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { echo "$as_me:$LINENO: checking for libagg >= 2.3" >&5 -echo $ECHO_N "checking for libagg >= 2.3... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for libagg >= 2.3" >&5 +echo $ECHO_N "checking for libagg >= 2.3... $ECHO_C" >&6 if $PKG_CONFIG --exists "libagg >= 2.3" ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { echo "$as_me:$LINENO: checking AGG_CFLAGS" >&5 -echo $ECHO_N "checking AGG_CFLAGS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking AGG_CFLAGS" >&5 +echo $ECHO_N "checking AGG_CFLAGS... $ECHO_C" >&6 AGG_CFLAGS=`$PKG_CONFIG --cflags "libagg >= 2.3"` - { echo "$as_me:$LINENO: result: $AGG_CFLAGS" >&5 -echo "${ECHO_T}$AGG_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $AGG_CFLAGS" >&5 +echo "${ECHO_T}$AGG_CFLAGS" >&6 - { echo "$as_me:$LINENO: checking AGG_LIBS" >&5 -echo $ECHO_N "checking AGG_LIBS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking AGG_LIBS" >&5 +echo $ECHO_N "checking AGG_LIBS... $ECHO_C" >&6 AGG_LIBS=`$PKG_CONFIG --libs "libagg >= 2.3"` - { echo "$as_me:$LINENO: result: $AGG_LIBS" >&5 -echo "${ECHO_T}$AGG_LIBS" >&6; } + echo "$as_me:$LINENO: result: $AGG_LIBS" >&5 +echo "${ECHO_T}$AGG_LIBS" >&6 else AGG_CFLAGS="" AGG_LIBS="" @@ -21767,8 +20181,8 @@ echo "$as_me: error: Library requirements (libagg >= 2.3) not met; consider adju { (exit 1); exit 1; }; } fi - { echo "$as_me:$LINENO: checking agg version" >&5 -echo $ECHO_N "checking agg version... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking agg version" >&5 +echo $ECHO_N "checking agg version... $ECHO_C" >&6 # workaround; if AGG_CFLAGS is empty (broken libagg.pc in 2.3), add /usr/include/agg2 anyway # (/usr/include gets stripped from pkg-config output) if test -z "$AGG_CFLAGS" || test "$AGG_CFLAGS" = " "; then @@ -21780,12 +20194,12 @@ echo $ECHO_N "checking agg version... $ECHO_C" >&6; } $PKG_CONFIG --modversion libagg | grep -q 2.4; then # 2.4's libagg.pc.in still contains 2.3 :/ if $EGREP -q "Version 2.4" `echo $AGG_INCDIR`/agg_basics.h; then - { echo "$as_me:$LINENO: result: 2.4" >&5 -echo "${ECHO_T}2.4" >&6; } + echo "$as_me:$LINENO: result: 2.4" >&5 +echo "${ECHO_T}2.4" >&6 AGG_VERSION=2400 else - { echo "$as_me:$LINENO: result: 2.3" >&5 -echo "${ECHO_T}2.3" >&6; } + echo "$as_me:$LINENO: result: 2.3" >&5 +echo "${ECHO_T}2.3" >&6 AGG_VERSION=2300 fi SYSTEM_AGG=YES @@ -21795,8 +20209,8 @@ echo "$as_me: error: only agg 2.3 and 2.4 are supported" >&2;} { (exit 1); exit 1; }; } fi else - { echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_AGG=NO AGG_VERSION=2300 BUILD_TYPE="$BUILD_TYPE AGG" @@ -21805,12 +20219,12 @@ echo "${ECHO_T}internal" >&6; } fi -{ echo "$as_me:$LINENO: checking which redland library to use" >&5 -echo $ECHO_N "checking which redland library to use... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking which redland library to use" >&5 +echo $ECHO_N "checking which redland library to use... $ECHO_C" >&6 if test -n "$with_system_redland" && \ test "$with_system_redland" != "no"; then - { echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_REDLAND=YES succeeded=no @@ -21818,8 +20232,8 @@ echo "${ECHO_T}external" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -21834,29 +20248,28 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -21867,25 +20280,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { echo "$as_me:$LINENO: checking for redland" >&5 -echo $ECHO_N "checking for redland... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for redland" >&5 +echo $ECHO_N "checking for redland... $ECHO_C" >&6 if $PKG_CONFIG --exists "redland" ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { echo "$as_me:$LINENO: checking REDLAND_CFLAGS" >&5 -echo $ECHO_N "checking REDLAND_CFLAGS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking REDLAND_CFLAGS" >&5 +echo $ECHO_N "checking REDLAND_CFLAGS... $ECHO_C" >&6 REDLAND_CFLAGS=`$PKG_CONFIG --cflags "redland"` - { echo "$as_me:$LINENO: result: $REDLAND_CFLAGS" >&5 -echo "${ECHO_T}$REDLAND_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $REDLAND_CFLAGS" >&5 +echo "${ECHO_T}$REDLAND_CFLAGS" >&6 - { echo "$as_me:$LINENO: checking REDLAND_LIBS" >&5 -echo $ECHO_N "checking REDLAND_LIBS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking REDLAND_LIBS" >&5 +echo $ECHO_N "checking REDLAND_LIBS... $ECHO_C" >&6 REDLAND_LIBS=`$PKG_CONFIG --libs "redland"` - { echo "$as_me:$LINENO: result: $REDLAND_LIBS" >&5 -echo "${ECHO_T}$REDLAND_LIBS" >&6; } + echo "$as_me:$LINENO: result: $REDLAND_LIBS" >&5 +echo "${ECHO_T}$REDLAND_LIBS" >&6 else REDLAND_CFLAGS="" REDLAND_LIBS="" @@ -21912,22 +20325,22 @@ echo "$as_me: error: Library requirements (redland) not met; consider adjusting fi else - { echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 BUILD_TYPE="$BUILD_TYPE REDLAND" SYSTEM_REDLAND=NO fi -{ echo "$as_me:$LINENO: checking which libhunspell to use" >&5 -echo $ECHO_N "checking which libhunspell to use... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking which libhunspell to use" >&5 +echo $ECHO_N "checking which libhunspell to use... $ECHO_C" >&6 if test -n "$with_system_hunspell" -o -n "$with_system_libs" && \ test "$with_system_hunspell" != "no"; then - { echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_HUNSPELL=YES - ac_ext=cpp + ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -21939,8 +20352,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -21955,29 +20368,28 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -21988,25 +20400,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { echo "$as_me:$LINENO: checking for hunspell" >&5 -echo $ECHO_N "checking for hunspell... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for hunspell" >&5 +echo $ECHO_N "checking for hunspell... $ECHO_C" >&6 if $PKG_CONFIG --exists "hunspell" ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { echo "$as_me:$LINENO: checking HUNSPELL_CFLAGS" >&5 -echo $ECHO_N "checking HUNSPELL_CFLAGS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking HUNSPELL_CFLAGS" >&5 +echo $ECHO_N "checking HUNSPELL_CFLAGS... $ECHO_C" >&6 HUNSPELL_CFLAGS=`$PKG_CONFIG --cflags "hunspell"` - { echo "$as_me:$LINENO: result: $HUNSPELL_CFLAGS" >&5 -echo "${ECHO_T}$HUNSPELL_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $HUNSPELL_CFLAGS" >&5 +echo "${ECHO_T}$HUNSPELL_CFLAGS" >&6 - { echo "$as_me:$LINENO: checking HUNSPELL_LIBS" >&5 -echo $ECHO_N "checking HUNSPELL_LIBS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking HUNSPELL_LIBS" >&5 +echo $ECHO_N "checking HUNSPELL_LIBS... $ECHO_C" >&6 HUNSPELL_LIBS=`$PKG_CONFIG --libs "hunspell"` - { echo "$as_me:$LINENO: result: $HUNSPELL_LIBS" >&5 -echo "${ECHO_T}$HUNSPELL_LIBS" >&6; } + echo "$as_me:$LINENO: result: $HUNSPELL_LIBS" >&5 +echo "${ECHO_T}$HUNSPELL_LIBS" >&6 else HUNSPELL_CFLAGS="" HUNSPELL_LIBS="" @@ -22032,18 +20444,19 @@ echo "${ECHO_T}$HUNSPELL_LIBS" >&6; } if test "$HUNSPELL_PC" != "TRUE"; then if test "${ac_cv_header_hunspell_hxx+set}" = set; then - { echo "$as_me:$LINENO: checking for hunspell.hxx" >&5 -echo $ECHO_N "checking for hunspell.hxx... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for hunspell.hxx" >&5 +echo $ECHO_N "checking for hunspell.hxx... $ECHO_C" >&6 if test "${ac_cv_header_hunspell_hxx+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hxx" >&5 -echo "${ECHO_T}$ac_cv_header_hunspell_hxx" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hxx" >&5 +echo "${ECHO_T}$ac_cv_header_hunspell_hxx" >&6 else # Is the header compilable? -{ echo "$as_me:$LINENO: checking hunspell.hxx usability" >&5 -echo $ECHO_N "checking hunspell.hxx usability... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking hunspell.hxx usability" >&5 +echo $ECHO_N "checking hunspell.hxx usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22053,38 +20466,33 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 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_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no +ac_header_compiler=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 # Is the header present? -{ echo "$as_me:$LINENO: checking hunspell.hxx presence" >&5 -echo $ECHO_N "checking hunspell.hxx presence... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking hunspell.hxx presence" >&5 +echo $ECHO_N "checking hunspell.hxx presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22092,22 +20500,23 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -22115,45 +20524,52 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi - rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in - yes:no: ) +case $ac_header_compiler:$ac_header_preproc in + yes:no ) { echo "$as_me:$LINENO: WARNING: hunspell.hxx: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: hunspell.hxx: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: hunspell.hxx: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: hunspell.hxx: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes + { echo "$as_me:$LINENO: WARNING: hunspell.hxx: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: hunspell.hxx: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; - no:yes:* ) + no:yes ) { echo "$as_me:$LINENO: WARNING: hunspell.hxx: present but cannot be compiled" >&5 echo "$as_me: WARNING: hunspell.hxx: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: hunspell.hxx: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: hunspell.hxx: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: hunspell.hxx: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: hunspell.hxx: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: hunspell.hxx: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: hunspell.hxx: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: hunspell.hxx: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: hunspell.hxx: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: hunspell.hxx: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: hunspell.hxx: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: hunspell.hxx: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: hunspell.hxx: in the future, the compiler will take precedence" >&2;} - + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for hunspell.hxx" >&5 -echo $ECHO_N "checking for hunspell.hxx... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for hunspell.hxx" >&5 +echo $ECHO_N "checking for hunspell.hxx... $ECHO_C" >&6 if test "${ac_cv_header_hunspell_hxx+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_hunspell_hxx=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hxx" >&5 -echo "${ECHO_T}$ac_cv_header_hunspell_hxx" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hxx" >&5 +echo "${ECHO_T}$ac_cv_header_hunspell_hxx" >&6 fi if test $ac_cv_header_hunspell_hxx = yes; then @@ -22161,18 +20577,19 @@ if test $ac_cv_header_hunspell_hxx = yes; then else if test "${ac_cv_header_hunspell_hunspell_hxx+set}" = set; then - { echo "$as_me:$LINENO: checking for hunspell/hunspell.hxx" >&5 -echo $ECHO_N "checking for hunspell/hunspell.hxx... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for hunspell/hunspell.hxx" >&5 +echo $ECHO_N "checking for hunspell/hunspell.hxx... $ECHO_C" >&6 if test "${ac_cv_header_hunspell_hunspell_hxx+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hunspell_hxx" >&5 -echo "${ECHO_T}$ac_cv_header_hunspell_hunspell_hxx" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hunspell_hxx" >&5 +echo "${ECHO_T}$ac_cv_header_hunspell_hunspell_hxx" >&6 else # Is the header compilable? -{ echo "$as_me:$LINENO: checking hunspell/hunspell.hxx usability" >&5 -echo $ECHO_N "checking hunspell/hunspell.hxx usability... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking hunspell/hunspell.hxx usability" >&5 +echo $ECHO_N "checking hunspell/hunspell.hxx usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22182,38 +20599,33 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + (exit $ac_status); }; }; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no +ac_header_compiler=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 # Is the header present? -{ echo "$as_me:$LINENO: checking hunspell/hunspell.hxx presence" >&5 -echo $ECHO_N "checking hunspell/hunspell.hxx presence... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking hunspell/hunspell.hxx presence" >&5 +echo $ECHO_N "checking hunspell/hunspell.hxx presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22221,22 +20633,23 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -22244,45 +20657,52 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi - rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in - yes:no: ) +case $ac_header_compiler:$ac_header_preproc in + yes:no ) { echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: hunspell/hunspell.hxx: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: hunspell/hunspell.hxx: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes + { echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: hunspell/hunspell.hxx: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; - no:yes:* ) + no:yes ) { echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: present but cannot be compiled" >&5 echo "$as_me: WARNING: hunspell/hunspell.hxx: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: hunspell/hunspell.hxx: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: hunspell/hunspell.hxx: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: hunspell/hunspell.hxx: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: hunspell/hunspell.hxx: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: hunspell/hunspell.hxx: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: hunspell/hunspell.hxx: in the future, the compiler will take precedence" >&2;} - + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for hunspell/hunspell.hxx" >&5 -echo $ECHO_N "checking for hunspell/hunspell.hxx... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for hunspell/hunspell.hxx" >&5 +echo $ECHO_N "checking for hunspell/hunspell.hxx... $ECHO_C" >&6 if test "${ac_cv_header_hunspell_hunspell_hxx+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_hunspell_hunspell_hxx=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hunspell_hxx" >&5 -echo "${ECHO_T}$ac_cv_header_hunspell_hunspell_hxx" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hunspell_hxx" >&5 +echo "${ECHO_T}$ac_cv_header_hunspell_hunspell_hxx" >&6 fi if test $ac_cv_header_hunspell_hunspell_hxx = yes; then @@ -22299,14 +20719,15 @@ fi -{ echo "$as_me:$LINENO: checking for main in -lhunspell" >&5 -echo $ECHO_N "checking for main in -lhunspell... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for main in -lhunspell" >&5 +echo $ECHO_N "checking for main in -lhunspell... $ECHO_C" >&6 if test "${ac_cv_lib_hunspell_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lhunspell $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22317,43 +20738,35 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -return main (); +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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + (exit $ac_status); }; }; then ac_cv_lib_hunspell_main=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_hunspell_main=no +ac_cv_lib_hunspell_main=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_hunspell_main" >&5 -echo "${ECHO_T}$ac_cv_lib_hunspell_main" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_lib_hunspell_main" >&5 +echo "${ECHO_T}$ac_cv_lib_hunspell_main" >&6 if test $ac_cv_lib_hunspell_main = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBHUNSPELL 1 @@ -22376,8 +20789,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu else - { echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_HUNSPELL=NO BUILD_TYPE="$BUILD_TYPE HUNSPELL" fi @@ -22385,26 +20798,27 @@ fi -{ echo "$as_me:$LINENO: checking which altlinuxhyph to use" >&5 -echo $ECHO_N "checking which altlinuxhyph to use... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking which altlinuxhyph to use" >&5 +echo $ECHO_N "checking which altlinuxhyph to use... $ECHO_C" >&6 if test -n "$with_system_altlinuxhyph" -o -n "$with_system_libs" && \ test "$with_system_altlinuxhyph" != "no"; then - { echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_HYPH=YES if test "${ac_cv_header_hyphen_h+set}" = set; then - { echo "$as_me:$LINENO: checking for hyphen.h" >&5 -echo $ECHO_N "checking for hyphen.h... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for hyphen.h" >&5 +echo $ECHO_N "checking for hyphen.h... $ECHO_C" >&6 if test "${ac_cv_header_hyphen_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_hyphen_h" >&5 -echo "${ECHO_T}$ac_cv_header_hyphen_h" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_hyphen_h" >&5 +echo "${ECHO_T}$ac_cv_header_hyphen_h" >&6 else # Is the header compilable? -{ echo "$as_me:$LINENO: checking hyphen.h usability" >&5 -echo $ECHO_N "checking hyphen.h usability... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking hyphen.h usability" >&5 +echo $ECHO_N "checking hyphen.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22414,38 +20828,33 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_objext; then + (exit $ac_status); }; }; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no +ac_header_compiler=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 # Is the header present? -{ echo "$as_me:$LINENO: checking hyphen.h presence" >&5 -echo $ECHO_N "checking hyphen.h presence... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking hyphen.h presence" >&5 +echo $ECHO_N "checking hyphen.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22453,22 +20862,23 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -22476,45 +20886,52 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi - rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) +case $ac_header_compiler:$ac_header_preproc in + yes:no ) { echo "$as_me:$LINENO: WARNING: hyphen.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: hyphen.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: hyphen.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: hyphen.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes + { echo "$as_me:$LINENO: WARNING: hyphen.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: hyphen.h: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; - no:yes:* ) + no:yes ) { echo "$as_me:$LINENO: WARNING: hyphen.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: hyphen.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: hyphen.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: hyphen.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: hyphen.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: hyphen.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: hyphen.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: hyphen.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: hyphen.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: hyphen.h: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: hyphen.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: hyphen.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: hyphen.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: hyphen.h: in the future, the compiler will take precedence" >&2;} - + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for hyphen.h" >&5 -echo $ECHO_N "checking for hyphen.h... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for hyphen.h" >&5 +echo $ECHO_N "checking for hyphen.h... $ECHO_C" >&6 if test "${ac_cv_header_hyphen_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_hyphen_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_hyphen_h" >&5 -echo "${ECHO_T}$ac_cv_header_hyphen_h" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_hyphen_h" >&5 +echo "${ECHO_T}$ac_cv_header_hyphen_h" >&6 fi if test $ac_cv_header_hyphen_h = yes; then @@ -22526,12 +20943,13 @@ echo "$as_me: error: altlinuxhyph headers not found." >&2;} fi - { echo "$as_me:$LINENO: checking for struct _HyphenDict.cset" >&5 -echo $ECHO_N "checking for struct _HyphenDict.cset... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for struct _HyphenDict.cset" >&5 +echo $ECHO_N "checking for struct _HyphenDict.cset... $ECHO_C" >&6 if test "${ac_cv_member_struct__HyphenDict_cset+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22550,28 +20968,24 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_objext; then + (exit $ac_status); }; }; then ac_cv_member_struct__HyphenDict_cset=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22590,37 +21004,30 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 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_objext; then + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_member_struct__HyphenDict_cset=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_member_struct__HyphenDict_cset=no +ac_cv_member_struct__HyphenDict_cset=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_member_struct__HyphenDict_cset" >&5 -echo "${ECHO_T}$ac_cv_member_struct__HyphenDict_cset" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_member_struct__HyphenDict_cset" >&5 +echo "${ECHO_T}$ac_cv_member_struct__HyphenDict_cset" >&6 if test $ac_cv_member_struct__HyphenDict_cset = yes; then : else @@ -22629,67 +21036,60 @@ echo "$as_me: error: no. You are sure you have altlinuyhyph headers?" >&2;} { (exit 1); exit 1; }; } fi - { echo "$as_me:$LINENO: checking for hnj_hyphen_hyphenate2 in -lhyphen" >&5 -echo $ECHO_N "checking for hnj_hyphen_hyphenate2 in -lhyphen... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for hnj_hyphen_hyphenate2 in -lhyphen" >&5 +echo $ECHO_N "checking for hnj_hyphen_hyphenate2 in -lhyphen... $ECHO_C" >&6 if test "${ac_cv_lib_hyphen_hnj_hyphen_hyphenate2+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lhyphen $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char hnj_hyphen_hyphenate2 (); int main () { -return hnj_hyphen_hyphenate2 (); +hnj_hyphen_hyphenate2 (); ; 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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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 + (exit $ac_status); }; }; then ac_cv_lib_hyphen_hnj_hyphen_hyphenate2=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_hyphen_hnj_hyphen_hyphenate2=no +ac_cv_lib_hyphen_hnj_hyphen_hyphenate2=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" >&5 -echo "${ECHO_T}$ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" >&5 +echo "${ECHO_T}$ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" >&6 if test $ac_cv_lib_hyphen_hnj_hyphen_hyphenate2 = yes; then HYPHEN_LIB=-lhyphen else @@ -22699,67 +21099,60 @@ echo "$as_me: error: altlinuxhyph library not found or too old." >&2;} fi if test -z "$HYPHEN_LIB"; then - { echo "$as_me:$LINENO: checking for hnj_hyphen_hyphenate2 in -lhyph" >&5 -echo $ECHO_N "checking for hnj_hyphen_hyphenate2 in -lhyph... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for hnj_hyphen_hyphenate2 in -lhyph" >&5 +echo $ECHO_N "checking for hnj_hyphen_hyphenate2 in -lhyph... $ECHO_C" >&6 if test "${ac_cv_lib_hyph_hnj_hyphen_hyphenate2+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lhyph $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char hnj_hyphen_hyphenate2 (); int main () { -return hnj_hyphen_hyphenate2 (); +hnj_hyphen_hyphenate2 (); ; 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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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 + (exit $ac_status); }; }; then ac_cv_lib_hyph_hnj_hyphen_hyphenate2=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_hyph_hnj_hyphen_hyphenate2=no +ac_cv_lib_hyph_hnj_hyphen_hyphenate2=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_hyph_hnj_hyphen_hyphenate2" >&5 -echo "${ECHO_T}$ac_cv_lib_hyph_hnj_hyphen_hyphenate2" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_lib_hyph_hnj_hyphen_hyphenate2" >&5 +echo "${ECHO_T}$ac_cv_lib_hyph_hnj_hyphen_hyphenate2" >&6 if test $ac_cv_lib_hyph_hnj_hyphen_hyphenate2 = yes; then HYPHEN_LIB=-lhyph else @@ -22770,67 +21163,60 @@ fi fi if test -z "$HYPHEN_LIB"; then - { echo "$as_me:$LINENO: checking for hnj_hyphen_hyphenate2 in -lhnj" >&5 -echo $ECHO_N "checking for hnj_hyphen_hyphenate2 in -lhnj... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for hnj_hyphen_hyphenate2 in -lhnj" >&5 +echo $ECHO_N "checking for hnj_hyphen_hyphenate2 in -lhnj... $ECHO_C" >&6 if test "${ac_cv_lib_hnj_hnj_hyphen_hyphenate2+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lhnj $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char hnj_hyphen_hyphenate2 (); int main () { -return hnj_hyphen_hyphenate2 (); +hnj_hyphen_hyphenate2 (); ; 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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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 + (exit $ac_status); }; }; then ac_cv_lib_hnj_hnj_hyphen_hyphenate2=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_hnj_hnj_hyphen_hyphenate2=no +ac_cv_lib_hnj_hnj_hyphen_hyphenate2=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_hnj_hnj_hyphen_hyphenate2" >&5 -echo "${ECHO_T}$ac_cv_lib_hnj_hnj_hyphen_hyphenate2" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_lib_hnj_hnj_hyphen_hyphenate2" >&5 +echo "${ECHO_T}$ac_cv_lib_hnj_hnj_hyphen_hyphenate2" >&6 if test $ac_cv_lib_hnj_hnj_hyphen_hyphenate2 = yes; then HYPHEN_LIB=-lhnj else @@ -22841,32 +21227,33 @@ fi fi else - { echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_HYPH=NO fi -{ echo "$as_me:$LINENO: checking which mythes to use" >&5 -echo $ECHO_N "checking which mythes to use... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking which mythes to use" >&5 +echo $ECHO_N "checking which mythes to use... $ECHO_C" >&6 if test -n "$with_system_mythes" && test "$with_system_mythes" != "no"; then - { echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_MYTHES=YES if test "${ac_cv_header_mythes_hxx+set}" = set; then - { echo "$as_me:$LINENO: checking for mythes.hxx" >&5 -echo $ECHO_N "checking for mythes.hxx... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for mythes.hxx" >&5 +echo $ECHO_N "checking for mythes.hxx... $ECHO_C" >&6 if test "${ac_cv_header_mythes_hxx+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_mythes_hxx" >&5 -echo "${ECHO_T}$ac_cv_header_mythes_hxx" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_mythes_hxx" >&5 +echo "${ECHO_T}$ac_cv_header_mythes_hxx" >&6 else # Is the header compilable? -{ echo "$as_me:$LINENO: checking mythes.hxx usability" >&5 -echo $ECHO_N "checking mythes.hxx usability... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking mythes.hxx usability" >&5 +echo $ECHO_N "checking mythes.hxx usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22876,38 +21263,33 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_objext; then + (exit $ac_status); }; }; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no +ac_header_compiler=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 # Is the header present? -{ echo "$as_me:$LINENO: checking mythes.hxx presence" >&5 -echo $ECHO_N "checking mythes.hxx presence... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking mythes.hxx presence" >&5 +echo $ECHO_N "checking mythes.hxx presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22915,22 +21297,23 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -22938,45 +21321,52 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi - rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) +case $ac_header_compiler:$ac_header_preproc in + yes:no ) { echo "$as_me:$LINENO: WARNING: mythes.hxx: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: mythes.hxx: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: mythes.hxx: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: mythes.hxx: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes + { echo "$as_me:$LINENO: WARNING: mythes.hxx: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: mythes.hxx: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; - no:yes:* ) + no:yes ) { echo "$as_me:$LINENO: WARNING: mythes.hxx: present but cannot be compiled" >&5 echo "$as_me: WARNING: mythes.hxx: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: mythes.hxx: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: mythes.hxx: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: mythes.hxx: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: mythes.hxx: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: mythes.hxx: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: mythes.hxx: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: mythes.hxx: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: mythes.hxx: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: mythes.hxx: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: mythes.hxx: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: mythes.hxx: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: mythes.hxx: in the future, the compiler will take precedence" >&2;} - + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for mythes.hxx" >&5 -echo $ECHO_N "checking for mythes.hxx... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for mythes.hxx" >&5 +echo $ECHO_N "checking for mythes.hxx... $ECHO_C" >&6 if test "${ac_cv_header_mythes_hxx+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_mythes_hxx=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_mythes_hxx" >&5 -echo "${ECHO_T}$ac_cv_header_mythes_hxx" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_mythes_hxx" >&5 +echo "${ECHO_T}$ac_cv_header_mythes_hxx" >&6 fi if test $ac_cv_header_mythes_hxx = yes; then @@ -22989,14 +21379,15 @@ fi -{ echo "$as_me:$LINENO: checking for main in -lmythes" >&5 -echo $ECHO_N "checking for main in -lmythes... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for main in -lmythes" >&5 +echo $ECHO_N "checking for main in -lmythes... $ECHO_C" >&6 if test "${ac_cv_lib_mythes_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lmythes $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -23007,43 +21398,35 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -return main (); +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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 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 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_mythes_main=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_mythes_main=no +ac_cv_lib_mythes_main=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_mythes_main" >&5 -echo "${ECHO_T}$ac_cv_lib_mythes_main" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_lib_mythes_main" >&5 +echo "${ECHO_T}$ac_cv_lib_mythes_main" >&6 if test $ac_cv_lib_mythes_main = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBMYTHES 1 @@ -23058,32 +21441,33 @@ echo "$as_me: error: mythes library not found." >&2;} fi else - { echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_MYTHES=NO fi -{ echo "$as_me:$LINENO: checking which lpsolve to use" >&5 -echo $ECHO_N "checking which lpsolve to use... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking which lpsolve to use" >&5 +echo $ECHO_N "checking which lpsolve to use... $ECHO_C" >&6 if test -n "$with_system_lpsolve" -o -n "$with_system_libs" && \ test "$with_system_lpsolve" != "no"; then - { echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_LPSOLVE=YES if test "${ac_cv_header_lpsolve_lp_lib_h+set}" = set; then - { echo "$as_me:$LINENO: checking for lpsolve/lp_lib.h" >&5 -echo $ECHO_N "checking for lpsolve/lp_lib.h... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for lpsolve/lp_lib.h" >&5 +echo $ECHO_N "checking for lpsolve/lp_lib.h... $ECHO_C" >&6 if test "${ac_cv_header_lpsolve_lp_lib_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_lpsolve_lp_lib_h" >&5 -echo "${ECHO_T}$ac_cv_header_lpsolve_lp_lib_h" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_lpsolve_lp_lib_h" >&5 +echo "${ECHO_T}$ac_cv_header_lpsolve_lp_lib_h" >&6 else # Is the header compilable? -{ echo "$as_me:$LINENO: checking lpsolve/lp_lib.h usability" >&5 -echo $ECHO_N "checking lpsolve/lp_lib.h usability... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking lpsolve/lp_lib.h usability" >&5 +echo $ECHO_N "checking lpsolve/lp_lib.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -23093,38 +21477,33 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 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_objext; then + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no +ac_header_compiler=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 # Is the header present? -{ echo "$as_me:$LINENO: checking lpsolve/lp_lib.h presence" >&5 -echo $ECHO_N "checking lpsolve/lp_lib.h presence... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking lpsolve/lp_lib.h presence" >&5 +echo $ECHO_N "checking lpsolve/lp_lib.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -23132,22 +21511,23 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -23155,45 +21535,52 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi - rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) +case $ac_header_compiler:$ac_header_preproc in + yes:no ) { echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: lpsolve/lp_lib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: lpsolve/lp_lib.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes + { echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: lpsolve/lp_lib.h: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; - no:yes:* ) + no:yes ) { echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: lpsolve/lp_lib.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: lpsolve/lp_lib.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: lpsolve/lp_lib.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: lpsolve/lp_lib.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: lpsolve/lp_lib.h: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: lpsolve/lp_lib.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: lpsolve/lp_lib.h: in the future, the compiler will take precedence" >&2;} - + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for lpsolve/lp_lib.h" >&5 -echo $ECHO_N "checking for lpsolve/lp_lib.h... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for lpsolve/lp_lib.h" >&5 +echo $ECHO_N "checking for lpsolve/lp_lib.h... $ECHO_C" >&6 if test "${ac_cv_header_lpsolve_lp_lib_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_lpsolve_lp_lib_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_lpsolve_lp_lib_h" >&5 -echo "${ECHO_T}$ac_cv_header_lpsolve_lp_lib_h" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_lpsolve_lp_lib_h" >&5 +echo "${ECHO_T}$ac_cv_header_lpsolve_lp_lib_h" >&6 fi if test $ac_cv_header_lpsolve_lp_lib_h = yes; then @@ -23206,67 +21593,60 @@ fi -{ echo "$as_me:$LINENO: checking for make_lp in -llpsolve55" >&5 -echo $ECHO_N "checking for make_lp in -llpsolve55... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for make_lp in -llpsolve55" >&5 +echo $ECHO_N "checking for make_lp in -llpsolve55... $ECHO_C" >&6 if test "${ac_cv_lib_lpsolve55_make_lp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-llpsolve55 $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char make_lp (); int main () { -return make_lp (); +make_lp (); ; 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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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 + (exit $ac_status); }; }; then ac_cv_lib_lpsolve55_make_lp=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_lpsolve55_make_lp=no +ac_cv_lib_lpsolve55_make_lp=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_lpsolve55_make_lp" >&5 -echo "${ECHO_T}$ac_cv_lib_lpsolve55_make_lp" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_lib_lpsolve55_make_lp" >&5 +echo "${ECHO_T}$ac_cv_lib_lpsolve55_make_lp" >&6 if test $ac_cv_lib_lpsolve55_make_lp = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBLPSOLVE55 1 @@ -23281,86 +21661,79 @@ echo "$as_me: error: lpsolve library not found or too old." >&2;} fi else - { echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_LPSOLVE=NO BUILD_TYPE="$BUILD_TYPE LPSOLVE" fi if test "$_os" = "Linux"; then - { echo "$as_me:$LINENO: checking whether libc is >= 2.1.1" >&5 -echo $ECHO_N "checking whether libc is >= 2.1.1... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking whether libc is >= 2.1.1" >&5 +echo $ECHO_N "checking whether libc is >= 2.1.1... $ECHO_C" >&6 exec 6>/dev/null # no output - { echo "$as_me:$LINENO: checking for gnu_get_libc_version in -lc" >&5 -echo $ECHO_N "checking for gnu_get_libc_version in -lc... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for gnu_get_libc_version in -lc" >&5 +echo $ECHO_N "checking for gnu_get_libc_version in -lc... $ECHO_C" >&6 if test "${ac_cv_lib_c_gnu_get_libc_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lc $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char gnu_get_libc_version (); int main () { -return gnu_get_libc_version (); +gnu_get_libc_version (); ; 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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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 + (exit $ac_status); }; }; then ac_cv_lib_c_gnu_get_libc_version=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_c_gnu_get_libc_version=no +ac_cv_lib_c_gnu_get_libc_version=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_gnu_get_libc_version" >&5 -echo "${ECHO_T}$ac_cv_lib_c_gnu_get_libc_version" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_lib_c_gnu_get_libc_version" >&5 +echo "${ECHO_T}$ac_cv_lib_c_gnu_get_libc_version" >&6 if test $ac_cv_lib_c_gnu_get_libc_version = yes; then HAVE_LIBC=yes; export HAVE_LIBC fi exec 6>&1 # output on again if test "$HAVE_LIBC"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else { { echo "$as_me:$LINENO: error: no, upgrade libc" >&5 echo "$as_me: error: no, upgrade libc" >&2;} @@ -23369,8 +21742,8 @@ echo "$as_me: error: no, upgrade libc" >&2;} fi if test \( "$_os" = "WINNT" \) ; then - { echo "$as_me:$LINENO: checking for PSDK files" >&5 -echo $ECHO_N "checking for PSDK files... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for PSDK files" >&5 +echo $ECHO_N "checking for PSDK files... $ECHO_C" >&6 if test -z "$with_psdk_home"; then # This first line will detect a February 2003 Microsoft Platform SDK PSDK_HOME=`./oowintool --psdk-home` @@ -23433,27 +21806,27 @@ are installed or use --with-psdk-home ." >&2;} echo "$as_me: error: Some (all) files of the Windows Installer SDK are missing, please install." >&2;} { (exit 1); exit 1; }; } fi - { echo "$as_me:$LINENO: result: SDK files found ...)" >&5 -echo "${ECHO_T}SDK files found ...)" >&6; } + echo "$as_me:$LINENO: result: SDK files found ...)" >&5 +echo "${ECHO_T}SDK files found ...)" >&6 if echo $PSDK_HOME | grep "v6.1" >/dev/null 2>/dev/null; then - { echo "$as_me:$LINENO: result: Found Windows SDK 6.1 ($PSDK_HOME)" >&5 -echo "${ECHO_T}Found Windows SDK 6.1 ($PSDK_HOME)" >&6; } + echo "$as_me:$LINENO: result: Found Windows SDK 6.1 ($PSDK_HOME)" >&5 +echo "${ECHO_T}Found Windows SDK 6.1 ($PSDK_HOME)" >&6 WINDOWS_VISTA_PSDK=TRUE elif echo $PSDK_HOME | grep "v6.0" >/dev/null 2>/dev/null; then - { echo "$as_me:$LINENO: result: Found Windows SDK 6.0 ($PSDK_HOME)" >&5 -echo "${ECHO_T}Found Windows SDK 6.0 ($PSDK_HOME)" >&6; } + echo "$as_me:$LINENO: result: Found Windows SDK 6.0 ($PSDK_HOME)" >&5 +echo "${ECHO_T}Found Windows SDK 6.0 ($PSDK_HOME)" >&6 WINDOWS_VISTA_PSDK=TRUE else - { echo "$as_me:$LINENO: result: Found Legacy Windows Platform SDK ($PSDK_HOME)" >&5 -echo "${ECHO_T}Found Legacy Windows Platform SDK ($PSDK_HOME)" >&6; } + echo "$as_me:$LINENO: result: Found Legacy Windows Platform SDK ($PSDK_HOME)" >&5 +echo "${ECHO_T}Found Legacy Windows Platform SDK ($PSDK_HOME)" >&6 fi fi if test \( "$_os" = "WINNT" \) ; then - { echo "$as_me:$LINENO: checking for DirectX SDK files" >&5 -echo $ECHO_N "checking for DirectX SDK files... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for DirectX SDK files" >&5 +echo $ECHO_N "checking for DirectX SDK files... $ECHO_C" >&6 if test -z "$with_directx_home"; then if test -n "$DXSDK_DIR"; then DIRECTXSDK_HOME=`cygpath -d "$DXSDK_DIR"` @@ -23485,8 +21858,8 @@ echo $ECHO_N "checking for DirectX SDK files... $ECHO_C" >&6; } fi if test -n "$ENABLE_DIRECTX"; then if test "$HAVE_DIRECTXSDK_H" = "yes" -a "$HAVE_DIRECTXSDK_LIB" = "yes"; then - { echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6; } + echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6 else { { echo "$as_me:$LINENO: error: DirectX SDK files not found, please use --with-directx-home or -disable-directx." >&5 echo "$as_me: error: DirectX SDK files not found, please use --with-directx-home or -disable-directx." >&2;} @@ -23494,8 +21867,8 @@ echo "$as_me: error: DirectX SDK files not found, please use --with-directx-home fi else DIRECTXSDK_HOME="" - { echo "$as_me:$LINENO: result: disabled" >&5 -echo "${ECHO_T}disabled" >&6; } + echo "$as_me:$LINENO: result: disabled" >&5 +echo "${ECHO_T}disabled" >&6 fi fi @@ -23503,12 +21876,12 @@ fi NSIS_PATH="" if test "$_os" = "WINNT" ; then - { echo "$as_me:$LINENO: checking for NSIS" >&5 -echo $ECHO_N "checking for NSIS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for NSIS" >&5 +echo $ECHO_N "checking for NSIS... $ECHO_C" >&6 # Extract the first word of "nsis.exe", so it can be a program name with args. set dummy nsis.exe; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_NSIS_PATH+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23523,28 +21896,27 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_NSIS_PATH="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS ;; esac fi NSIS_PATH=$ac_cv_path_NSIS_PATH + if test -n "$NSIS_PATH"; then - { echo "$as_me:$LINENO: result: $NSIS_PATH" >&5 -echo "${ECHO_T}$NSIS_PATH" >&6; } + echo "$as_me:$LINENO: result: $NSIS_PATH" >&5 +echo "${ECHO_T}$NSIS_PATH" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test -n "$NSIS_PATH"; then NSIS_PATH=`dirname "$NSIS_PATH"` fi @@ -23565,16 +21937,16 @@ echo "$as_me: WARNING: NSIS not found, no self contained installer will be build else NSIS_PATH=`cygpath -d "$NSIS_PATH"` NSIS_PATH=`cygpath -u "$NSIS_PATH"` - { echo "$as_me:$LINENO: result: found ($NSIS_PATH)" >&5 -echo "${ECHO_T}found ($NSIS_PATH)" >&6; } + echo "$as_me:$LINENO: result: found ($NSIS_PATH)" >&5 +echo "${ECHO_T}found ($NSIS_PATH)" >&6 fi fi # Extract the first word of "bison", so it can be a program name with args. set dummy bison; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_BISON+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23589,35 +21961,34 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_BISON="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS ;; esac fi BISON=$ac_cv_path_BISON + if test -n "$BISON"; then - { echo "$as_me:$LINENO: result: $BISON" >&5 -echo "${ECHO_T}$BISON" >&6; } + echo "$as_me:$LINENO: result: $BISON" >&5 +echo "${ECHO_T}$BISON" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test -z "$BISON"; then { { echo "$as_me:$LINENO: error: no bison found in \$PATH, install bison" >&5 echo "$as_me: error: no bison found in \$PATH, install bison" >&2;} { (exit 1); exit 1; }; } else - { echo "$as_me:$LINENO: checking the bison version" >&5 -echo $ECHO_N "checking the bison version... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking the bison version" >&5 +echo $ECHO_N "checking the bison version... $ECHO_C" >&6 _bison_version=`$BISON --version | grep GNU | $SED -e 's@^[^0-9]*@@' -e 's@ .*@@' -e 's@,.*@@'`; _bison_longver=`echo $_bison_version | $AWK -F. '{ print \$1*1000+\$2}'` # Accept newer than 1.875 or older(equal) than 1.75 @@ -23627,8 +21998,8 @@ echo $ECHO_N "checking the bison version... $ECHO_C" >&6; } echo "$as_me: WARNING: suspect ($BISON $_bison_version)" >&2;} echo "Suspect ($BISON $_bison_version) suggest upgrade" >> warn else - { echo "$as_me:$LINENO: result: checked ($BISON $_bison_version)" >&5 -echo "${ECHO_T}checked ($BISON $_bison_version)" >&6; } + echo "$as_me:$LINENO: result: checked ($BISON $_bison_version)" >&5 +echo "${ECHO_T}checked ($BISON $_bison_version)" >&6 fi else { { echo "$as_me:$LINENO: error: failed ($BISON $_bison_version need 1.875+ (or 1.75 and older))" >&5 @@ -23638,8 +22009,8 @@ echo "$as_me: error: failed ($BISON $_bison_version need 1.875+ (or 1.75 and old fi # Extract the first word of "flex", so it can be a program name with args. set dummy flex; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_FLEX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23654,28 +22025,27 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_FLEX="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS ;; esac fi FLEX=$ac_cv_path_FLEX + if test -n "$FLEX"; then - { echo "$as_me:$LINENO: result: $FLEX" >&5 -echo "${ECHO_T}$FLEX" >&6; } + echo "$as_me:$LINENO: result: $FLEX" >&5 +echo "${ECHO_T}$FLEX" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test -z "$FLEX"; then { { echo "$as_me:$LINENO: error: no flex found in \$PATH, install flex" >&5 echo "$as_me: error: no flex found in \$PATH, install flex" >&2;} @@ -23683,8 +22053,8 @@ echo "$as_me: error: no flex found in \$PATH, install flex" >&2;} fi # Extract the first word of "patch", so it can be a program name with args. set dummy patch; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PATCH+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23699,28 +22069,27 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PATCH="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS ;; esac fi PATCH=$ac_cv_path_PATCH + if test -n "$PATCH"; then - { echo "$as_me:$LINENO: result: $PATCH" >&5 -echo "${ECHO_T}$PATCH" >&6; } + echo "$as_me:$LINENO: result: $PATCH" >&5 +echo "${ECHO_T}$PATCH" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test -z "$PATCH"; then { { echo "$as_me:$LINENO: error: \\"patch\\" not found in \$PATH, install the development tool named\\"patch\"\" >&5 echo "$as_me: error: \\"patch\\" not found in \$PATH, install the development tool named\\"patch\"\" >&2;} @@ -23740,11 +22109,11 @@ echo "$as_me: error: --with-gnu-patch did not point to an executable" >&2;} fi fi - { echo "$as_me:$LINENO: checking whether $GNUPATCH is GNU patch" >&5 -echo $ECHO_N "checking whether $GNUPATCH is GNU patch... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking whether $GNUPATCH is GNU patch" >&5 +echo $ECHO_N "checking whether $GNUPATCH is GNU patch... $ECHO_C" >&6 if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/dev/null; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else { { echo "$as_me:$LINENO: error: no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it" >&5 echo "$as_me: error: no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it" >&2;} @@ -23757,8 +22126,8 @@ echo "$as_me: error: no, GNU patch needed. install or specify with --with-gnu-pa do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_GNUCP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23773,28 +22142,27 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GNUCP="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS ;; esac fi GNUCP=$ac_cv_path_GNUCP + if test -n "$GNUCP"; then - { echo "$as_me:$LINENO: result: $GNUCP" >&5 -echo "${ECHO_T}$GNUCP" >&6; } + echo "$as_me:$LINENO: result: $GNUCP" >&5 +echo "${ECHO_T}$GNUCP" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - test -n "$GNUCP" && break done @@ -23813,20 +22181,20 @@ echo "$as_me: error: --with-gnu-cp did not point to an executable" >&2;} fi fi - { echo "$as_me:$LINENO: checking whether $GNUCP is GNU cp" >&5 -echo $ECHO_N "checking whether $GNUCP is GNU cp... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking whether $GNUCP is GNU cp" >&5 +echo $ECHO_N "checking whether $GNUCP is GNU cp... $ECHO_C" >&6 if $GNUCP --version 2>/dev/null | grep "Free Software Foundation" >/dev/null 2>/dev/null; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else if $GNUCP --version 2>/dev/null | grep "GNU fileutils" >/dev/null 2>/dev/null; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else if test "$_os" = "Darwin"; then GNUCP='' - { echo "$as_me:$LINENO: result: no gnucp found - using the system's cp command" >&5 -echo "${ECHO_T}no gnucp found - using the system's cp command" >&6; } + echo "$as_me:$LINENO: result: no gnucp found - using the system's cp command" >&5 +echo "${ECHO_T}no gnucp found - using the system's cp command" >&6 else { { echo "$as_me:$LINENO: error: no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it" >&5 echo "$as_me: error: no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it" >&2;} @@ -23843,8 +22211,8 @@ if test "$_os" = "WINNT"; then CYGWIN_PATH="" # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_CYGWIN_PATH+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23859,28 +22227,27 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_CYGWIN_PATH="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS ;; esac fi CYGWIN_PATH=$ac_cv_path_CYGWIN_PATH + if test -n "$CYGWIN_PATH"; then - { echo "$as_me:$LINENO: result: $CYGWIN_PATH" >&5 -echo "${ECHO_T}$CYGWIN_PATH" >&6; } + echo "$as_me:$LINENO: result: $CYGWIN_PATH" >&5 +echo "${ECHO_T}$CYGWIN_PATH" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - CYGWIN_PATH=`dirname "$CYGWIN_PATH"` fi if test -z "$CYGWIN_PATH"; then @@ -23889,16 +22256,16 @@ fi if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then - { echo "$as_me:$LINENO: checking ml.exe assembler path" >&5 -echo $ECHO_N "checking ml.exe assembler path... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking ml.exe assembler path" >&5 +echo $ECHO_N "checking ml.exe assembler path... $ECHO_C" >&6 if test -n "$with_asm_home"; then with_asm_home=`cygpath -u "$with_asm_home"` fi if test ! -x "$with_asm_home/ml.exe"; then # Extract the first word of "ml.exe", so it can be a program name with args. set dummy ml.exe; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_ML_EXE+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23913,33 +22280,32 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ML_EXE="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS ;; esac fi ML_EXE=$ac_cv_path_ML_EXE + if test -n "$ML_EXE"; then - { echo "$as_me:$LINENO: result: $ML_EXE" >&5 -echo "${ECHO_T}$ML_EXE" >&6; } + echo "$as_me:$LINENO: result: $ML_EXE" >&5 +echo "${ECHO_T}$ML_EXE" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test -z "$ML_EXE"; then if test -x "$with_cl_home/bin/ml.exe"; then with_asm_home=$with_cl_home/bin - { echo "$as_me:$LINENO: result: found ($with_asm_home)" >&5 -echo "${ECHO_T}found ($with_asm_home)" >&6; } + echo "$as_me:$LINENO: result: found ($with_asm_home)" >&5 +echo "${ECHO_T}found ($with_asm_home)" >&6 else { { echo "$as_me:$LINENO: error: Configure did not find ml.exe assembler." >&5 echo "$as_me: error: Configure did not find ml.exe assembler." >&2;} @@ -23954,8 +22320,8 @@ else fi ASM_HOME="$with_asm_home" if test -n "$ASM_HOME"; then - { echo "$as_me:$LINENO: result: $ASM_HOME" >&5 -echo "${ECHO_T}$ASM_HOME" >&6; } + echo "$as_me:$LINENO: result: $ASM_HOME" >&5 +echo "${ECHO_T}$ASM_HOME" >&6 fi @@ -23972,8 +22338,8 @@ if test -n "$with_zip_home" ; then else # Extract the first word of "zip", so it can be a program name with args. set dummy zip; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_ZIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23988,32 +22354,31 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ZIP="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS ;; esac fi ZIP=$ac_cv_path_ZIP + if test -n "$ZIP"; then - { echo "$as_me:$LINENO: result: $ZIP" >&5 -echo "${ECHO_T}$ZIP" >&6; } + echo "$as_me:$LINENO: result: $ZIP" >&5 +echo "${ECHO_T}$ZIP" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - # Extract the first word of "unzip", so it can be a program name with args. set dummy unzip; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_UNZIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -24028,28 +22393,27 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_UNZIP="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS ;; esac fi UNZIP=$ac_cv_path_UNZIP + if test -n "$UNZIP"; then - { echo "$as_me:$LINENO: result: $UNZIP" >&5 -echo "${ECHO_T}$UNZIP" >&6; } + echo "$as_me:$LINENO: result: $UNZIP" >&5 +echo "${ECHO_T}$UNZIP" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - ZIP_HOME=`dirname "$ZIP"` fi if test -z "$ZIP" -o -z "$UNZIP"; then @@ -24078,11 +22442,11 @@ fi if test "$_os" = "WINNT"; then - { echo "$as_me:$LINENO: checking for unicows.dll" >&5 -echo $ECHO_N "checking for unicows.dll... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for unicows.dll" >&5 +echo $ECHO_N "checking for unicows.dll... $ECHO_C" >&6 if test -x ./external/unicows/unicows.dll; then - { echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6; } + echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6 else { { echo "$as_me:$LINENO: error: The Microsoft Layer for Unicode (unicows.dll) is missing in external/unicows/. Get it from the Microsoft site and put it into external/unicows. @@ -24099,11 +22463,11 @@ may have to search Microsoft's website.) Last time it was seen at: fi if test "$_os" = "WINNT"; then - { echo "$as_me:$LINENO: checking for dbghelp.dll" >&5 -echo $ECHO_N "checking for dbghelp.dll... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for dbghelp.dll" >&5 +echo $ECHO_N "checking for dbghelp.dll... $ECHO_C" >&6 if test -x ./external/dbghelp/dbghelp.dll; then - { echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6; } + echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6 else { { echo "$as_me:$LINENO: error: dbghelp.dll is missing in external/dbghelp/. Get it from the Microsoft site and put it into external/dbghelp. @@ -24130,11 +22494,11 @@ echo "$as_me: error: oowintool failed to copy CRT" >&2;} fi if test "$_os" = "WINNT"; then - { echo "$as_me:$LINENO: checking for gdiplus.dll" >&5 -echo $ECHO_N "checking for gdiplus.dll... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for gdiplus.dll" >&5 +echo $ECHO_N "checking for gdiplus.dll... $ECHO_C" >&6 if test -x ./external/gdiplus/gdiplus.dll; then - { echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6; } + echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6 else { { echo "$as_me:$LINENO: error: gdiplus.dll is missing in external/gdiplus/. Get it from the Microsoft site and put it into external/gdiplus. @@ -24154,11 +22518,11 @@ fi if test "$_os" = "WINNT"; then if test "$WITH_MINGWIN" = "yes" || test "$COMEX" -ge "10"; then - { echo "$as_me:$LINENO: checking for instmsia.exe/instmsiw.exe" >&5 -echo $ECHO_N "checking for instmsia.exe/instmsiw.exe... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for instmsia.exe/instmsiw.exe" >&5 +echo $ECHO_N "checking for instmsia.exe/instmsiw.exe... $ECHO_C" >&6 if test -x ./external/msi/instmsia.exe -a -x ./external/msi/instmsiw.exe; then - { echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6; } + echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6 else MSIAPATH=`/bin/find "$COMPATH/../.." -iname instmsia.exe | head -n 1` MSIWPATH=`/bin/find "$COMPATH/../.." -iname instmsiw.exe | head -n 1` @@ -24179,24 +22543,24 @@ directory similar to: As the automatic detection fails please copy the files to external/msi/." >&2;} { (exit 1); exit 1; }; } else - { echo "$as_me:$LINENO: result: found and copied" >&5 -echo "${ECHO_T}found and copied" >&6; } + echo "$as_me:$LINENO: result: found and copied" >&5 +echo "${ECHO_T}found and copied" >&6 fi fi fi fi -{ echo "$as_me:$LINENO: checking which polygon clipping code to use" >&5 -echo $ECHO_N "checking which polygon clipping code to use... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking which polygon clipping code to use" >&5 +echo $ECHO_N "checking which polygon clipping code to use... $ECHO_C" >&6 WITH_GPC=NO if test "$with_gpc" != "no" && test "$without_gpc" != "yes"; then WITH_GPC=YES - { echo "$as_me:$LINENO: result: GPC" >&5 -echo "${ECHO_T}GPC" >&6; } + echo "$as_me:$LINENO: result: GPC" >&5 +echo "${ECHO_T}GPC" >&6 - { echo "$as_me:$LINENO: checking for GPC files" >&5 -echo $ECHO_N "checking for GPC files... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for GPC files" >&5 +echo $ECHO_N "checking for GPC files... $ECHO_C" >&6 if test -f ./external/gpc/gpc.h; then HAVE_GPC_H="yes" else @@ -24209,8 +22573,8 @@ echo $ECHO_N "checking for GPC files... $ECHO_C" >&6; } fi if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then - { echo "$as_me:$LINENO: result: GPC files found" >&5 -echo "${ECHO_T}GPC files found" >&6; } + echo "$as_me:$LINENO: result: GPC files found" >&5 +echo "${ECHO_T}GPC files found" >&6 else { { echo "$as_me:$LINENO: error: GPC files not found ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z and untar in external/gpc, @@ -24221,13 +22585,13 @@ or use basegfx' implementation using --without-gpc" >&2;} { (exit 1); exit 1; }; } fi else - { echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 fi -{ echo "$as_me:$LINENO: checking which VCLplugs shall be built" >&5 -echo $ECHO_N "checking which VCLplugs shall be built... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking which VCLplugs shall be built" >&5 +echo $ECHO_N "checking which VCLplugs shall be built... $ECHO_C" >&6 ENABLE_GTK="" if test "x$enable_gtk" = "xyes"; then ENABLE_GTK="TRUE" @@ -24242,30 +22606,37 @@ if test "x$enable_kde" = "xyes"; then fi +ENABLE_KDE4="" +if test "x$enable_kde4" = "xyes"; then + ENABLE_KDE4="TRUE" + R="$R kde4" +fi + + if test -z "$R"; then - { echo "$as_me:$LINENO: result: none" >&5 -echo "${ECHO_T}none" >&6; } + echo "$as_me:$LINENO: result: none" >&5 +echo "${ECHO_T}none" >&6 else - { echo "$as_me:$LINENO: result: $R" >&5 -echo "${ECHO_T}$R" >&6; } + echo "$as_me:$LINENO: result: $R" >&5 +echo "${ECHO_T}$R" >&6 fi ENABLE_GCONF="" -{ echo "$as_me:$LINENO: checking whether to enable GConf support" >&5 -echo $ECHO_N "checking whether to enable GConf support... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to enable GConf support" >&5 +echo $ECHO_N "checking whether to enable GConf support... $ECHO_C" >&6 if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$_os" != "OS2" -a "$enable_gconf" = "yes"; then ENABLE_GCONF="TRUE" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=no if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -24280,29 +22651,28 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -24313,25 +22683,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { echo "$as_me:$LINENO: checking for gconf-2.0 " >&5 -echo $ECHO_N "checking for gconf-2.0 ... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for gconf-2.0 " >&5 +echo $ECHO_N "checking for gconf-2.0 ... $ECHO_C" >&6 if $PKG_CONFIG --exists "gconf-2.0 " ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { echo "$as_me:$LINENO: checking GCONF_CFLAGS" >&5 -echo $ECHO_N "checking GCONF_CFLAGS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking GCONF_CFLAGS" >&5 +echo $ECHO_N "checking GCONF_CFLAGS... $ECHO_C" >&6 GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 "` - { echo "$as_me:$LINENO: result: $GCONF_CFLAGS" >&5 -echo "${ECHO_T}$GCONF_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $GCONF_CFLAGS" >&5 +echo "${ECHO_T}$GCONF_CFLAGS" >&6 - { echo "$as_me:$LINENO: checking GCONF_LIBS" >&5 -echo $ECHO_N "checking GCONF_LIBS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking GCONF_LIBS" >&5 +echo $ECHO_N "checking GCONF_LIBS... $ECHO_C" >&6 GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0 "` - { echo "$as_me:$LINENO: result: $GCONF_LIBS" >&5 -echo "${ECHO_T}$GCONF_LIBS" >&6; } + echo "$as_me:$LINENO: result: $GCONF_LIBS" >&5 +echo "${ECHO_T}$GCONF_LIBS" >&6 else GCONF_CFLAGS="" GCONF_LIBS="" @@ -24358,27 +22728,27 @@ echo "$as_me: error: Library requirements (gconf-2.0 ) not met; consider adjusti fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi ENABLE_GNOMEVFS="" -{ echo "$as_me:$LINENO: checking whether to enable GNOME VFS support" >&5 -echo $ECHO_N "checking whether to enable GNOME VFS support... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to enable GNOME VFS support" >&5 +echo $ECHO_N "checking whether to enable GNOME VFS support... $ECHO_C" >&6 if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gnome_vfs" = "yes"; then ENABLE_GNOMEVFS="TRUE" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=no if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -24393,29 +22763,28 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -24426,25 +22795,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { echo "$as_me:$LINENO: checking for gnome-vfs-2.0 >= 2.6.0 " >&5 -echo $ECHO_N "checking for gnome-vfs-2.0 >= 2.6.0 ... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for gnome-vfs-2.0 >= 2.6.0 " >&5 +echo $ECHO_N "checking for gnome-vfs-2.0 >= 2.6.0 ... $ECHO_C" >&6 if $PKG_CONFIG --exists "gnome-vfs-2.0 >= 2.6.0 " ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { echo "$as_me:$LINENO: checking GNOMEVFS_CFLAGS" >&5 -echo $ECHO_N "checking GNOMEVFS_CFLAGS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking GNOMEVFS_CFLAGS" >&5 +echo $ECHO_N "checking GNOMEVFS_CFLAGS... $ECHO_C" >&6 GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= 2.6.0 "` - { echo "$as_me:$LINENO: result: $GNOMEVFS_CFLAGS" >&5 -echo "${ECHO_T}$GNOMEVFS_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $GNOMEVFS_CFLAGS" >&5 +echo "${ECHO_T}$GNOMEVFS_CFLAGS" >&6 - { echo "$as_me:$LINENO: checking GNOMEVFS_LIBS" >&5 -echo $ECHO_N "checking GNOMEVFS_LIBS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking GNOMEVFS_LIBS" >&5 +echo $ECHO_N "checking GNOMEVFS_LIBS... $ECHO_C" >&6 GNOMEVFS_LIBS=`$PKG_CONFIG --libs "gnome-vfs-2.0 >= 2.6.0 "` - { echo "$as_me:$LINENO: result: $GNOMEVFS_LIBS" >&5 -echo "${ECHO_T}$GNOMEVFS_LIBS" >&6; } + echo "$as_me:$LINENO: result: $GNOMEVFS_LIBS" >&5 +echo "${ECHO_T}$GNOMEVFS_LIBS" >&6 else GNOMEVFS_CFLAGS="" GNOMEVFS_LIBS="" @@ -24477,8 +22846,8 @@ echo "$as_me: error: Library requirements (gnome-vfs-2.0 >= 2.6.0 ) not met; con if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -24493,29 +22862,28 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -24526,25 +22894,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { echo "$as_me:$LINENO: checking for gconf-2.0 " >&5 -echo $ECHO_N "checking for gconf-2.0 ... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for gconf-2.0 " >&5 +echo $ECHO_N "checking for gconf-2.0 ... $ECHO_C" >&6 if $PKG_CONFIG --exists "gconf-2.0 " ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { echo "$as_me:$LINENO: checking GCONF_CFLAGS" >&5 -echo $ECHO_N "checking GCONF_CFLAGS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking GCONF_CFLAGS" >&5 +echo $ECHO_N "checking GCONF_CFLAGS... $ECHO_C" >&6 GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 "` - { echo "$as_me:$LINENO: result: $GCONF_CFLAGS" >&5 -echo "${ECHO_T}$GCONF_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $GCONF_CFLAGS" >&5 +echo "${ECHO_T}$GCONF_CFLAGS" >&6 - { echo "$as_me:$LINENO: checking GCONF_LIBS" >&5 -echo $ECHO_N "checking GCONF_LIBS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking GCONF_LIBS" >&5 +echo $ECHO_N "checking GCONF_LIBS... $ECHO_C" >&6 GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0 "` - { echo "$as_me:$LINENO: result: $GCONF_LIBS" >&5 -echo "${ECHO_T}$GCONF_LIBS" >&6; } + echo "$as_me:$LINENO: result: $GCONF_LIBS" >&5 +echo "${ECHO_T}$GCONF_LIBS" >&6 else GCONF_CFLAGS="" GCONF_LIBS="" @@ -24572,8 +22940,8 @@ echo "$as_me: error: Library requirements (gconf-2.0 ) not met; consider adjusti fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi @@ -24591,8 +22959,8 @@ if test "$test_gtk" = "yes"; then if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -24607,29 +22975,28 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -24640,25 +23007,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { echo "$as_me:$LINENO: checking for gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 " >&5 -echo $ECHO_N "checking for gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 ... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 " >&5 +echo $ECHO_N "checking for gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 ... $ECHO_C" >&6 if $PKG_CONFIG --exists "gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 " ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { echo "$as_me:$LINENO: checking GTK_CFLAGS" >&5 -echo $ECHO_N "checking GTK_CFLAGS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking GTK_CFLAGS" >&5 +echo $ECHO_N "checking GTK_CFLAGS... $ECHO_C" >&6 GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 "` - { echo "$as_me:$LINENO: result: $GTK_CFLAGS" >&5 -echo "${ECHO_T}$GTK_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $GTK_CFLAGS" >&5 +echo "${ECHO_T}$GTK_CFLAGS" >&6 - { echo "$as_me:$LINENO: checking GTK_LIBS" >&5 -echo $ECHO_N "checking GTK_LIBS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking GTK_LIBS" >&5 +echo $ECHO_N "checking GTK_LIBS... $ECHO_C" >&6 GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 "` - { echo "$as_me:$LINENO: result: $GTK_LIBS" >&5 -echo "${ECHO_T}$GTK_LIBS" >&6; } + echo "$as_me:$LINENO: result: $GTK_LIBS" >&5 +echo "${ECHO_T}$GTK_LIBS" >&6 else GTK_CFLAGS="" GTK_LIBS="" @@ -24691,20 +23058,20 @@ echo "$as_me: error: requirements to build the gtk-plugin not met. Use --disable BUILD_TYPE="$BUILD_TYPE SYSTRAY_GTK" fi - { echo "$as_me:$LINENO: checking whether to enable DBUS support" >&5 -echo $ECHO_N "checking whether to enable DBUS support... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking whether to enable DBUS support" >&5 +echo $ECHO_N "checking whether to enable DBUS support... $ECHO_C" >&6 if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_dbus" = "yes"; then ENABLE_DBUS="TRUE" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=no if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -24719,29 +23086,28 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -24752,25 +23118,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { echo "$as_me:$LINENO: checking for dbus-glib-1 >= 0.70 " >&5 -echo $ECHO_N "checking for dbus-glib-1 >= 0.70 ... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for dbus-glib-1 >= 0.70 " >&5 +echo $ECHO_N "checking for dbus-glib-1 >= 0.70 ... $ECHO_C" >&6 if $PKG_CONFIG --exists "dbus-glib-1 >= 0.70 " ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { echo "$as_me:$LINENO: checking DBUS_CFLAGS" >&5 -echo $ECHO_N "checking DBUS_CFLAGS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking DBUS_CFLAGS" >&5 +echo $ECHO_N "checking DBUS_CFLAGS... $ECHO_C" >&6 DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= 0.70 "` - { echo "$as_me:$LINENO: result: $DBUS_CFLAGS" >&5 -echo "${ECHO_T}$DBUS_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $DBUS_CFLAGS" >&5 +echo "${ECHO_T}$DBUS_CFLAGS" >&6 - { echo "$as_me:$LINENO: checking DBUS_LIBS" >&5 -echo $ECHO_N "checking DBUS_LIBS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking DBUS_LIBS" >&5 +echo $ECHO_N "checking DBUS_LIBS... $ECHO_C" >&6 DBUS_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= 0.70 "` - { echo "$as_me:$LINENO: result: $DBUS_LIBS" >&5 -echo "${ECHO_T}$DBUS_LIBS" >&6; } + echo "$as_me:$LINENO: result: $DBUS_LIBS" >&5 +echo "${ECHO_T}$DBUS_LIBS" >&6 else DBUS_CFLAGS="" DBUS_LIBS="" @@ -24797,12 +23163,12 @@ echo "$as_me: error: Library requirements (dbus-glib-1 >= 0.70 ) not met; consid fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - { echo "$as_me:$LINENO: checking whether to enable GIO support" >&5 -echo $ECHO_N "checking whether to enable GIO support... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking whether to enable GIO support" >&5 +echo $ECHO_N "checking whether to enable GIO support... $ECHO_C" >&6 if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gio" = "yes"; then if test "$ENABLE_GNOMEVFS" = "TRUE" ; then { { echo "$as_me:$LINENO: error: please use --enable-gio only together with --disable-gnome-vfs." >&5 @@ -24810,16 +23176,16 @@ echo "$as_me: error: please use --enable-gio only together with --disable-gnome- { (exit 1); exit 1; }; } fi ENABLE_GIO="TRUE" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=no if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -24834,29 +23200,28 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -24867,25 +23232,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { echo "$as_me:$LINENO: checking for gio-2.0 " >&5 -echo $ECHO_N "checking for gio-2.0 ... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for gio-2.0 " >&5 +echo $ECHO_N "checking for gio-2.0 ... $ECHO_C" >&6 if $PKG_CONFIG --exists "gio-2.0 " ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { echo "$as_me:$LINENO: checking GIO_CFLAGS" >&5 -echo $ECHO_N "checking GIO_CFLAGS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking GIO_CFLAGS" >&5 +echo $ECHO_N "checking GIO_CFLAGS... $ECHO_C" >&6 GIO_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 "` - { echo "$as_me:$LINENO: result: $GIO_CFLAGS" >&5 -echo "${ECHO_T}$GIO_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $GIO_CFLAGS" >&5 +echo "${ECHO_T}$GIO_CFLAGS" >&6 - { echo "$as_me:$LINENO: checking GIO_LIBS" >&5 -echo $ECHO_N "checking GIO_LIBS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking GIO_LIBS" >&5 +echo $ECHO_N "checking GIO_LIBS... $ECHO_C" >&6 GIO_LIBS=`$PKG_CONFIG --libs "gio-2.0 "` - { echo "$as_me:$LINENO: result: $GIO_LIBS" >&5 -echo "${ECHO_T}$GIO_LIBS" >&6; } + echo "$as_me:$LINENO: result: $GIO_LIBS" >&5 +echo "${ECHO_T}$GIO_LIBS" >&6 else GIO_CFLAGS="" GIO_LIBS="" @@ -24912,8 +23277,8 @@ echo "$as_me: error: Library requirements (gio-2.0 ) not met; consider adjusting fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi fi @@ -24932,18 +23297,18 @@ SYSTEM_CAIRO="" if test "$test_cairo" = "yes"; then - { echo "$as_me:$LINENO: checking whether to use cairo" >&5 -echo $ECHO_N "checking whether to use cairo... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking whether to use cairo" >&5 +echo $ECHO_N "checking whether to use cairo... $ECHO_C" >&6 if test "x$enable_cairo" != "xno" ; then ENABLE_CAIRO="TRUE" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - { echo "$as_me:$LINENO: checking which cairo to use" >&5 -echo $ECHO_N "checking which cairo to use... $ECHO_C" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + echo "$as_me:$LINENO: checking which cairo to use" >&5 +echo $ECHO_N "checking which cairo to use... $ECHO_C" >&6 if test -n "$with_system_cairo" -o -n "$with_system_libs" && \ test "$with_system_cairo" != "no"; then - { echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_CAIRO=YES @@ -24952,8 +23317,8 @@ echo "${ECHO_T}external" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -24968,29 +23333,28 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -25001,25 +23365,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { echo "$as_me:$LINENO: checking for cairo >= 1.0.2 " >&5 -echo $ECHO_N "checking for cairo >= 1.0.2 ... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for cairo >= 1.0.2 " >&5 +echo $ECHO_N "checking for cairo >= 1.0.2 ... $ECHO_C" >&6 if $PKG_CONFIG --exists "cairo >= 1.0.2 " ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { echo "$as_me:$LINENO: checking CAIRO_CFLAGS" >&5 -echo $ECHO_N "checking CAIRO_CFLAGS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking CAIRO_CFLAGS" >&5 +echo $ECHO_N "checking CAIRO_CFLAGS... $ECHO_C" >&6 CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= 1.0.2 "` - { echo "$as_me:$LINENO: result: $CAIRO_CFLAGS" >&5 -echo "${ECHO_T}$CAIRO_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $CAIRO_CFLAGS" >&5 +echo "${ECHO_T}$CAIRO_CFLAGS" >&6 - { echo "$as_me:$LINENO: checking CAIRO_LIBS" >&5 -echo $ECHO_N "checking CAIRO_LIBS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking CAIRO_LIBS" >&5 +echo $ECHO_N "checking CAIRO_LIBS... $ECHO_C" >&6 CAIRO_LIBS=`$PKG_CONFIG --libs "cairo >= 1.0.2 "` - { echo "$as_me:$LINENO: result: $CAIRO_LIBS" >&5 -echo "${ECHO_T}$CAIRO_LIBS" >&6; } + echo "$as_me:$LINENO: result: $CAIRO_LIBS" >&5 +echo "${ECHO_T}$CAIRO_LIBS" >&6 else CAIRO_CFLAGS="" CAIRO_LIBS="" @@ -25051,8 +23415,8 @@ echo "$as_me: error: Cairo library requires fontconfig." >&2;} { (exit 1); exit 1; }; } fi if test "$with_system_xrender_headers" = "yes"; then - { echo "$as_me:$LINENO: checking whether Xrender.h defines PictStandardA8" >&5 -echo $ECHO_N "checking whether Xrender.h defines PictStandardA8... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking whether Xrender.h defines PictStandardA8" >&5 +echo $ECHO_N "checking whether Xrender.h defines PictStandardA8... $ECHO_C" >&6 if test "$cross_compiling" = yes; then { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling See \`config.log' for more details." >&5 @@ -25061,6 +23425,7 @@ See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -25079,27 +23444,18 @@ int main(int argc, char **argv) { _ACEOF rm -f 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>&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (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_try") 2>&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 @@ -25110,22 +23466,20 @@ sed 's/^/| /' conftest.$ac_ext >&5 echo "$as_me: error: no, X headers too old." >&2;} { (exit 1); exit 1; }; } fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - - fi else BUILD_TYPE="$BUILD_TYPE CAIRO" if test "$build_cpu" != "x86_64"; then BUILD_PIXMAN=YES fi - { echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi fi @@ -25136,26 +23490,27 @@ fi -{ echo "$as_me:$LINENO: checking whether to build the OpenGL Transitions component" >&5 -echo $ECHO_N "checking whether to build the OpenGL Transitions component... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to build the OpenGL Transitions component" >&5 +echo $ECHO_N "checking whether to build the OpenGL Transitions component... $ECHO_C" >&6 ENABLE_OPENGL= if test "x$enable_opengl" != "xno" ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 if test "${ac_cv_header_GL_gl_h+set}" = set; then - { echo "$as_me:$LINENO: checking for GL/gl.h" >&5 -echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for GL/gl.h" >&5 +echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6 if test "${ac_cv_header_GL_gl_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5 -echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5 +echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6 else # Is the header compilable? -{ echo "$as_me:$LINENO: checking GL/gl.h usability" >&5 -echo $ECHO_N "checking GL/gl.h usability... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking GL/gl.h usability" >&5 +echo $ECHO_N "checking GL/gl.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -25165,38 +23520,33 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 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_objext; then + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no +ac_header_compiler=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 # Is the header present? -{ echo "$as_me:$LINENO: checking GL/gl.h presence" >&5 -echo $ECHO_N "checking GL/gl.h presence... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking GL/gl.h presence" >&5 +echo $ECHO_N "checking GL/gl.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -25204,22 +23554,23 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -25227,45 +23578,52 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi - rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) +case $ac_header_compiler:$ac_header_preproc in + yes:no ) { echo "$as_me:$LINENO: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: GL/gl.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes + { echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; - no:yes:* ) + no:yes ) { echo "$as_me:$LINENO: WARNING: GL/gl.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: GL/gl.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: GL/gl.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: GL/gl.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: GL/gl.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: GL/gl.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: GL/gl.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: GL/gl.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/gl.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: GL/gl.h: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&2;} - + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for GL/gl.h" >&5 -echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for GL/gl.h" >&5 +echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6 if test "${ac_cv_header_GL_gl_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_GL_gl_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5 -echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5 +echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6 fi if test $ac_cv_header_GL_gl_h = yes; then @@ -25278,14 +23636,15 @@ fi -{ echo "$as_me:$LINENO: checking for main in -lGL" >&5 -echo $ECHO_N "checking for main in -lGL... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for main in -lGL" >&5 +echo $ECHO_N "checking for main in -lGL... $ECHO_C" >&6 if test "${ac_cv_lib_GL_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lGL $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -25296,43 +23655,35 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -return main (); +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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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 + (exit $ac_status); }; }; then ac_cv_lib_GL_main=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_GL_main=no +ac_cv_lib_GL_main=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_GL_main" >&5 -echo "${ECHO_T}$ac_cv_lib_GL_main" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_lib_GL_main" >&5 +echo "${ECHO_T}$ac_cv_lib_GL_main" >&6 if test $ac_cv_lib_GL_main = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBGL 1 @@ -25347,14 +23698,15 @@ echo "$as_me: error: libGL not installed or functional" >&2;} fi -{ echo "$as_me:$LINENO: checking for main in -lGLU" >&5 -echo $ECHO_N "checking for main in -lGLU... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for main in -lGLU" >&5 +echo $ECHO_N "checking for main in -lGLU... $ECHO_C" >&6 if test "${ac_cv_lib_GLU_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lGLU $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -25365,43 +23717,35 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -return main (); +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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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 + (exit $ac_status); }; }; then ac_cv_lib_GLU_main=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_GLU_main=no +ac_cv_lib_GLU_main=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_GLU_main" >&5 -echo "${ECHO_T}$ac_cv_lib_GLU_main" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_lib_GLU_main" >&5 +echo "${ECHO_T}$ac_cv_lib_GLU_main" >&6 if test $ac_cv_lib_GLU_main = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBGLU 1 @@ -25417,51 +23761,51 @@ fi ENABLE_OPENGL=TRUE else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -{ echo "$as_me:$LINENO: checking whether to build the Presentation Minimizer extension" >&5 -echo $ECHO_N "checking whether to build the Presentation Minimizer extension... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to build the Presentation Minimizer extension" >&5 +echo $ECHO_N "checking whether to build the Presentation Minimizer extension... $ECHO_C" >&6 if test -n "$enable_minimizer" -a "$enable_minimizer" != "no"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 ENABLE_MINIMIZER=YES else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 ENABLE_MINIMIZER=NO fi -{ echo "$as_me:$LINENO: checking whether to build the Presenter Screen extension" >&5 -echo $ECHO_N "checking whether to build the Presenter Screen extension... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to build the Presenter Screen extension" >&5 +echo $ECHO_N "checking whether to build the Presenter Screen extension... $ECHO_C" >&6 if test -n "$enable_presenter_console" -a "$enable_presenter_screen" != "no"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 ENABLE_PRESENTER_SCREEN=YES else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 ENABLE_PRESENTER_SCREEN=NO fi -{ echo "$as_me:$LINENO: checking whether to build the PDF Import extension" >&5 -echo $ECHO_N "checking whether to build the PDF Import extension... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to build the PDF Import extension" >&5 +echo $ECHO_N "checking whether to build the PDF Import extension... $ECHO_C" >&6 if test -n "$enable_pdfimport" -a "$enable_pdfimport" != "no"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 ENABLE_PDFIMPORT=YES - { echo "$as_me:$LINENO: checking which pdf backend to use" >&5 -echo $ECHO_N "checking which pdf backend to use... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking which pdf backend to use" >&5 +echo $ECHO_N "checking which pdf backend to use... $ECHO_C" >&6 if test -n "$with_system_poppler" -o -n "$with_system_libs" && \ test "$with_system_poppler" != "no"; then - { echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_POPPLER=YES succeeded=no @@ -25469,8 +23813,8 @@ echo "${ECHO_T}external" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -25485,29 +23829,28 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -25518,25 +23861,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { echo "$as_me:$LINENO: checking for poppler >= 0.8.0 " >&5 -echo $ECHO_N "checking for poppler >= 0.8.0 ... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for poppler >= 0.8.0 " >&5 +echo $ECHO_N "checking for poppler >= 0.8.0 ... $ECHO_C" >&6 if $PKG_CONFIG --exists "poppler >= 0.8.0 " ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { echo "$as_me:$LINENO: checking POPPLER_CFLAGS" >&5 -echo $ECHO_N "checking POPPLER_CFLAGS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking POPPLER_CFLAGS" >&5 +echo $ECHO_N "checking POPPLER_CFLAGS... $ECHO_C" >&6 POPPLER_CFLAGS=`$PKG_CONFIG --cflags "poppler >= 0.8.0 "` - { echo "$as_me:$LINENO: result: $POPPLER_CFLAGS" >&5 -echo "${ECHO_T}$POPPLER_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $POPPLER_CFLAGS" >&5 +echo "${ECHO_T}$POPPLER_CFLAGS" >&6 - { echo "$as_me:$LINENO: checking POPPLER_LIBS" >&5 -echo $ECHO_N "checking POPPLER_LIBS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking POPPLER_LIBS" >&5 +echo $ECHO_N "checking POPPLER_LIBS... $ECHO_C" >&6 POPPLER_LIBS=`$PKG_CONFIG --libs "poppler >= 0.8.0 "` - { echo "$as_me:$LINENO: result: $POPPLER_LIBS" >&5 -echo "${ECHO_T}$POPPLER_LIBS" >&6; } + echo "$as_me:$LINENO: result: $POPPLER_LIBS" >&5 +echo "${ECHO_T}$POPPLER_LIBS" >&6 else POPPLER_CFLAGS="" POPPLER_LIBS="" @@ -25563,15 +23906,15 @@ echo "$as_me: error: Library requirements (poppler >= 0.8.0 ) not met; consider fi else - { echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_POPPLER=NO BUILD_TYPE="$BUILD_TYPE XPDF" - { echo "$as_me:$LINENO: checking for xpdf module" >&5 -echo $ECHO_N "checking for xpdf module... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for xpdf module" >&5 +echo $ECHO_N "checking for xpdf module... $ECHO_C" >&6 if test -d ./xpdf; then - { echo "$as_me:$LINENO: result: OK" >&5 -echo "${ECHO_T}OK" >&6; } + echo "$as_me:$LINENO: result: OK" >&5 +echo "${ECHO_T}OK" >&6 else { { echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5 echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;} @@ -25579,8 +23922,8 @@ echo "$as_me: error: not existing. get it (did you get the -extensions tarball?) fi fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 ENABLE_PDFIMPORT=NO fi @@ -25589,11 +23932,11 @@ fi if test "$ENABLE_PRESENTER_SCREEN" = "YES" -o "$ENABLE_MINIMIZER" = "YES" -o "$ENABLE_PDFIMPORT" = "YES"; then - { echo "$as_me:$LINENO: checking for sdext module" >&5 -echo $ECHO_N "checking for sdext module... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for sdext module" >&5 +echo $ECHO_N "checking for sdext module... $ECHO_C" >&6 if test -d ./sdext; then - { echo "$as_me:$LINENO: result: OK" >&5 -echo "${ECHO_T}OK" >&6; } + echo "$as_me:$LINENO: result: OK" >&5 +echo "${ECHO_T}OK" >&6 else { { echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5 echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;} @@ -25602,16 +23945,16 @@ echo "$as_me: error: not existing. get it (did you get the -extensions tarball?) BUILD_TYPE="$BUILD_TYPE SDEXT" fi -{ echo "$as_me:$LINENO: checking whether to build the Wiki Publisher extension" >&5 -echo $ECHO_N "checking whether to build the Wiki Publisher extension... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to build the Wiki Publisher extension" >&5 +echo $ECHO_N "checking whether to build the Wiki Publisher extension... $ECHO_C" >&6 if test -n "$enable_wiki_publisher" -a "$enable_wiki_publisher" != "no" && test "$WITH_JAVA" != "no"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - { echo "$as_me:$LINENO: checking for swext module" >&5 -echo $ECHO_N "checking for swext module... $ECHO_C" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + echo "$as_me:$LINENO: checking for swext module" >&5 +echo $ECHO_N "checking for swext module... $ECHO_C" >&6 if test -d ./swext; then - { echo "$as_me:$LINENO: result: OK" >&5 -echo "${ECHO_T}OK" >&6; } + echo "$as_me:$LINENO: result: OK" >&5 +echo "${ECHO_T}OK" >&6 else { { echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5 echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;} @@ -25620,26 +23963,26 @@ echo "$as_me: error: not existing. get it (did you get the -extensions tarball?) ENABLE_MEDIAWIKI=YES BUILD_TYPE="$BUILD_TYPE SWEXT" else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 ENABLE_MEDIAWIKI=NO fi if test "$ENABLE_MEDIAWIKI" == "YES"; then - { echo "$as_me:$LINENO: checking which Servlet API Jar to use" >&5 -echo $ECHO_N "checking which Servlet API Jar to use... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking which Servlet API Jar to use" >&5 +echo $ECHO_N "checking which Servlet API Jar to use... $ECHO_C" >&6 if test -n "$with_system_servlet_api"; then - { echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_SERVLETAPI=YES if test -z "$SERVLETAPI_JAR"; then SERVLETAPI_JAR=/usr/share/java/servlet-api.jar fi as_ac_File=`echo "ac_cv_file_$SERVLETAPI_JAR" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $SERVLETAPI_JAR" >&5 -echo $ECHO_N "checking for $SERVLETAPI_JAR... $ECHO_C" >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then +echo "$as_me:$LINENO: checking for $SERVLETAPI_JAR" >&5 +echo $ECHO_N "checking for $SERVLETAPI_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && @@ -25652,9 +23995,8 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval echo '${'$as_ac_File'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 if test `eval echo '${'$as_ac_File'}'` = yes; then : else @@ -25664,8 +24006,8 @@ echo "$as_me: error: servlet-api.jar not found." >&2;} fi else - { echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_SERVLETAPI=NO BUILD_TYPE="$BUILD_TYPE TOMCAT" fi @@ -25673,35 +24015,35 @@ fi -{ echo "$as_me:$LINENO: checking whether to build the Report Builder extension" >&5 -echo $ECHO_N "checking whether to build the Report Builder extension... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to build the Report Builder extension" >&5 +echo $ECHO_N "checking whether to build the Report Builder extension... $ECHO_C" >&6 if test -n "$enable_report_builder" -a "$enable_report_builder" != "no" && test "$WITH_JAVA" != "no"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 ENABLE_REPORTBUILDER=YES - { echo "$as_me:$LINENO: checking for reportbuilder module" >&5 -echo $ECHO_N "checking for reportbuilder module... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for reportbuilder module" >&5 +echo $ECHO_N "checking for reportbuilder module... $ECHO_C" >&6 if test -d ./reportbuilder; then - { echo "$as_me:$LINENO: result: OK" >&5 -echo "${ECHO_T}OK" >&6; } + echo "$as_me:$LINENO: result: OK" >&5 +echo "${ECHO_T}OK" >&6 else { { echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5 echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;} { (exit 1); exit 1; }; } fi - { echo "$as_me:$LINENO: checking which jfreereport libs to use" >&5 -echo $ECHO_N "checking which jfreereport libs to use... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking which jfreereport libs to use" >&5 +echo $ECHO_N "checking which jfreereport libs to use... $ECHO_C" >&6 if test "$with_system_jfreereport" == "yes"; then SYSTEM_JFREEREPORT=YES - { echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 if test -z $SAC_JAR; then SAC_JAR=/usr/share/java/sac.jar fi as_ac_File=`echo "ac_cv_file_$SAC_JAR" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $SAC_JAR" >&5 -echo $ECHO_N "checking for $SAC_JAR... $ECHO_C" >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then +echo "$as_me:$LINENO: checking for $SAC_JAR" >&5 +echo $ECHO_N "checking for $SAC_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && @@ -25714,9 +24056,8 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval echo '${'$as_ac_File'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 if test `eval echo '${'$as_ac_File'}'` = yes; then : else @@ -25727,8 +24068,8 @@ fi if test -z $LIBXML_JAR; then - { echo "$as_me:$LINENO: checking for /usr/share/java/libxml-1.0.0.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/libxml-1.0.0.jar... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for /usr/share/java/libxml-1.0.0.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libxml-1.0.0.jar... $ECHO_C" >&6 if test "${ac_cv_file__usr_share_java_libxml_1_0_0_jar+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -25742,14 +24083,14 @@ else ac_cv_file__usr_share_java_libxml_1_0_0_jar=no fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libxml_1_0_0_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_libxml_1_0_0_jar" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libxml_1_0_0_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libxml_1_0_0_jar" >&6 if test $ac_cv_file__usr_share_java_libxml_1_0_0_jar = yes; then LIBXML_JAR=/usr/share/java/libxml-1.0.0.jar else - { echo "$as_me:$LINENO: checking for /usr/share/java/libxml.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/libxml.jar... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for /usr/share/java/libxml.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libxml.jar... $ECHO_C" >&6 if test "${ac_cv_file__usr_share_java_libxml_jar+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -25763,8 +24104,8 @@ else ac_cv_file__usr_share_java_libxml_jar=no fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libxml_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_libxml_jar" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libxml_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libxml_jar" >&6 if test $ac_cv_file__usr_share_java_libxml_jar = yes; then LIBXML_JAR=/usr/share/java/libxml.jar else @@ -25780,9 +24121,9 @@ fi else as_ac_File=`echo "ac_cv_file_$LIBXML_JAR" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $LIBXML_JAR" >&5 -echo $ECHO_N "checking for $LIBXML_JAR... $ECHO_C" >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then +echo "$as_me:$LINENO: checking for $LIBXML_JAR" >&5 +echo $ECHO_N "checking for $LIBXML_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && @@ -25795,9 +24136,8 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval echo '${'$as_ac_File'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 if test `eval echo '${'$as_ac_File'}'` = yes; then : else @@ -25809,8 +24149,8 @@ fi fi if test -z $FLUTE_JAR; then - { echo "$as_me:$LINENO: checking for /usr/share/java/flute-1.3.0.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/flute-1.3.0.jar... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for /usr/share/java/flute-1.3.0.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/flute-1.3.0.jar... $ECHO_C" >&6 if test "${ac_cv_file__usr_share_java_flute_1_3_0_jar+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -25824,14 +24164,14 @@ else ac_cv_file__usr_share_java_flute_1_3_0_jar=no fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flute_1_3_0_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_flute_1_3_0_jar" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flute_1_3_0_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_flute_1_3_0_jar" >&6 if test $ac_cv_file__usr_share_java_flute_1_3_0_jar = yes; then FLUTE_JAR=/usr/share/java/flute-1.3.0.jar else - { echo "$as_me:$LINENO: checking for /usr/share/java/flute.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/flute.jar... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for /usr/share/java/flute.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/flute.jar... $ECHO_C" >&6 if test "${ac_cv_file__usr_share_java_flute_jar+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -25845,8 +24185,8 @@ else ac_cv_file__usr_share_java_flute_jar=no fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flute_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_flute_jar" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flute_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_flute_jar" >&6 if test $ac_cv_file__usr_share_java_flute_jar = yes; then FLUTE_JAR=/usr/share/java/flute.jar else @@ -25862,9 +24202,9 @@ fi else as_ac_File=`echo "ac_cv_file_$FLUTE_JAR" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $FLUTE_JAR" >&5 -echo $ECHO_N "checking for $FLUTE_JAR... $ECHO_C" >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then +echo "$as_me:$LINENO: checking for $FLUTE_JAR" >&5 +echo $ECHO_N "checking for $FLUTE_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && @@ -25877,9 +24217,8 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval echo '${'$as_ac_File'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 if test `eval echo '${'$as_ac_File'}'` = yes; then : else @@ -25891,8 +24230,8 @@ fi fi if test -z $JFREEREPORT_JAR; then - { echo "$as_me:$LINENO: checking for /usr/share/java/flow-engine-0.9.2.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/flow-engine-0.9.2.jar... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for /usr/share/java/flow-engine-0.9.2.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/flow-engine-0.9.2.jar... $ECHO_C" >&6 if test "${ac_cv_file__usr_share_java_flow_engine_0_9_2_jar+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -25906,14 +24245,14 @@ else ac_cv_file__usr_share_java_flow_engine_0_9_2_jar=no fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flow_engine_0_9_2_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_flow_engine_0_9_2_jar" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flow_engine_0_9_2_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_flow_engine_0_9_2_jar" >&6 if test $ac_cv_file__usr_share_java_flow_engine_0_9_2_jar = yes; then JFREEREPORT_JAR=/usr/share/java/flow-engine-0.9.2.jar else - { echo "$as_me:$LINENO: checking for /usr/share/java/flow-engine.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/flow-engine.jar... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for /usr/share/java/flow-engine.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/flow-engine.jar... $ECHO_C" >&6 if test "${ac_cv_file__usr_share_java_flow_engine_jar+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -25927,8 +24266,8 @@ else ac_cv_file__usr_share_java_flow_engine_jar=no fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flow_engine_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_flow_engine_jar" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flow_engine_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_flow_engine_jar" >&6 if test $ac_cv_file__usr_share_java_flow_engine_jar = yes; then JFREEREPORT_JAR=/usr/share/java/flow-engine.jar else @@ -25944,9 +24283,9 @@ fi else as_ac_File=`echo "ac_cv_file_$JFREEREPORT_JAR" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $JFREEREPORT_JAR" >&5 -echo $ECHO_N "checking for $JFREEREPORT_JAR... $ECHO_C" >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then +echo "$as_me:$LINENO: checking for $JFREEREPORT_JAR" >&5 +echo $ECHO_N "checking for $JFREEREPORT_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && @@ -25959,9 +24298,8 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval echo '${'$as_ac_File'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 if test `eval echo '${'$as_ac_File'}'` = yes; then : else @@ -25973,8 +24311,8 @@ fi fi if test -z $LIBLAYOUT_JAR; then - { echo "$as_me:$LINENO: checking for /usr/share/java/liblayout-0.2.9.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/liblayout-0.2.9.jar... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for /usr/share/java/liblayout-0.2.9.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/liblayout-0.2.9.jar... $ECHO_C" >&6 if test "${ac_cv_file__usr_share_java_liblayout_0_2_9_jar+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -25988,14 +24326,14 @@ else ac_cv_file__usr_share_java_liblayout_0_2_9_jar=no fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_liblayout_0_2_9_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_liblayout_0_2_9_jar" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_liblayout_0_2_9_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_liblayout_0_2_9_jar" >&6 if test $ac_cv_file__usr_share_java_liblayout_0_2_9_jar = yes; then LIBLAYOUT_JAR=/usr/share/java/liblayout-0.2.9.jar else - { echo "$as_me:$LINENO: checking for /usr/share/java/liblayout.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/liblayout.jar... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for /usr/share/java/liblayout.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/liblayout.jar... $ECHO_C" >&6 if test "${ac_cv_file__usr_share_java_liblayout_jar+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26009,8 +24347,8 @@ else ac_cv_file__usr_share_java_liblayout_jar=no fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_liblayout_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_liblayout_jar" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_liblayout_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_liblayout_jar" >&6 if test $ac_cv_file__usr_share_java_liblayout_jar = yes; then LIBLAYOUT_JAR=/usr/share/java/liblayout.jar else @@ -26026,9 +24364,9 @@ fi else as_ac_File=`echo "ac_cv_file_$LIBLAYOUT_JAR" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $LIBLAYOUT_JAR" >&5 -echo $ECHO_N "checking for $LIBLAYOUT_JAR... $ECHO_C" >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then +echo "$as_me:$LINENO: checking for $LIBLAYOUT_JAR" >&5 +echo $ECHO_N "checking for $LIBLAYOUT_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && @@ -26041,9 +24379,8 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval echo '${'$as_ac_File'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 if test `eval echo '${'$as_ac_File'}'` = yes; then : else @@ -26055,8 +24392,8 @@ fi fi if test -z $LIBLOADER_JAR; then - { echo "$as_me:$LINENO: checking for /usr/share/java/libloader-1.0.0.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/libloader-1.0.0.jar... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for /usr/share/java/libloader-1.0.0.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libloader-1.0.0.jar... $ECHO_C" >&6 if test "${ac_cv_file__usr_share_java_libloader_1_0_0_jar+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26070,14 +24407,14 @@ else ac_cv_file__usr_share_java_libloader_1_0_0_jar=no fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libloader_1_0_0_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_libloader_1_0_0_jar" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libloader_1_0_0_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libloader_1_0_0_jar" >&6 if test $ac_cv_file__usr_share_java_libloader_1_0_0_jar = yes; then LIBLOADER_JAR=/usr/share/java/libloader-1.0.0.jar else - { echo "$as_me:$LINENO: checking for /usr/share/java/libloader.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/libloader.jar... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for /usr/share/java/libloader.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libloader.jar... $ECHO_C" >&6 if test "${ac_cv_file__usr_share_java_libloader_jar+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26091,8 +24428,8 @@ else ac_cv_file__usr_share_java_libloader_jar=no fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libloader_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_libloader_jar" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libloader_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libloader_jar" >&6 if test $ac_cv_file__usr_share_java_libloader_jar = yes; then LIBLOADER_JAR=/usr/share/java/libloader.jar else @@ -26108,9 +24445,9 @@ fi else as_ac_File=`echo "ac_cv_file_$LIBLOADER_JAR" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $LIBLOADER_JAR" >&5 -echo $ECHO_N "checking for $LIBLOADER_JAR... $ECHO_C" >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then +echo "$as_me:$LINENO: checking for $LIBLOADER_JAR" >&5 +echo $ECHO_N "checking for $LIBLOADER_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && @@ -26123,9 +24460,8 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval echo '${'$as_ac_File'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 if test `eval echo '${'$as_ac_File'}'` = yes; then : else @@ -26137,8 +24473,8 @@ fi fi if test -z $LIBFORMULA_JAR; then - { echo "$as_me:$LINENO: checking for /usr/share/java/libformula-0.2.0.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/libformula-0.2.0.jar... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for /usr/share/java/libformula-0.2.0.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libformula-0.2.0.jar... $ECHO_C" >&6 if test "${ac_cv_file__usr_share_java_libformula_0_2_0_jar+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26152,14 +24488,14 @@ else ac_cv_file__usr_share_java_libformula_0_2_0_jar=no fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libformula_0_2_0_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_libformula_0_2_0_jar" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libformula_0_2_0_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libformula_0_2_0_jar" >&6 if test $ac_cv_file__usr_share_java_libformula_0_2_0_jar = yes; then LIBFORMULA_JAR=/usr/share/java/libformula-0.2.0.jar else - { echo "$as_me:$LINENO: checking for /usr/share/java/libformula.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/libformula.jar... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for /usr/share/java/libformula.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libformula.jar... $ECHO_C" >&6 if test "${ac_cv_file__usr_share_java_libformula_jar+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26173,8 +24509,8 @@ else ac_cv_file__usr_share_java_libformula_jar=no fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libformula_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_libformula_jar" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libformula_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libformula_jar" >&6 if test $ac_cv_file__usr_share_java_libformula_jar = yes; then LIBFORMULA_JAR=/usr/share/java/libformula.jar else @@ -26190,9 +24526,9 @@ fi else as_ac_File=`echo "ac_cv_file_$LIBFORMULA_JAR" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $LIBFORMULA_JAR" >&5 -echo $ECHO_N "checking for $LIBFORMULA_JAR... $ECHO_C" >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then +echo "$as_me:$LINENO: checking for $LIBFORMULA_JAR" >&5 +echo $ECHO_N "checking for $LIBFORMULA_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && @@ -26205,9 +24541,8 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval echo '${'$as_ac_File'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 if test `eval echo '${'$as_ac_File'}'` = yes; then : else @@ -26219,8 +24554,8 @@ fi fi if test -z $LIBREPOSITORY_JAR; then - { echo "$as_me:$LINENO: checking for /usr/share/java/librepository-1.0.0.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/librepository-1.0.0.jar... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for /usr/share/java/librepository-1.0.0.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/librepository-1.0.0.jar... $ECHO_C" >&6 if test "${ac_cv_file__usr_share_java_librepository_1_0_0_jar+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26234,14 +24569,14 @@ else ac_cv_file__usr_share_java_librepository_1_0_0_jar=no fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_librepository_1_0_0_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_librepository_1_0_0_jar" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_librepository_1_0_0_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_librepository_1_0_0_jar" >&6 if test $ac_cv_file__usr_share_java_librepository_1_0_0_jar = yes; then LIBREPOSITORY_JAR=/usr/share/java/librepository-1.0.0.jar else - { echo "$as_me:$LINENO: checking for /usr/share/java/librepository.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/librepository.jar... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for /usr/share/java/librepository.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/librepository.jar... $ECHO_C" >&6 if test "${ac_cv_file__usr_share_java_librepository_jar+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26255,8 +24590,8 @@ else ac_cv_file__usr_share_java_librepository_jar=no fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_librepository_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_librepository_jar" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_librepository_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_librepository_jar" >&6 if test $ac_cv_file__usr_share_java_librepository_jar = yes; then LIBREPOSITORY_JAR=/usr/share/java/librepository.jar else @@ -26272,9 +24607,9 @@ fi else as_ac_File=`echo "ac_cv_file_$LIBREPOSITORY_JAR" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $LIBREPOSITORY_JAR" >&5 -echo $ECHO_N "checking for $LIBREPOSITORY_JAR... $ECHO_C" >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then +echo "$as_me:$LINENO: checking for $LIBREPOSITORY_JAR" >&5 +echo $ECHO_N "checking for $LIBREPOSITORY_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && @@ -26287,9 +24622,8 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval echo '${'$as_ac_File'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 if test `eval echo '${'$as_ac_File'}'` = yes; then : else @@ -26301,8 +24635,8 @@ fi fi if test -z $LIBFONTS_JAR; then - { echo "$as_me:$LINENO: checking for /usr/share/java/libfonts-1.0.0.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/libfonts-1.0.0.jar... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for /usr/share/java/libfonts-1.0.0.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libfonts-1.0.0.jar... $ECHO_C" >&6 if test "${ac_cv_file__usr_share_java_libfonts_1_0_0_jar+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26316,14 +24650,14 @@ else ac_cv_file__usr_share_java_libfonts_1_0_0_jar=no fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libfonts_1_0_0_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_libfonts_1_0_0_jar" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libfonts_1_0_0_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libfonts_1_0_0_jar" >&6 if test $ac_cv_file__usr_share_java_libfonts_1_0_0_jar = yes; then LIBFONTS_JAR=/usr/share/java/libfonts-1.0.0.jar else - { echo "$as_me:$LINENO: checking for /usr/share/java/libfonts.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/libfonts.jar... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for /usr/share/java/libfonts.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libfonts.jar... $ECHO_C" >&6 if test "${ac_cv_file__usr_share_java_libfonts_jar+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26337,8 +24671,8 @@ else ac_cv_file__usr_share_java_libfonts_jar=no fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libfonts_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_libfonts_jar" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libfonts_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libfonts_jar" >&6 if test $ac_cv_file__usr_share_java_libfonts_jar = yes; then LIBFONTS_JAR=/usr/share/java/libfonts.jar else @@ -26354,9 +24688,9 @@ fi else as_ac_File=`echo "ac_cv_file_$LIBFONTS_JAR" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $LIBFONTS_JAR" >&5 -echo $ECHO_N "checking for $LIBFONTS_JAR... $ECHO_C" >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then +echo "$as_me:$LINENO: checking for $LIBFONTS_JAR" >&5 +echo $ECHO_N "checking for $LIBFONTS_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && @@ -26369,9 +24703,8 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval echo '${'$as_ac_File'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 if test `eval echo '${'$as_ac_File'}'` = yes; then : else @@ -26383,8 +24716,8 @@ fi fi if test -z $LIBSERIALIZER_JAR; then - { echo "$as_me:$LINENO: checking for /usr/share/java/libserializer-1.0.0.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/libserializer-1.0.0.jar... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for /usr/share/java/libserializer-1.0.0.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libserializer-1.0.0.jar... $ECHO_C" >&6 if test "${ac_cv_file__usr_share_java_libserializer_1_0_0_jar+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26398,14 +24731,14 @@ else ac_cv_file__usr_share_java_libserializer_1_0_0_jar=no fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libserializer_1_0_0_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_libserializer_1_0_0_jar" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libserializer_1_0_0_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libserializer_1_0_0_jar" >&6 if test $ac_cv_file__usr_share_java_libserializer_1_0_0_jar = yes; then LIBSERIALIZER_JAR=/usr/share/java/libserializer-1.0.0.jar else - { echo "$as_me:$LINENO: checking for /usr/share/java/libserializer.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/libserializer.jar... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for /usr/share/java/libserializer.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libserializer.jar... $ECHO_C" >&6 if test "${ac_cv_file__usr_share_java_libserializer_jar+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26419,8 +24752,8 @@ else ac_cv_file__usr_share_java_libserializer_jar=no fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libserializer_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_libserializer_jar" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libserializer_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libserializer_jar" >&6 if test $ac_cv_file__usr_share_java_libserializer_jar = yes; then LIBSERIALIZER_JAR=/usr/share/java/libserializer.jar else @@ -26436,9 +24769,9 @@ fi else as_ac_File=`echo "ac_cv_file_$LIBSERIALIZER_JAR" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $LIBSERIALIZER_JAR" >&5 -echo $ECHO_N "checking for $LIBSERIALIZER_JAR... $ECHO_C" >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then +echo "$as_me:$LINENO: checking for $LIBSERIALIZER_JAR" >&5 +echo $ECHO_N "checking for $LIBSERIALIZER_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && @@ -26451,9 +24784,8 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval echo '${'$as_ac_File'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 if test `eval echo '${'$as_ac_File'}'` = yes; then : else @@ -26466,8 +24798,8 @@ fi if test -z $LIBBASE_JAR; then - { echo "$as_me:$LINENO: checking for /usr/share/java/libbase-1.0.0.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/libbase-1.0.0.jar... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for /usr/share/java/libbase-1.0.0.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libbase-1.0.0.jar... $ECHO_C" >&6 if test "${ac_cv_file__usr_share_java_libbase_1_0_0_jar+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26481,14 +24813,14 @@ else ac_cv_file__usr_share_java_libbase_1_0_0_jar=no fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libbase_1_0_0_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_libbase_1_0_0_jar" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libbase_1_0_0_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libbase_1_0_0_jar" >&6 if test $ac_cv_file__usr_share_java_libbase_1_0_0_jar = yes; then LIBBASE_JAR=/usr/share/java/libbase-1.0.0.jar else - { echo "$as_me:$LINENO: checking for /usr/share/java/libbase.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/libbase.jar... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for /usr/share/java/libbase.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libbase.jar... $ECHO_C" >&6 if test "${ac_cv_file__usr_share_java_libbase_jar+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26502,8 +24834,8 @@ else ac_cv_file__usr_share_java_libbase_jar=no fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libbase_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_libbase_jar" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libbase_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libbase_jar" >&6 if test $ac_cv_file__usr_share_java_libbase_jar = yes; then LIBBASE_JAR=/usr/share/java/libbase.jar else @@ -26519,9 +24851,9 @@ fi else as_ac_File=`echo "ac_cv_file_$LIBBASE_JAR" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $LIBBASE_JAR" >&5 -echo $ECHO_N "checking for $LIBBASE_JAR... $ECHO_C" >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then +echo "$as_me:$LINENO: checking for $LIBBASE_JAR" >&5 +echo $ECHO_N "checking for $LIBBASE_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && @@ -26534,9 +24866,8 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval echo '${'$as_ac_File'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 if test `eval echo '${'$as_ac_File'}'` = yes; then : else @@ -26548,13 +24879,13 @@ fi fi else - { echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6; } - { echo "$as_me:$LINENO: checking for jfreereport module" >&5 -echo $ECHO_N "checking for jfreereport module... $ECHO_C" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 + echo "$as_me:$LINENO: checking for jfreereport module" >&5 +echo $ECHO_N "checking for jfreereport module... $ECHO_C" >&6 if test -d ./jfreereport; then - { echo "$as_me:$LINENO: result: OK" >&5 -echo "${ECHO_T}OK" >&6; } + echo "$as_me:$LINENO: result: OK" >&5 +echo "${ECHO_T}OK" >&6 else { { echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5 echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;} @@ -26565,8 +24896,8 @@ echo "$as_me: error: not existing. get it (did you get the -extensions tarball?) fi BUILD_TYPE="$BUILD_TYPE REPORTBUILDER" else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 ENABLE_REPORTBUILDER=NO SYSTEM_JFREEREPORT=NO fi @@ -26587,20 +24918,20 @@ fi # this has to be here because both the wiki publisher and the SRB use # commons-logging if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then - { echo "$as_me:$LINENO: checking which Apache commons-* libs to use" >&5 -echo $ECHO_N "checking which Apache commons-* libs to use... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking which Apache commons-* libs to use" >&5 +echo $ECHO_N "checking which Apache commons-* libs to use... $ECHO_C" >&6 if test "$with_system_apache_commons" = "yes"; then SYSTEM_APACHE_COMMONS=YES - { echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 if test "$ENABLE_MEDIAWIKI" = "YES"; then if test -z "$COMMONS_CODEC_JAR"; then COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar fi as_ac_File=`echo "ac_cv_file_$COMMONS_CODEC_JAR" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $COMMONS_CODEC_JAR" >&5 -echo $ECHO_N "checking for $COMMONS_CODEC_JAR... $ECHO_C" >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then +echo "$as_me:$LINENO: checking for $COMMONS_CODEC_JAR" >&5 +echo $ECHO_N "checking for $COMMONS_CODEC_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && @@ -26613,9 +24944,8 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval echo '${'$as_ac_File'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 if test `eval echo '${'$as_ac_File'}'` = yes; then : else @@ -26628,9 +24958,9 @@ fi COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.3.jar fi as_ac_File=`echo "ac_cv_file_$COMMONS_LANG_JAR" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $COMMONS_LANG_JAR" >&5 -echo $ECHO_N "checking for $COMMONS_LANG_JAR... $ECHO_C" >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then +echo "$as_me:$LINENO: checking for $COMMONS_LANG_JAR" >&5 +echo $ECHO_N "checking for $COMMONS_LANG_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && @@ -26643,9 +24973,8 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval echo '${'$as_ac_File'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 if test `eval echo '${'$as_ac_File'}'` = yes; then : else @@ -26658,9 +24987,9 @@ fi COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient-3.1.jar fi as_ac_File=`echo "ac_cv_file_$COMMONS_HTTPCLIENT_JAR" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $COMMONS_HTTPCLIENT_JAR" >&5 -echo $ECHO_N "checking for $COMMONS_HTTPCLIENT_JAR... $ECHO_C" >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then +echo "$as_me:$LINENO: checking for $COMMONS_HTTPCLIENT_JAR" >&5 +echo $ECHO_N "checking for $COMMONS_HTTPCLIENT_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && @@ -26673,9 +25002,8 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval echo '${'$as_ac_File'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 if test `eval echo '${'$as_ac_File'}'` = yes; then : else @@ -26690,9 +25018,9 @@ fi COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar fi as_ac_File=`echo "ac_cv_file_$COMMONS_LOGGING_JAR" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $COMMONS_LOGGING_JAR" >&5 -echo $ECHO_N "checking for $COMMONS_LOGGING_JAR... $ECHO_C" >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then +echo "$as_me:$LINENO: checking for $COMMONS_LOGGING_JAR" >&5 +echo $ECHO_N "checking for $COMMONS_LOGGING_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && @@ -26705,9 +25033,8 @@ else eval "$as_ac_File=no" fi fi -ac_res=`eval echo '${'$as_ac_File'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 if test `eval echo '${'$as_ac_File'}'` = yes; then : else @@ -26719,8 +25046,8 @@ fi fi else - { echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_APACHE_COMMONS=NO BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT" fi @@ -26752,11 +25079,11 @@ if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE" ; then fi fi if test "$build_cpu" != "x86_64" ; then - kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes" - kde_libdirs="/usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib $x_libraries" + kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /opt/kde3/include /opt/kde/include $x_includes" + kde_libdirs="/usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib /usr/lib $x_libraries" else - kde_incdirs="/usr/lib64/kde/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes" - kde_libdirs="/usr/lib64/kde/lib64 /usr/local/kde/lib64 /usr/kde/lib64 /usr/lib64/kde /usr/lib64/kde3 /usr/lib64 /usr/X11R6/lib64 /usr/local/lib64 /opt/kde3/lib64 /opt/kde/lib64 /usr/X11R6/kde/lib64 /usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib $x_libraries" + kde_incdirs="/usr/lib64/kde/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /opt/kde3/include /opt/kde/include $x_includes" + kde_libdirs="/usr/lib64/kde/lib64 /usr/local/kde/lib64 /usr/kde/lib64 /usr/lib64/kde /usr/lib64/kde3 /usr/X11R6/lib64 /usr/local/lib64 /opt/kde3/lib64 /opt/kde/lib64 /usr/X11R6/kde/lib64 /usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib /usr/lib64 $x_libraries" fi if test -n "$KDEDIR" ; then kde_incdirs="$KDEDIR/include $kde_incdirs" @@ -26772,8 +25099,8 @@ if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE" ; then kde_test_include="ksharedptr.h" kde_test_library="libkdeui.so" - { echo "$as_me:$LINENO: checking for Qt headers" >&5 -echo $ECHO_N "checking for Qt headers... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for Qt headers" >&5 +echo $ECHO_N "checking for Qt headers... $ECHO_C" >&6 qt_incdir="no" for kde_check in $qt_incdirs ; do if test -r "$kde_check/$qt_test_include" ; then @@ -26781,8 +25108,8 @@ echo $ECHO_N "checking for Qt headers... $ECHO_C" >&6; } break fi done - { echo "$as_me:$LINENO: result: $qt_incdir" >&5 -echo "${ECHO_T}$qt_incdir" >&6; } + echo "$as_me:$LINENO: result: $qt_incdir" >&5 +echo "${ECHO_T}$qt_incdir" >&6 if test "x$qt_incdir" = "xno" ; then { { echo "$as_me:$LINENO: error: Qt headers not found. Please specify the root of your Qt installation by exporting QTDIR before running \"configure\"." >&5 @@ -26791,8 +25118,8 @@ your Qt installation by exporting QTDIR before running \"configure\"." >&2;} { (exit 1); exit 1; }; } fi - { echo "$as_me:$LINENO: checking for Qt libraries" >&5 -echo $ECHO_N "checking for Qt libraries... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for Qt libraries" >&5 +echo $ECHO_N "checking for Qt libraries... $ECHO_C" >&6 qt_libdir="no" for qt_check in $qt_libdirs ; do if test -r "$qt_check/$qt_test_library" ; then @@ -26800,8 +25127,8 @@ echo $ECHO_N "checking for Qt libraries... $ECHO_C" >&6; } break fi done - { echo "$as_me:$LINENO: result: $qt_libdir" >&5 -echo "${ECHO_T}$qt_libdir" >&6; } + echo "$as_me:$LINENO: result: $qt_libdir" >&5 +echo "${ECHO_T}$qt_libdir" >&6 if test "x$qt_libdir" = "xno" ; then { { echo "$as_me:$LINENO: error: Qt libraries not found. Please specify the root of your Qt installation by exporting QTDIR before running \"configure\"." >&5 @@ -26810,10 +25137,10 @@ your Qt installation by exporting QTDIR before running \"configure\"." >&2;} { (exit 1); exit 1; }; } fi - # Extract the first word of "moc", so it can be a program name with args. + # Extract the first word of "moc", so it can be a program name with args. set dummy moc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_MOC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26829,39 +25156,38 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MOC="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS test -z "$ac_cv_path_MOC" && ac_cv_path_MOC="no" ;; esac fi MOC=$ac_cv_path_MOC + if test -n "$MOC"; then - { echo "$as_me:$LINENO: result: $MOC" >&5 -echo "${ECHO_T}$MOC" >&6; } + echo "$as_me:$LINENO: result: $MOC" >&5 +echo "${ECHO_T}$MOC" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test "$MOC" = "no" ; then { { echo "$as_me:$LINENO: error: Qt Meta Object Compiler not found. Please specify the root of your Qt installation by exporting QTDIR before running \"configure\"." >&5 echo "$as_me: error: Qt Meta Object Compiler not found. Please specify the root of your Qt installation by exporting QTDIR before running \"configure\"." >&2;} { (exit 1); exit 1; }; } - fi + fi - { echo "$as_me:$LINENO: checking for KDE headers" >&5 -echo $ECHO_N "checking for KDE headers... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for KDE headers" >&5 +echo $ECHO_N "checking for KDE headers... $ECHO_C" >&6 kde_incdir="no" for kde_check in $kde_incdirs ; do if test -r "$kde_check/$kde_test_include" ; then @@ -26869,8 +25195,8 @@ echo $ECHO_N "checking for KDE headers... $ECHO_C" >&6; } break fi done - { echo "$as_me:$LINENO: result: $kde_incdir" >&5 -echo "${ECHO_T}$kde_incdir" >&6; } + echo "$as_me:$LINENO: result: $kde_incdir" >&5 +echo "${ECHO_T}$kde_incdir" >&6 if test "x$kde_incdir" = "xno" ; then { { echo "$as_me:$LINENO: error: KDE headers not found. Please specify the root of your KDE installation by exporting KDEDIR before running \"configure\"." >&5 @@ -26879,8 +25205,8 @@ your KDE installation by exporting KDEDIR before running \"configure\"." >&2;} { (exit 1); exit 1; }; } fi - { echo "$as_me:$LINENO: checking for KDE libraries" >&5 -echo $ECHO_N "checking for KDE libraries... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for KDE libraries" >&5 +echo $ECHO_N "checking for KDE libraries... $ECHO_C" >&6 kde_libdir="no" for kde_check in $kde_libdirs ; do if test -r "$kde_check/$kde_test_library" ; then @@ -26888,8 +25214,8 @@ echo $ECHO_N "checking for KDE libraries... $ECHO_C" >&6; } break fi done - { echo "$as_me:$LINENO: result: $kde_libdir" >&5 -echo "${ECHO_T}$kde_libdir" >&6; } + echo "$as_me:$LINENO: result: $kde_libdir" >&5 +echo "${ECHO_T}$kde_libdir" >&6 if test "x$kde_libdir" = "xno" ; then { { echo "$as_me:$LINENO: error: KDE libraries not found. Please specify the root of your KDE installation by exporting KDEDIR before running \"configure\"." >&5 @@ -26905,32 +25231,181 @@ fi -{ echo "$as_me:$LINENO: checking whether to enable the lockdown pieces" >&5 -echo $ECHO_N "checking whether to enable the lockdown pieces... $ECHO_C" >&6; } + +KDE4_CFLAGS="" +KDE4_LIBS="" +MOC4="moc" +if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then + qt_incdirs="$QTINC $QTDIR /usr/include/qt4 /usr/include $x_includes" + qt_libdirs="$QTLIB /usr/lib $x_libraries" + + kde_incdirs="/usr/include $x_includes" + kde_libdirs="/usr/lib $x_libraries" + + if test "$build_cpu" == "x86_64" ; then + qt_libdirs="$qt_libdirs /usr/lib64/qt4 /usr/lib64/qt /usr/lib64" + kde_libdirs="$kde_libdirs /usr/lib64 /usr/lib64/kde4" + fi + + qt_test_include="Qt/qobject.h" + qt_test_library="libQtCore.so" + kde_test_include="ksharedptr.h" + kde_test_library="libkdeui.so" + + echo "$as_me:$LINENO: checking for Qt4 headers" >&5 +echo $ECHO_N "checking for Qt4 headers... $ECHO_C" >&6 + qt_header_dir="no" + for inc_dir in $qt_incdirs ; do + if test -r "$inc_dir/$qt_test_include" ; then + qt_header_dir="$inc_dir" + break + fi + done + + echo "$as_me:$LINENO: result: $qt_header_dir" >&5 +echo "${ECHO_T}$qt_header_dir" >&6 + if test "x$qt_header_dir" = "xno" ; then + { { echo "$as_me:$LINENO: error: Qt4 headers not found. Please specify the root of your Qt4 installation by exporting QTDIR before running \"configure\"." >&5 +echo "$as_me: error: Qt4 headers not found. Please specify the root of your Qt4 installation by exporting QTDIR before running \"configure\"." >&2;} + { (exit 1); exit 1; }; } + fi + + echo "$as_me:$LINENO: checking for Qt4 libraries" >&5 +echo $ECHO_N "checking for Qt4 libraries... $ECHO_C" >&6 + qt_lib_dir="no" + for lib_dir in $qt_libdirs ; do + if test -r "$lib_dir/$qt_test_library" ; then + qt_lib_dir="$lib_dir" + break + fi + done + + echo "$as_me:$LINENO: result: $qt_lib_dir" >&5 +echo "${ECHO_T}$qt_lib_dir" >&6 + + if test "x$qt_lib_dir" = "xno" ; then + { { echo "$as_me:$LINENO: error: Qt4 libraries not found. Please specify the root of your Qt4 installation by exporting QTDIR before running \"configure\"." >&5 +echo "$as_me: error: Qt4 libraries not found. Please specify the root of your Qt4 installation by exporting QTDIR before running \"configure\"." >&2;} + { (exit 1); exit 1; }; } + fi + + # Extract the first word of "moc", so it can be a program name with args. +set dummy moc; 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_path_MOC4+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $MOC4 in + [\\/]* | ?:[\\/]*) + ac_cv_path_MOC4="$MOC4" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="$PATH:$QTDIR/bin " +for as_dir in $as_dummy +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_MOC4="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_path_MOC4" && ac_cv_path_MOC4="no" + ;; +esac +fi +MOC4=$ac_cv_path_MOC4 + +if test -n "$MOC4"; then + echo "$as_me:$LINENO: result: $MOC4" >&5 +echo "${ECHO_T}$MOC4" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test "$MOC4" = "no" ; then + { { echo "$as_me:$LINENO: error: Qt Meta Object Compiler not found. Please specify +the root of your Qt installation by exporting QTDIR before running \"configure\"." >&5 +echo "$as_me: error: Qt Meta Object Compiler not found. Please specify +the root of your Qt installation by exporting QTDIR before running \"configure\"." >&2;} + { (exit 1); exit 1; }; } + fi + + echo "$as_me:$LINENO: checking for KDE4 headers" >&5 +echo $ECHO_N "checking for KDE4 headers... $ECHO_C" >&6 + kde_incdir="no" + for kde_check in $kde_incdirs ; do + if test -r "$kde_check/$kde_test_include" ; then + kde_incdir="$kde_check" + break + fi + done + echo "$as_me:$LINENO: result: $kde_incdir" >&5 +echo "${ECHO_T}$kde_incdir" >&6 + if test "x$kde_incdir" = "xno" ; then + { { echo "$as_me:$LINENO: error: KDE4 headers not found. Please specify the root of your KDE4 installation by exporting KDEDIR before running \"configure\"." >&5 +echo "$as_me: error: KDE4 headers not found. Please specify the root of your KDE4 installation by exporting KDEDIR before running \"configure\"." >&2;} + { (exit 1); exit 1; }; } + fi + + echo "$as_me:$LINENO: checking for KDE4 libraries" >&5 +echo $ECHO_N "checking for KDE4 libraries... $ECHO_C" >&6 + kde_libdir="no" + for kde_check in $kde_libdirs ; do + if test -r "$kde_check/$kde_test_library" ; then + kde_libdir="$kde_check" + break + fi + done + + echo "$as_me:$LINENO: result: $kde_libdir" >&5 +echo "${ECHO_T}$kde_libdir" >&6 + if test "x$kde_libdir" = "xno" ; then + { { echo "$as_me:$LINENO: error: KDE4 libraries not found. Please specify the root of your KDE4 installation by exporting KDEDIR before running \"configure\"." >&5 +echo "$as_me: error: KDE4 libraries not found. Please specify the root of your KDE4 installation by exporting KDEDIR before running \"configure\"." >&2;} + { (exit 1); exit 1; }; } + fi + + KDE4_CFLAGS="`pkg-config --cflags QtCore` `pkg-config --cflags QtGui` -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT" + KDE4_LIBS="-L$kde_libdir -L$qt_lib_dir -lkdeui -lkdecore -lQtCore -lQtGui" +fi + + + + +echo "$as_me:$LINENO: checking whether to enable the lockdown pieces" >&5 +echo $ECHO_N "checking whether to enable the lockdown pieces... $ECHO_C" >&6 ENABLE_LOCKDOWN="" if test -n "$enable_lockdown" && test "$enable_lockdown" != "no"; then ENABLE_LOCKDOWN=YES - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -{ echo "$as_me:$LINENO: checking whether to enable evolution 2 support" >&5 -echo $ECHO_N "checking whether to enable evolution 2 support... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to enable evolution 2 support" >&5 +echo $ECHO_N "checking whether to enable evolution 2 support... $ECHO_C" >&6 if test "$enable_evolution2" = "yes" -o "$enable_evolution2" = "TRUE"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=no if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26945,29 +25420,28 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -26978,25 +25452,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { echo "$as_me:$LINENO: checking for gobject-2.0" >&5 -echo $ECHO_N "checking for gobject-2.0... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for gobject-2.0" >&5 +echo $ECHO_N "checking for gobject-2.0... $ECHO_C" >&6 if $PKG_CONFIG --exists "gobject-2.0" ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { echo "$as_me:$LINENO: checking GOBJECT_CFLAGS" >&5 -echo $ECHO_N "checking GOBJECT_CFLAGS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking GOBJECT_CFLAGS" >&5 +echo $ECHO_N "checking GOBJECT_CFLAGS... $ECHO_C" >&6 GOBJECT_CFLAGS=`$PKG_CONFIG --cflags "gobject-2.0"` - { echo "$as_me:$LINENO: result: $GOBJECT_CFLAGS" >&5 -echo "${ECHO_T}$GOBJECT_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $GOBJECT_CFLAGS" >&5 +echo "${ECHO_T}$GOBJECT_CFLAGS" >&6 - { echo "$as_me:$LINENO: checking GOBJECT_LIBS" >&5 -echo $ECHO_N "checking GOBJECT_LIBS... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking GOBJECT_LIBS" >&5 +echo $ECHO_N "checking GOBJECT_LIBS... $ECHO_C" >&6 GOBJECT_LIBS=`$PKG_CONFIG --libs "gobject-2.0"` - { echo "$as_me:$LINENO: result: $GOBJECT_LIBS" >&5 -echo "${ECHO_T}$GOBJECT_LIBS" >&6; } + echo "$as_me:$LINENO: result: $GOBJECT_LIBS" >&5 +echo "${ECHO_T}$GOBJECT_LIBS" >&6 else GOBJECT_CFLAGS="" GOBJECT_LIBS="" @@ -27025,19 +25499,19 @@ echo "$as_me: error: Library requirements (gobject-2.0) not met; consider adjust ENABLE_EVOAB2="TRUE" else ENABLE_EVOAB2="" - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -{ echo "$as_me:$LINENO: checking whether to enable KDE address book support" >&5 -echo $ECHO_N "checking whether to enable KDE address book support... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to enable KDE address book support" >&5 +echo $ECHO_N "checking whether to enable KDE address book support... $ECHO_C" >&6 if test "$enable_kdeab" = "yes" && test "$enable_kde" = "yes"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - ac_ext=cpp + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -27045,8 +25519,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu save_CXXFLAGS=$CXXFLAGS CXXFLAGS="$CXXFLAGS $KDE_CFLAGS" - { echo "$as_me:$LINENO: checking whether KDE is between 3.2 and 3.6" >&5 -echo $ECHO_N "checking whether KDE is between 3.2 and 3.6... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking whether KDE is between 3.2 and 3.6" >&5 +echo $ECHO_N "checking whether KDE is between 3.2 and 3.6... $ECHO_C" >&6 if test "$cross_compiling" = yes; then { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling See \`config.log' for more details." >&5 @@ -27055,6 +25529,7 @@ See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -27070,27 +25545,18 @@ int main(int argc, char **argv) { _ACEOF rm -f 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>&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (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_try") 2>&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 @@ -27101,10 +25567,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 echo "$as_me: error: KDE version too old or too recent, please use another version of KDE or disable KDE address book support" >&2;} { (exit 1); exit 1; }; } fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - - CXXFLAGS=$save_CXXFLAGS ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -27114,55 +25578,56 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ENABLE_KAB=TRUE else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 ENABLE_KAB= fi -{ echo "$as_me:$LINENO: checking whether to include FontOOo" >&5 -echo $ECHO_N "checking whether to include FontOOo... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to include FontOOo" >&5 +echo $ECHO_N "checking whether to include FontOOo... $ECHO_C" >&6 if test -n "$enable_fontooo"; then if test "$enable_fontooo" = "no"; then - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 WITH_FONTOOO=NO SCPDEFS="$SCPDEFS -DWITHOUT_FONTOOO" else - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 WITH_FONTOOO=YES BUILD_TYPE="$BUILD_TYPE MSFONTEXTRACT" fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 WITH_FONTOOO=NO SCPDEFS="$SCPDEFS -DWITHOUT_FONTOOO" fi if test "$WITH_FONTOOO" = "YES"; then - { echo "$as_me:$LINENO: checking whether to use system libmspack" >&5 -echo $ECHO_N "checking whether to use system libmspack... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking whether to use system libmspack" >&5 +echo $ECHO_N "checking whether to use system libmspack... $ECHO_C" >&6 if test -n "$with_system_mspack" -o -n "$with_system_libs" && \ test "$with_system_mspack" != "no"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 SYSTEM_MSPACK=YES if test "${ac_cv_header_mspack_h+set}" = set; then - { echo "$as_me:$LINENO: checking for mspack.h" >&5 -echo $ECHO_N "checking for mspack.h... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for mspack.h" >&5 +echo $ECHO_N "checking for mspack.h... $ECHO_C" >&6 if test "${ac_cv_header_mspack_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_mspack_h" >&5 -echo "${ECHO_T}$ac_cv_header_mspack_h" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_mspack_h" >&5 +echo "${ECHO_T}$ac_cv_header_mspack_h" >&6 else # Is the header compilable? -{ echo "$as_me:$LINENO: checking mspack.h usability" >&5 -echo $ECHO_N "checking mspack.h usability... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking mspack.h usability" >&5 +echo $ECHO_N "checking mspack.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -27172,38 +25637,33 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_objext; then + (exit $ac_status); }; }; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no +ac_header_compiler=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 # Is the header present? -{ echo "$as_me:$LINENO: checking mspack.h presence" >&5 -echo $ECHO_N "checking mspack.h presence... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking mspack.h presence" >&5 +echo $ECHO_N "checking mspack.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -27211,22 +25671,23 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -27234,45 +25695,52 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi - rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) +case $ac_header_compiler:$ac_header_preproc in + yes:no ) { echo "$as_me:$LINENO: WARNING: mspack.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: mspack.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: mspack.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: mspack.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes + { echo "$as_me:$LINENO: WARNING: mspack.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: mspack.h: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; - no:yes:* ) + no:yes ) { echo "$as_me:$LINENO: WARNING: mspack.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: mspack.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: mspack.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: mspack.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: mspack.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: mspack.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: mspack.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: mspack.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: mspack.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: mspack.h: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: mspack.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: mspack.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: mspack.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: mspack.h: in the future, the compiler will take precedence" >&2;} - + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for mspack.h" >&5 -echo $ECHO_N "checking for mspack.h... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for mspack.h" >&5 +echo $ECHO_N "checking for mspack.h... $ECHO_C" >&6 if test "${ac_cv_header_mspack_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_mspack_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_mspack_h" >&5 -echo "${ECHO_T}$ac_cv_header_mspack_h" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_mspack_h" >&5 +echo "${ECHO_T}$ac_cv_header_mspack_h" >&6 fi if test $ac_cv_header_mspack_h = yes; then @@ -27285,67 +25753,60 @@ fi -{ echo "$as_me:$LINENO: checking for mspack_create_cab_decompressor in -lmspack" >&5 -echo $ECHO_N "checking for mspack_create_cab_decompressor in -lmspack... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for mspack_create_cab_decompressor in -lmspack" >&5 +echo $ECHO_N "checking for mspack_create_cab_decompressor in -lmspack... $ECHO_C" >&6 if test "${ac_cv_lib_mspack_mspack_create_cab_decompressor+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lmspack $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char mspack_create_cab_decompressor (); int main () { -return mspack_create_cab_decompressor (); +mspack_create_cab_decompressor (); ; 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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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 + (exit $ac_status); }; }; then ac_cv_lib_mspack_mspack_create_cab_decompressor=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_mspack_mspack_create_cab_decompressor=no +ac_cv_lib_mspack_mspack_create_cab_decompressor=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_mspack_mspack_create_cab_decompressor" >&5 -echo "${ECHO_T}$ac_cv_lib_mspack_mspack_create_cab_decompressor" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_lib_mspack_mspack_create_cab_decompressor" >&5 +echo "${ECHO_T}$ac_cv_lib_mspack_mspack_create_cab_decompressor" >&6 if test $ac_cv_lib_mspack_mspack_create_cab_decompressor = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBMSPACK 1 @@ -27360,67 +25821,67 @@ echo "$as_me: error: libmspack not installed or functional" >&2;} fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 SYSTEM_MSPACK=NO fi fi -{ echo "$as_me:$LINENO: checking whether to include MathMLDTD" >&5 -echo $ECHO_N "checking whether to include MathMLDTD... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to include MathMLDTD" >&5 +echo $ECHO_N "checking whether to include MathMLDTD... $ECHO_C" >&6 if test -n "$enable_mathmldtd"; then if test "$enable_mathmldtd" = "no"; then - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 SCPDEFS="$SCPDEFS -DWITHOUT_MATHMLDTD" else - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 BUILD_TYPE="$BUILD_TYPE MATHMLDTD" fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 SCPDEFS="$SCPDEFS -DWITHOUT_MATHMLDTD" fi -{ echo "$as_me:$LINENO: checking whether to include Bitstream Vera fonts" >&5 -echo $ECHO_N "checking whether to include Bitstream Vera fonts... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to include Bitstream Vera fonts" >&5 +echo $ECHO_N "checking whether to include Bitstream Vera fonts... $ECHO_C" >&6 if test "$with_fonts" != "no" ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 WITH_FONTS=YES BUILD_TYPE="$BUILD_TYPE BITSTREAM_VERA_FONTS" else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 WITH_FONTS=NO SCPDEFS="$SCPDEFS -DWITHOUT_FONTS" fi -{ echo "$as_me:$LINENO: checking whether to include PPDs" >&5 -echo $ECHO_N "checking whether to include PPDs... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to include PPDs" >&5 +echo $ECHO_N "checking whether to include PPDs... $ECHO_C" >&6 if test "$with_ppds" != "no"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 WITHOUT_PPDS=YES SCPDEFS="$SCPDEFS -DWITHOUT_PPDS" fi -{ echo "$as_me:$LINENO: checking whether to include AFMs" >&5 -echo $ECHO_N "checking whether to include AFMs... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to include AFMs" >&5 +echo $ECHO_N "checking whether to include AFMs... $ECHO_C" >&6 if test "$with_afms" != "no"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 WITHOUT_AFMS=YES SCPDEFS="$SCPDEFS -DWITHOUT_AFMS" fi @@ -27428,13 +25889,13 @@ fi -{ echo "$as_me:$LINENO: checking whether and how to use Xinerama" >&5 -echo $ECHO_N "checking whether and how to use Xinerama... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether and how to use Xinerama" >&5 +echo $ECHO_N "checking whether and how to use Xinerama... $ECHO_C" >&6 if test "$_os" = "Darwin"; then USE_XINERAMA=YES XINERAMA_LINK=dynamic - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 elif test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then if test -e "$XLIB/libXinerama.so" -a -e "$XLIB/libXinerama.a"; then # we have both versions, let the user decide but use the dynamic one @@ -27464,21 +25925,22 @@ elif test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then XINERAMA_LINK=none fi if test "$USE_XINERAMA" = "YES"; then - { echo "$as_me:$LINENO: result: yes, with $XINERAMA_LINK linking" >&5 -echo "${ECHO_T}yes, with $XINERAMA_LINK linking" >&6; } + echo "$as_me:$LINENO: result: yes, with $XINERAMA_LINK linking" >&5 +echo "${ECHO_T}yes, with $XINERAMA_LINK linking" >&6 if test "${ac_cv_header_X11_extensions_Xinerama_h+set}" = set; then - { echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5 -echo $ECHO_N "checking for X11/extensions/Xinerama.h... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5 +echo $ECHO_N "checking for X11/extensions/Xinerama.h... $ECHO_C" >&6 if test "${ac_cv_header_X11_extensions_Xinerama_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_extensions_Xinerama_h" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_Xinerama_h" >&6 else # Is the header compilable? -{ echo "$as_me:$LINENO: checking X11/extensions/Xinerama.h usability" >&5 -echo $ECHO_N "checking X11/extensions/Xinerama.h usability... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking X11/extensions/Xinerama.h usability" >&5 +echo $ECHO_N "checking X11/extensions/Xinerama.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -27488,38 +25950,33 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -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_compile") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 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_objext; then + (exit $ac_status); }; }; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no +ac_header_compiler=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 # Is the header present? -{ echo "$as_me:$LINENO: checking X11/extensions/Xinerama.h presence" >&5 -echo $ECHO_N "checking X11/extensions/Xinerama.h presence... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking X11/extensions/Xinerama.h presence" >&5 +echo $ECHO_N "checking X11/extensions/Xinerama.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -27527,22 +25984,23 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 2>conftest.er1 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -27550,45 +26008,52 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi - rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) +case $ac_header_compiler:$ac_header_preproc in + yes:no ) { echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: X11/extensions/Xinerama.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: X11/extensions/Xinerama.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: X11/extensions/Xinerama.h: proceeding with the preprocessor's result" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; - no:yes:* ) + no:yes ) { echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: X11/extensions/Xinerama.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: X11/extensions/Xinerama.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: X11/extensions/Xinerama.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: X11/extensions/Xinerama.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: X11/extensions/Xinerama.h: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: X11/extensions/Xinerama.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: X11/extensions/Xinerama.h: in the future, the compiler will take precedence" >&2;} - + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to bug-autoconf@gnu.org. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5 -echo $ECHO_N "checking for X11/extensions/Xinerama.h... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5 +echo $ECHO_N "checking for X11/extensions/Xinerama.h... $ECHO_C" >&6 if test "${ac_cv_header_X11_extensions_Xinerama_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_X11_extensions_Xinerama_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_extensions_Xinerama_h" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_Xinerama_h" >&6 fi if test $ac_cv_header_X11_extensions_Xinerama_h = yes; then @@ -27608,67 +26073,60 @@ fi XINERAMA_EXTRA_LIBS="$XINERAMA_EXTRA_LIBS -ldl" fi -{ echo "$as_me:$LINENO: checking for XineramaIsActive in -lXinerama" >&5 -echo $ECHO_N "checking for XineramaIsActive in -lXinerama... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for XineramaIsActive in -lXinerama" >&5 +echo $ECHO_N "checking for XineramaIsActive in -lXinerama... $ECHO_C" >&6 if test "${ac_cv_lib_Xinerama_XineramaIsActive+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lXinerama $XINERAMA_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char XineramaIsActive (); int main () { -return XineramaIsActive (); +XineramaIsActive (); ; 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 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 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 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_Xinerama_XineramaIsActive=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_Xinerama_XineramaIsActive=no +ac_cv_lib_Xinerama_XineramaIsActive=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaIsActive" >&5 -echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaIsActive" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaIsActive" >&5 +echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaIsActive" >&6 if test $ac_cv_lib_Xinerama_XineramaIsActive = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBXINERAMA 1 @@ -27683,12 +26141,12 @@ echo "$as_me: error: Xinerama not functional?" >&2;} fi else - { echo "$as_me:$LINENO: result: no, libXinerama not found or wrong architecture." >&5 -echo "${ECHO_T}no, libXinerama not found or wrong architecture." >&6; } + echo "$as_me:$LINENO: result: no, libXinerama not found or wrong architecture." >&5 +echo "${ECHO_T}no, libXinerama not found or wrong architecture." >&6 fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi @@ -27702,8 +26160,8 @@ if test -z "$with_ant_home"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_ANT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -27718,28 +26176,27 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ANT="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS ;; esac fi ANT=$ac_cv_path_ANT + if test -n "$ANT"; then - { echo "$as_me:$LINENO: result: $ANT" >&5 -echo "${ECHO_T}$ANT" >&6; } + echo "$as_me:$LINENO: result: $ANT" >&5 +echo "${ECHO_T}$ANT" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - test -n "$ANT" && break done @@ -27751,8 +26208,8 @@ else do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_ANT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -27768,28 +26225,27 @@ 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 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ANT="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -IFS=$as_save_IFS ;; esac fi ANT=$ac_cv_path_ANT + if test -n "$ANT"; then - { echo "$as_me:$LINENO: result: $ANT" >&5 -echo "${ECHO_T}$ANT" >&6; } + echo "$as_me:$LINENO: result: $ANT" >&5 +echo "${ECHO_T}$ANT" >&6 else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - test -n "$ANT" && break done @@ -27825,8 +26281,8 @@ else fi ant_minminor1=`echo $ant_minver | cut -d"." -f2` - { echo "$as_me:$LINENO: checking whether ant is >= $ant_minver" >&5 -echo $ECHO_N "checking whether ant is >= $ant_minver... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking whether ant is >= $ant_minver" >&5 +echo $ECHO_N "checking whether ant is >= $ant_minver... $ECHO_C" >&6 ant_version=`$ANT -version | $AWK '{ print $4; }'` ant_version_major=`echo $ant_version | cut -d. -f1` ant_version_minor=`echo $ant_version | cut -d. -f2` @@ -27834,18 +26290,18 @@ echo "configure: ant_version $ant_version " >&5 echo "configure: ant_version_major $ant_version_major " >&5 echo "configure: ant_version_minor $ant_version_minor " >&5 if test "$ant_version_major" -ge "2"; then - { echo "$as_me:$LINENO: result: yes, $ant_version" >&5 -echo "${ECHO_T}yes, $ant_version" >&6; } + echo "$as_me:$LINENO: result: yes, $ant_version" >&5 +echo "${ECHO_T}yes, $ant_version" >&6 elif test "$ant_version_major" = "1" && test "$ant_version_minor" -ge "$ant_minminor1"; then - { echo "$as_me:$LINENO: result: yes, $ant_version" >&5 -echo "${ECHO_T}yes, $ant_version" >&6; } + echo "$as_me:$LINENO: result: yes, $ant_version" >&5 +echo "${ECHO_T}yes, $ant_version" >&6 else { { echo "$as_me:$LINENO: error: no, you need at least ant >= $ant_minver" >&5 echo "$as_me: error: no, you need at least ant >= $ant_minver" >&2;} { (exit 1); exit 1; }; } fi - { echo "$as_me:$LINENO: checking if $ANT works" >&5 -echo $ECHO_N "checking if $ANT works... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking if $ANT works" >&5 +echo $ECHO_N "checking if $ANT works... $ECHO_C" >&6 cat > conftest.java << EOF public class conftest { int testmethod(int a, int b) { @@ -27875,8 +26331,8 @@ EOF echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } if test $? = 0 && test -f ./conftest.class ; then - { echo "$as_me:$LINENO: result: Ant works" >&5 -echo "${ECHO_T}Ant works" >&6; } + echo "$as_me:$LINENO: result: Ant works" >&5 +echo "${ECHO_T}Ant works" >&6 if test -z "$WITH_ANT_HOME"; then ANT_HOME=`$ANT -diagnostics | $EGREP "ant.home :" | $SED -e "s#ant.home : ##g"` if test -z "$ANT_HOME"; then @@ -27903,8 +26359,8 @@ fi if test "$ANT_HOME" != "NO_ANT_HOME"; then - { echo "$as_me:$LINENO: checking Ant lib directory" >&5 -echo $ECHO_N "checking Ant lib directory... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking Ant lib directory" >&5 +echo $ECHO_N "checking Ant lib directory... $ECHO_C" >&6 if test -f $ANT_HOME/lib/ant.jar; then ANT_LIB="$ANT_HOME/lib" else @@ -27928,15 +26384,15 @@ echo "$as_me: error: Ant libraries not found!" >&2;} fi fi fi - { echo "$as_me:$LINENO: result: Ant lib directory found." >&5 -echo "${ECHO_T}Ant lib directory found." >&6; } + echo "$as_me:$LINENO: result: Ant lib directory found." >&5 +echo "${ECHO_T}Ant lib directory found." >&6 fi fi if test "$ENABLE_MEDIAWIKI" = "YES"; then -{ echo "$as_me:$LINENO: checking whether ant supports mapper type=\"regexp\"" >&5 -echo $ECHO_N "checking whether ant supports mapper type=\"regexp\"... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether ant supports mapper type=\"regexp\"" >&5 +echo $ECHO_N "checking whether ant supports mapper type=\"regexp\"... $ECHO_C" >&6 rm -rf confdir mkdir confdir cat > conftest.java << EOF @@ -27974,8 +26430,8 @@ EOF echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } if test $? = 0 && test -f ./conftest.class ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 rm -rf confdir else echo "configure: Ant test failed" >&5 @@ -27989,50 +26445,50 @@ echo "$as_me: error: no. Did you install ant-apache-regexp?" >&2;} fi rm -f conftest* core core.* *.core -{ echo "$as_me:$LINENO: checking which languages to be built" >&5 -echo $ECHO_N "checking which languages to be built... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking which languages to be built" >&5 +echo $ECHO_N "checking which languages to be built... $ECHO_C" >&6 WITH_LANG="$with_lang" if test -z "$WITH_LANG"; then - { echo "$as_me:$LINENO: result: en-US" >&5 -echo "${ECHO_T}en-US" >&6; } + echo "$as_me:$LINENO: result: en-US" >&5 +echo "${ECHO_T}en-US" >&6 else - { echo "$as_me:$LINENO: result: $WITH_LANG" >&5 -echo "${ECHO_T}$WITH_LANG" >&6; } + echo "$as_me:$LINENO: result: $WITH_LANG" >&5 +echo "${ECHO_T}$WITH_LANG" >&6 fi -{ echo "$as_me:$LINENO: checking which languages have poor help localizations" >&5 -echo $ECHO_N "checking which languages have poor help localizations... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking which languages have poor help localizations" >&5 +echo $ECHO_N "checking which languages have poor help localizations... $ECHO_C" >&6 WITH_POOR_HELP_LOCALIZATIONS="$with_poor_help_localizations" if test -z "$WITH_POOR_HELP_LOCALIZATIONS"; then - { echo "$as_me:$LINENO: result: none" >&5 -echo "${ECHO_T}none" >&6; } + echo "$as_me:$LINENO: result: none" >&5 +echo "${ECHO_T}none" >&6 else - { echo "$as_me:$LINENO: result: $WITH_POOR_HELP_LOCALIZATIONS" >&5 -echo "${ECHO_T}$WITH_POOR_HELP_LOCALIZATIONS" >&6; } + echo "$as_me:$LINENO: result: $WITH_POOR_HELP_LOCALIZATIONS" >&5 +echo "${ECHO_T}$WITH_POOR_HELP_LOCALIZATIONS" >&6 fi -{ echo "$as_me:$LINENO: checking which dictionaries to include" >&5 -echo $ECHO_N "checking which dictionaries to include... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking which dictionaries to include" >&5 +echo $ECHO_N "checking which dictionaries to include... $ECHO_C" >&6 if test -z "$with_dict"; then WITH_DICT=,ALL, - { echo "$as_me:$LINENO: result: ALL" >&5 -echo "${ECHO_T}ALL" >&6; } + echo "$as_me:$LINENO: result: ALL" >&5 +echo "${ECHO_T}ALL" >&6 else WITH_DICT=","$with_dict"," - { echo "$as_me:$LINENO: result: $with_dict" >&5 -echo "${ECHO_T}$with_dict" >&6; } + echo "$as_me:$LINENO: result: $with_dict" >&5 +echo "${ECHO_T}$with_dict" >&6 fi -{ echo "$as_me:$LINENO: checking for additional 'intro' bitmaps" >&5 -echo $ECHO_N "checking for additional 'intro' bitmaps... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for additional 'intro' bitmaps" >&5 +echo $ECHO_N "checking for additional 'intro' bitmaps... $ECHO_C" >&6 INTRO_BITMAPS= if test -z "$with_intro_bitmaps" -o "$with_intro_bitmaps" = "no" ; then INTRO_BITMAPS= - { echo "$as_me:$LINENO: result: none" >&5 -echo "${ECHO_T}none" >&6; } + echo "$as_me:$LINENO: result: none" >&5 +echo "${ECHO_T}none" >&6 else for bitmap in `echo $with_intro_bitmaps | tr ',' ' '` ; do case "$bitmap" in @@ -28044,18 +26500,18 @@ echo "$as_me: WARNING: Intro bitmaps should be .bmp files!" >&2;} ;; INTRO_BITMAPS="$INTRO_BITMAPS $bitmap" fi done - { echo "$as_me:$LINENO: result: $INTRO_BITMAPS" >&5 -echo "${ECHO_T}$INTRO_BITMAPS" >&6; } + echo "$as_me:$LINENO: result: $INTRO_BITMAPS" >&5 +echo "${ECHO_T}$INTRO_BITMAPS" >&6 fi -{ echo "$as_me:$LINENO: checking for additional 'about' bitmaps" >&5 -echo $ECHO_N "checking for additional 'about' bitmaps... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for additional 'about' bitmaps" >&5 +echo $ECHO_N "checking for additional 'about' bitmaps... $ECHO_C" >&6 ABOUT_BITMAPS= if test -z "$with_about_bitmaps" -o "$with_about_bitmaps" = "no" ; then ABOUT_BITMAPS= - { echo "$as_me:$LINENO: result: none" >&5 -echo "${ECHO_T}none" >&6; } + echo "$as_me:$LINENO: result: none" >&5 +echo "${ECHO_T}none" >&6 else for bitmap in `echo $with_about_bitmaps | tr ',' ' '` ; do case "$bitmap" in @@ -28067,82 +26523,82 @@ echo "$as_me: WARNING: About bitmaps should be .bmp files!" >&2;} ;; ABOUT_BITMAPS="$ABOUT_BITMAPS $bitmap" fi done - { echo "$as_me:$LINENO: result: $ABOUT_BITMAPS" >&5 -echo "${ECHO_T}$ABOUT_BITMAPS" >&6; } + echo "$as_me:$LINENO: result: $ABOUT_BITMAPS" >&5 +echo "${ECHO_T}$ABOUT_BITMAPS" >&6 fi OOO_VENDOR= -{ echo "$as_me:$LINENO: checking for vendor" >&5 -echo $ECHO_N "checking for vendor... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for vendor" >&5 +echo $ECHO_N "checking for vendor... $ECHO_C" >&6 if test -z "$with_vendor" -o "$with_vendor" = "no" ; then - { echo "$as_me:$LINENO: result: not set" >&5 -echo "${ECHO_T}not set" >&6; } + echo "$as_me:$LINENO: result: not set" >&5 +echo "${ECHO_T}not set" >&6 else OOO_VENDOR="$with_vendor" - { echo "$as_me:$LINENO: result: $OOO_VENDOR" >&5 -echo "${ECHO_T}$OOO_VENDOR" >&6; } + echo "$as_me:$LINENO: result: $OOO_VENDOR" >&5 +echo "${ECHO_T}$OOO_VENDOR" >&6 fi UNIXWRAPPERNAME= -{ echo "$as_me:$LINENO: checking for UNIX wrapper name" >&5 -echo $ECHO_N "checking for UNIX wrapper name... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking for UNIX wrapper name" >&5 +echo $ECHO_N "checking for UNIX wrapper name... $ECHO_C" >&6 if test -z "$with_unix_wrapper" -o "$with_unix_wrapper" = "no" -o "$with_unix_wrapper" = "yes" ; then - { echo "$as_me:$LINENO: result: not set" >&5 -echo "${ECHO_T}not set" >&6; } + echo "$as_me:$LINENO: result: not set" >&5 +echo "${ECHO_T}not set" >&6 else UNIXWRAPPERNAME="$with_unix_wrapper" - { echo "$as_me:$LINENO: result: $UNIXWRAPPERNAME" >&5 -echo "${ECHO_T}$UNIXWRAPPERNAME" >&6; } + echo "$as_me:$LINENO: result: $UNIXWRAPPERNAME" >&5 +echo "${ECHO_T}$UNIXWRAPPERNAME" >&6 fi -{ echo "$as_me:$LINENO: checking whether to statically link to Gtk" >&5 -echo $ECHO_N "checking whether to statically link to Gtk... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to statically link to Gtk" >&5 +echo $ECHO_N "checking whether to statically link to Gtk... $ECHO_C" >&6 if test -n "$enable_static_gtk" && test "$enable_static_gtk" != "no"; then ENABLE_STATIC_GTK="TRUE" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else ENABLE_STATIC_GTK="FALSE" - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -{ echo "$as_me:$LINENO: checking whether to use layout dialogs" >&5 -echo $ECHO_N "checking whether to use layout dialogs... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking whether to use layout dialogs" >&5 +echo $ECHO_N "checking whether to use layout dialogs... $ECHO_C" >&6 if test -n "$enable_layout" && test "$enable_layout" != "no"; then ENABLE_LAYOUT="TRUE" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else ENABLE_LAYOUT="FALSE" - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi # =================================================================== # De- or increase default verbosity of build process # =================================================================== -{ echo "$as_me:$LINENO: checking build verbosity" >&5 -echo $ECHO_N "checking build verbosity... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking build verbosity" >&5 +echo $ECHO_N "checking build verbosity... $ECHO_C" >&6 if test -n "$enable_verbose"; then if test "$enable_verbose" == "yes"; then VERBOSE="TRUE" - { echo "$as_me:$LINENO: result: high" >&5 -echo "${ECHO_T}high" >&6; } + echo "$as_me:$LINENO: result: high" >&5 +echo "${ECHO_T}high" >&6 fi if test "$enable_verbose" == "no"; then VERBOSE="FALSE" - { echo "$as_me:$LINENO: result: low" >&5 -echo "${ECHO_T}low" >&6; } + echo "$as_me:$LINENO: result: low" >&5 +echo "${ECHO_T}low" >&6 fi else - { echo "$as_me:$LINENO: result: not set" >&5 -echo "${ECHO_T}not set" >&6; } + echo "$as_me:$LINENO: result: not set" >&5 +echo "${ECHO_T}not set" >&6 fi @@ -28159,16 +26615,16 @@ echo "$as_me: error: No compiler found." >&2;} fi -{ echo "$as_me:$LINENO: checking solver path" >&5 -echo $ECHO_N "checking solver path... $ECHO_C" >&6; } +echo "$as_me:$LINENO: checking solver path" >&5 +echo $ECHO_N "checking solver path... $ECHO_C" >&6 if test -z "$with_local_solver"; then LOCAL_SOLVER="DEFAULT" - { echo "$as_me:$LINENO: result: default" >&5 -echo "${ECHO_T}default" >&6; } + echo "$as_me:$LINENO: result: default" >&5 +echo "${ECHO_T}default" >&6 else LOCAL_SOLVER=$with_local_solver - { echo "$as_me:$LINENO: result: $with_local_solver" >&5 -echo "${ECHO_T}$with_local_solver" >&6; } + echo "$as_me:$LINENO: result: $with_local_solver" >&5 +echo "${ECHO_T}$with_local_solver" >&6 fi @@ -28177,8 +26633,7 @@ fi # make sure config.guess is +x; we execute config.guess, so it has to be so; chmod +x ./config.guess -ac_config_files="$ac_config_files set_soenv Makefile" - + ac_config_files="$ac_config_files set_soenv Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -28197,58 +26652,39 @@ _ACEOF # The following way of writing the cache mishandles newlines in values, # but we know of no workaround that is simple, portable, and efficient. -# So, we kill variables containing newlines. +# So, don't put newlines in cache variables' values. # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. -( - for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - *) $as_unset $ac_var ;; - esac ;; - esac - done - +{ (set) 2>&1 | - case $as_nl`(ac_space=' '; set) 2>&1` in #( - *${as_nl}ac_space=\ *) + case `(ac_space=' '; set | grep ac_space) 2>&1` in + *ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote # substitution turns \\\\ into \\, and sed turns \\ into \). sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; #( + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + ;; *) # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + sed -n \ + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; - esac | - sort -) | + esac; +} | sed ' - /^ac_cv_env_/b end t clear - :clear + : clear s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ t end - s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - :end' >>confcache -if diff "$cache_file" confcache >/dev/null 2>&1; then :; else - if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && - { echo "$as_me:$LINENO: updating cache $cache_file" >&5 -echo "$as_me: updating cache $cache_file" >&6;} + /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + : end' >>confcache +if diff $cache_file confcache >/dev/null 2>&1; then :; else + if test -w $cache_file; then + test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" cat confcache >$cache_file else - { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 -echo "$as_me: not updating unwritable cache $cache_file" >&6;} + echo "not updating unwritable cache $cache_file" fi fi rm -f confcache @@ -28257,48 +26693,63 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix # Let make expand exec_prefix. test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +# VPATH may cause trouble with some makes, so we remove $(srcdir), +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty +# (actually we leave an empty line to preserve line numbers). +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=/{ +s/:*\$(srcdir):*/:/; +s/:*\${srcdir}:*/:/; +s/:*@srcdir@:*/:/; +s/^\([^=]*=[ ]*\):*/\1/; +s/:*$//; +s/^[^=]*=[ ]*$//; +}' +fi + # Transform confdefs.h into DEFS. # Protect against shell expansion while executing Makefile rules. # Protect against Makefile macro expansion. # # If the first sed substitution is executed (which looks for macros that -# take arguments), then branch to the quote section. Otherwise, +# take arguments), then we branch to the quote section. Otherwise, # look for a macro that doesn't take arguments. -ac_script=' +cat >confdef2opt.sed <<\_ACEOF t clear -:clear -s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g +: clear +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g t quote -s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g t quote -b any -:quote -s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g -s/\[/\\&/g -s/\]/\\&/g -s/\$/$$/g -H -:any -${ - g - s/^\n// - s/\n/ /g - p -} -' -DEFS=`sed -n "$ac_script" confdefs.h` +d +: quote +s,[ `~#$^&*(){}\\|;'"<>?],\\&,g +s,\[,\\&,g +s,\],\\&,g +s,\$,$$,g +p +_ACEOF +# We use echo to avoid assuming a particular line-breaking character. +# The extra dot is to prevent the shell from consuming trailing +# line-breaks from the sub-command output. A line-break within +# single-quotes doesn't work because, if this script is created in a +# platform that uses two characters for line-breaks (e.g., DOS), tr +# would break. +ac_LF_and_DOT=`echo; echo .` +DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` +rm -f confdef2opt.sed ac_libobjs= ac_ltlibobjs= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. - ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`echo "$ac_i" | sed "$ac_script"` - # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR - # will be set to the directory where LIBOBJS objects are built. - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' + ac_i=`echo "$ac_i" | + sed 's/\$U\././;s/\.o$//;s/\.obj$//'` + # 2. Add them. + ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' done LIBOBJS=$ac_libobjs @@ -28329,91 +26780,27 @@ cat >>$CONFIG_STATUS <<\_ACEOF ## M4sh Initialization. ## ## --------------------- ## -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh +# Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh +elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then + set -o posix fi # Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then as_unset=unset else as_unset=false fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -as_nl=' -' -IFS=" "" $as_nl" - -# Find who we are. Look in the path if we contain no directory separator. -case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done -IFS=$as_save_IFS - - ;; -esac -# We did not find ourselves, most probably we were run as `sh COMMAND' -# in which case we are not to be found in the path. -if test "x$as_myself" = x; then - as_myself=$0 -fi -if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } -fi - # Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -done +$as_unset ENV MAIL MAILPATH PS1='$ ' PS2='> ' PS4='+ ' @@ -28424,22 +26811,21 @@ for as_var in \ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ LC_TELEPHONE LC_TIME do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + $as_unset $as_var fi done # Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then +if expr a : '\(a\)' >/dev/null 2>&1; then as_expr=expr else as_expr=false fi -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then as_basename=basename else as_basename=false @@ -28447,166 +26833,200 @@ fi # Name of the executable. -as_me=`$as_basename -- "$0" || +as_me=`$as_basename "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || + X"$0" : 'X\(/\)$' \| \ + . : '\(.\)' 2>/dev/null || echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } + /^X\/\(\/\/\)$/{ s//\1/; q; } + /^X\/\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` -# CDPATH. -$as_unset CDPATH + +# PATH needs CR, and LINENO needs CR and PATH. +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" || { + # Find who we are. Look in the path if we contain no path at all + # relative or not. + case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done + ;; + esac + # We did not find ourselves, most probably we were run as `sh COMMAND' + # in which case we are not to be found in the path. + if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then + { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 +echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} + { (exit 1); exit 1; }; } + fi + case $CONFIG_SHELL in + '') + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for as_base in sh bash ksh sh5; do + case $as_dir in + /*) + if ("$as_dir/$as_base" -c ' as_lineno_1=$LINENO as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } + CONFIG_SHELL=$as_dir/$as_base + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$0" ${1+"$@"} + fi;; + esac + done +done +;; + esac # Create $as_me.lineno as a copy of $as_myself, but with $LINENO # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. + # line-number line before each line; the second 'sed' does the real + # work. The second script uses 'N' to pair each line-number line + # with the numbered line, and appends trailing '-' during + # substitution so that $LINENO is not a special case at line end. # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) + sed '=' <$as_myself | sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + s,$,-, + : loop + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, t loop - s/-\n.*// + s,-$,, + s,^['$as_cr_digits']*\n,, ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + chmod +x $as_me.lineno || + { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 +echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" + # original and so on. Autoconf is especially sensible to this). + . ./$as_me.lineno # Exit status is that of the last command. exit } -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in --n*) - case `echo 'x\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; - esac;; -*) - ECHO_N='-n';; +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C=' +' ECHO_T=' ' ;; + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; + *) ECHO_N= ECHO_C='\c' ECHO_T= ;; esac -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then +if expr a : '\(a\)' >/dev/null 2>&1; then as_expr=expr else as_expr=false fi rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir -fi echo >conf$$.file if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + # We could just check for DJGPP; but this test a) works b) is more generic + # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). + if test -f conf$$.exe; then + # Don't use ln at all; we don't have any links as_ln_s='cp -p' + else + as_ln_s='ln -s' + fi elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else as_ln_s='cp -p' fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null +rm -f conf$$ conf$$.exe conf$$.file if mkdir -p . 2>/dev/null; then as_mkdir_p=: else - test -d ./-p && rmdir ./-p as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_executable_p="test -f" # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" # Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" + + +# IFS +# We need space, tab and new line, in precisely that order. +as_nl=' +' +IFS=" $as_nl" +# CDPATH. +$as_unset CDPATH exec 6>&1 -# Save the log message, to keep $[0] and so on meaningful, and to +# Open the log real soon, to keep \$[0] and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. -ac_log=" +# values after options handling. Logging --version etc. is OK. +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX +} >&5 +cat >&5 <<_CSEOF + This file was extended by $as_me, which was -generated by GNU Autoconf 2.61. Invocation command line was +generated by GNU Autoconf 2.57. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -28614,18 +27034,30 @@ generated by GNU Autoconf 2.61. Invocation command line was CONFIG_COMMANDS = $CONFIG_COMMANDS $ $0 $@ -on `(hostname || uname -n) 2>/dev/null | sed 1q` -" - +_CSEOF +echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 +echo >&5 _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF # Files that config.status was made for. -config_files="$ac_config_files" +if test -n "$ac_config_files"; then + echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS +fi -_ACEOF +if test -n "$ac_config_headers"; then + echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS +fi + +if test -n "$ac_config_links"; then + echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS +fi + +if test -n "$ac_config_commands"; then + echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS +fi cat >>$CONFIG_STATUS <<\_ACEOF + ac_cs_usage="\ \`$as_me' instantiates files from templates according to the current configuration. @@ -28633,31 +27065,30 @@ current configuration. Usage: $0 [OPTIONS] [FILE]... -h, --help print this help, then exit - -V, --version print version number and configuration settings, then exit + -V, --version print version number, then exit -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] - instantiate the configuration file FILE + instantiate the configuration file FILE Configuration files: $config_files Report bugs to ." - _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.61, - with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +configured by $0, generated by GNU Autoconf 2.57, + with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -Copyright (C) 2006 Free Software Foundation, Inc. +Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." - -ac_pwd='$ac_pwd' -srcdir='$srcdir' +srcdir=$srcdir _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF @@ -28668,42 +27099,60 @@ while test $# != 0 do case $1 in --*=*) - ac_option=`expr "X$1" : 'X\([^=]*\)='` - ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` + ac_option=`expr "x$1" : 'x\([^=]*\)='` + ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` ac_shift=: ;; - *) + -*) ac_option=$1 ac_optarg=$2 ac_shift=shift ;; + *) # This is not an option, so the user has probably given explicit + # arguments. + ac_option=$1 + ac_need_defaults=false;; esac case $ac_option in # Handling of the options. +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; - --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - echo "$ac_cs_version"; exit ;; - --debug | --debu | --deb | --de | --d | -d ) + --version | --vers* | -V ) + echo "$ac_cs_version"; exit 0 ;; + --he | --h) + # Conflict between --help and --header + { { echo "$as_me:$LINENO: error: ambiguous option: $1 +Try \`$0 --help' for more information." >&5 +echo "$as_me: error: ambiguous option: $1 +Try \`$0 --help' for more information." >&2;} + { (exit 1); exit 1; }; };; + --help | --hel | -h ) + echo "$ac_cs_usage"; exit 0 ;; + --debug | --d* | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift CONFIG_FILES="$CONFIG_FILES $ac_optarg" ac_need_defaults=false;; - --he | --h | --help | --hel | -h ) - echo "$ac_cs_usage"; exit ;; + --header | --heade | --head | --hea ) + $ac_shift + CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" + ac_need_defaults=false;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; # This is an error. - -*) { echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2 + -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 +Try \`$0 --help' for more information." >&5 +echo "$as_me: error: unrecognized option: $1 +Try \`$0 --help' for more information." >&2;} { (exit 1); exit 1; }; } ;; - *) ac_config_targets="$ac_config_targets $1" - ac_need_defaults=false ;; + *) ac_config_targets="$ac_config_targets $1" ;; esac shift @@ -28719,43 +27168,29 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF if \$ac_cs_recheck; then - echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - CONFIG_SHELL=$SHELL - export CONFIG_SHELL - exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 + exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion fi _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX - echo "$ac_log" -} >&5 -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -# Handling of arguments. + + +cat >>$CONFIG_STATUS <<\_ACEOF for ac_config_target in $ac_config_targets do - case $ac_config_target in - "set_soenv") CONFIG_FILES="$CONFIG_FILES set_soenv" ;; - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - + case "$ac_config_target" in + # Handling of arguments. + "set_soenv" ) CONFIG_FILES="$CONFIG_FILES set_soenv" ;; + "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac done - # If the user did not use the arguments to specify the items to instantiate, # then the envvar interface is used. Set only those that are not. # We use the long form for the default assignment because of an extremely @@ -28765,806 +27200,587 @@ if $ac_need_defaults; then fi # Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason against having it here, and in addition, +# simply because there is no reason to put it here, and in addition, # creating and moving files from /tmp can sometimes cause problems. -# Hook for its removal unless debugging. -# Note that there is a small window in which the directory will not be cleaned: -# after its creation but before its name has been assigned to `$tmp'. +# Create a temporary directory, and hook for its removal unless debugging. $debug || { - tmp= - trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status -' 0 + trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 trap '{ (exit 1); exit 1; }' 1 2 13 15 } + # Create a (secure) tmp directory for tmp files. { - tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && + tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { - tmp=./conf$$-$RANDOM - (umask 077 && mkdir "$tmp") + tmp=./confstat$$-$RANDOM + (umask 077 && mkdir $tmp) } || { echo "$me: cannot create a temporary directory in ." >&2 { (exit 1); exit 1; } } -# -# Set up the sed scripts for CONFIG_FILES section. -# - -# No need to generate the scripts if there are no CONFIG_FILES. -# This happens for instance when ./config.status config.h -if test -n "$CONFIG_FILES"; then - -_ACEOF - - - -ac_delim='%!_!# ' -for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -SHELL!$SHELL$ac_delim -PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim -PACKAGE_NAME!$PACKAGE_NAME$ac_delim -PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim -PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim -PACKAGE_STRING!$PACKAGE_STRING$ac_delim -PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim -exec_prefix!$exec_prefix$ac_delim -prefix!$prefix$ac_delim -program_transform_name!$program_transform_name$ac_delim -bindir!$bindir$ac_delim -sbindir!$sbindir$ac_delim -libexecdir!$libexecdir$ac_delim -datarootdir!$datarootdir$ac_delim -datadir!$datadir$ac_delim -sysconfdir!$sysconfdir$ac_delim -sharedstatedir!$sharedstatedir$ac_delim -localstatedir!$localstatedir$ac_delim -includedir!$includedir$ac_delim -oldincludedir!$oldincludedir$ac_delim -docdir!$docdir$ac_delim -infodir!$infodir$ac_delim -htmldir!$htmldir$ac_delim -dvidir!$dvidir$ac_delim -pdfdir!$pdfdir$ac_delim -psdir!$psdir$ac_delim -libdir!$libdir$ac_delim -localedir!$localedir$ac_delim -mandir!$mandir$ac_delim -DEFS!$DEFS$ac_delim -ECHO_C!$ECHO_C$ac_delim -ECHO_N!$ECHO_N$ac_delim -ECHO_T!$ECHO_T$ac_delim -LIBS!$LIBS$ac_delim -build_alias!$build_alias$ac_delim -host_alias!$host_alias$ac_delim -target_alias!$target_alias$ac_delim -GREP!$GREP$ac_delim -EGREP!$EGREP$ac_delim -AWK!$AWK$ac_delim -SED!$SED$ac_delim -LOCAL_SOLENV!$LOCAL_SOLENV$ac_delim -_solenv!$_solenv$ac_delim -UPD!$UPD$ac_delim -SOURCEVERSION!$SOURCEVERSION$ac_delim -build!$build$ac_delim -build_cpu!$build_cpu$ac_delim -build_vendor!$build_vendor$ac_delim -build_os!$build_os$ac_delim -host!$host$ac_delim -host_cpu!$host_cpu$ac_delim -host_vendor!$host_vendor$ac_delim -host_os!$host_os$ac_delim -target!$target$ac_delim -target_cpu!$target_cpu$ac_delim -target_vendor!$target_vendor$ac_delim -target_os!$target_os$ac_delim -GNUTAR!$GNUTAR$ac_delim -OSVERSION!$OSVERSION$ac_delim -PTHREAD_CFLAGS!$PTHREAD_CFLAGS$ac_delim -PTHREAD_LIBS!$PTHREAD_LIBS$ac_delim -ENABLE_CRASHDUMP!$ENABLE_CRASHDUMP$ac_delim -VC_STANDARD!$VC_STANDARD$ac_delim -ENABLE_WERROR!$ENABLE_WERROR$ac_delim -ENABLE_DEBUG!$ENABLE_DEBUG$ac_delim -PRODUCT!$PRODUCT$ac_delim -PROFULLSWITCH!$PROFULLSWITCH$ac_delim -PROEXT!$PROEXT$ac_delim -ENABLE_SYMBOLS!$ENABLE_SYMBOLS$ac_delim -DISABLE_STRIP!$DISABLE_STRIP$ac_delim -ENABLE_CUPS!$ENABLE_CUPS$ac_delim -ENABLE_FONTCONFIG!$ENABLE_FONTCONFIG$ac_delim -WITH_BINFILTER!$WITH_BINFILTER$ac_delim -ENABLE_DIRECTX!$ENABLE_DIRECTX$ac_delim -DISABLE_ACTIVEX!$DISABLE_ACTIVEX$ac_delim -DISABLE_ATL!$DISABLE_ATL$ac_delim -ENABLE_RPATH!$ENABLE_RPATH$ac_delim -WITH_MYSPELL_DICTS!$WITH_MYSPELL_DICTS$ac_delim -SYSTEM_DICTS!$SYSTEM_DICTS$ac_delim -DICT_SYSTEM_DIR!$DICT_SYSTEM_DIR$ac_delim -HYPH_SYSTEM_DIR!$HYPH_SYSTEM_DIR$ac_delim -THES_SYSTEM_DIR!$THES_SYSTEM_DIR$ac_delim -USE_SHELL!$USE_SHELL$ac_delim -WITH_MINGWIN!$WITH_MINGWIN$ac_delim -SHELLPATH!$SHELLPATH$ac_delim -GCC_HOME!$GCC_HOME$ac_delim -CC!$CC$ac_delim -CFLAGS!$CFLAGS$ac_delim -LDFLAGS!$LDFLAGS$ac_delim -CPPFLAGS!$CPPFLAGS$ac_delim -ac_ct_CC!$ac_ct_CC$ac_delim -EXEEXT!$EXEEXT$ac_delim -OBJEXT!$OBJEXT$ac_delim -COMPATH!$COMPATH$ac_delim -GCCVER!$GCCVER$ac_delim -HAVE_LD_BSYMBOLIC_FUNCTIONS!$HAVE_LD_BSYMBOLIC_FUNCTIONS$ac_delim -ENABLE_PCH!$ENABLE_PCH$ac_delim -_ACEOF - - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done - -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -if test -n "$ac_eof"; then - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` - ac_eof=`expr $ac_eof + 1` -fi - -cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b _ACEOF -sed ' -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -s/^/s,@/; s/!/@,|#_!!_#|/ -:n -t n -s/'"$ac_delim"'$/,g/; t -s/$/\\/; p -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF -CEOF$ac_eof -_ACEOF - - -ac_delim='%!_!# ' -for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -NO_HIDS!$NO_HIDS$ac_delim -GNUMAKE!$GNUMAKE$ac_delim -_cc!$_cc$ac_delim -HAVE_LD_HASH_STYLE!$HAVE_LD_HASH_STYLE$ac_delim -PERL!$PERL$ac_delim -MSPDB_PATH!$MSPDB_PATH$ac_delim -COMEX!$COMEX$ac_delim -USE_MINGW!$USE_MINGW$ac_delim -MIDL_PATH!$MIDL_PATH$ac_delim -CSC_PATH!$CSC_PATH$ac_delim -FRAME_HOME!$FRAME_HOME$ac_delim -CPP!$CPP$ac_delim -CXX!$CXX$ac_delim -CXXFLAGS!$CXXFLAGS$ac_delim -ac_ct_CXX!$ac_ct_CXX$ac_delim -CXXCPP!$CXXCPP$ac_delim -SIZEOF_LONG!$SIZEOF_LONG$ac_delim -WORDS_BIGENDIAN!$WORDS_BIGENDIAN$ac_delim -LFS_CFLAGS!$LFS_CFLAGS$ac_delim -ENABLE_VBA!$ENABLE_VBA$ac_delim -VBA_EXTENSION!$VBA_EXTENSION$ac_delim -PAM!$PAM$ac_delim -NEW_SHADOW_API!$NEW_SHADOW_API$ac_delim -PAM_LINK!$PAM_LINK$ac_delim -CRYPT_LINK!$CRYPT_LINK$ac_delim -GXX_INCLUDE_PATH!$GXX_INCLUDE_PATH$ac_delim -MINGW_LIB_INCLUDE_PATH!$MINGW_LIB_INCLUDE_PATH$ac_delim -STLPORT4!$STLPORT4$ac_delim -STLPORT_VER!$STLPORT_VER$ac_delim -USE_SYSTEM_STL!$USE_SYSTEM_STL$ac_delim -HAVE_GCC_VISIBILITY_FEATURE!$HAVE_GCC_VISIBILITY_FEATURE$ac_delim -ALLOC!$ALLOC$ac_delim -BUILD_VER_STRING!$BUILD_VER_STRING$ac_delim -SOLAR_JAVA!$SOLAR_JAVA$ac_delim -JAVAINTERPRETER!$JAVAINTERPRETER$ac_delim -JAVACOMPILER!$JAVACOMPILER$ac_delim -JAVACISGCJ!$JAVACISGCJ$ac_delim -JAVADOC!$JAVADOC$ac_delim -AWTLIB!$AWTLIB$ac_delim -JAVAAOTCOMPILER!$JAVAAOTCOMPILER$ac_delim -JAVA_HOME!$JAVA_HOME$ac_delim -JDK!$JDK$ac_delim -JAVAFLAGS!$JAVAFLAGS$ac_delim -DMAKE!$DMAKE$ac_delim -BUILD_DMAKE!$BUILD_DMAKE$ac_delim -EPM!$EPM$ac_delim -DPKG!$DPKG$ac_delim -PKGMK!$PKGMK$ac_delim -BUILD_EPM!$BUILD_EPM$ac_delim -PKGFORMAT!$PKGFORMAT$ac_delim -RPM!$RPM$ac_delim -GPERF!$GPERF$ac_delim -MINGWCXX!$MINGWCXX$ac_delim -MINGWSTRIP!$MINGWSTRIP$ac_delim -BUILD_UNOWINREG!$BUILD_UNOWINREG$ac_delim -BUILD_QADEVOOO!$BUILD_QADEVOOO$ac_delim -SYSTEM_STDLIBS!$SYSTEM_STDLIBS$ac_delim -SYSTEM_ZLIB!$SYSTEM_ZLIB$ac_delim -SYSTEM_JPEG!$SYSTEM_JPEG$ac_delim -SYSTEM_EXPAT!$SYSTEM_EXPAT$ac_delim -PKG_CONFIG!$PKG_CONFIG$ac_delim -LIBWPD_CFLAGS!$LIBWPD_CFLAGS$ac_delim -LIBWPD_LIBS!$LIBWPD_LIBS$ac_delim -SYSTEM_LIBWPD!$SYSTEM_LIBWPD$ac_delim -FREETYPE_CFLAGS!$FREETYPE_CFLAGS$ac_delim -FREETYPE_LIBS!$FREETYPE_LIBS$ac_delim -USE_FT_EMBOLDEN!$USE_FT_EMBOLDEN$ac_delim -LIBXSLT_CFLAGS!$LIBXSLT_CFLAGS$ac_delim -LIBXSLT_LIBS!$LIBXSLT_LIBS$ac_delim -XSLTPROC!$XSLTPROC$ac_delim -SYSTEM_LIBXSLT!$SYSTEM_LIBXSLT$ac_delim -LIBXML_CFLAGS!$LIBXML_CFLAGS$ac_delim -LIBXML_LIBS!$LIBXML_LIBS$ac_delim -SYSTEM_LIBXML!$SYSTEM_LIBXML$ac_delim -PYTHON!$PYTHON$ac_delim -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 -pythondir!$pythondir$ac_delim -pkgpythondir!$pkgpythondir$ac_delim -pyexecdir!$pyexecdir$ac_delim -pkgpyexecdir!$pkgpyexecdir$ac_delim -BZIP2!$BZIP2$ac_delim -SYSTEM_PYTHON!$SYSTEM_PYTHON$ac_delim -PYTHON_CFLAGS!$PYTHON_CFLAGS$ac_delim -PYTHON_LIBS!$PYTHON_LIBS$ac_delim -HOME!$HOME$ac_delim -SYSTEM_DB!$SYSTEM_DB$ac_delim -DB_VERSION!$DB_VERSION$ac_delim -DB_INCLUDES!$DB_INCLUDES$ac_delim -DB_JAR!$DB_JAR$ac_delim -SYSTEM_LUCENE!$SYSTEM_LUCENE$ac_delim -LUCENE_CORE_JAR!$LUCENE_CORE_JAR$ac_delim -LUCENE_ANALYZERS_JAR!$LUCENE_ANALYZERS_JAR$ac_delim -SYSTEM_HSQLDB!$SYSTEM_HSQLDB$ac_delim -HSQLDB_JAR!$HSQLDB_JAR$ac_delim -_ACEOF - - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done - -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -if test -n "$ac_eof"; then - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` - ac_eof=`expr $ac_eof + 1` -fi cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -_ACEOF -sed ' -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -s/^/s,@/; s/!/@,|#_!!_#|/ -:n -t n -s/'"$ac_delim"'$/,g/; t -s/$/\\/; p -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF -CEOF$ac_eof -_ACEOF - - -ac_delim='%!_!# ' -for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -SYSTEM_BSH!$SYSTEM_BSH$ac_delim -BSH_JAR!$BSH_JAR$ac_delim -SERIALIZER_JAR!$SERIALIZER_JAR$ac_delim -SYSTEM_SAXON!$SYSTEM_SAXON$ac_delim -SAXON_JAR!$SAXON_JAR$ac_delim -CURLCONFIG!$CURLCONFIG$ac_delim -SYSTEM_CURL!$SYSTEM_CURL$ac_delim -CURL_CFLAGS!$CURL_CFLAGS$ac_delim -CURL_LIBS!$CURL_LIBS$ac_delim -SYSTEM_BOOST!$SYSTEM_BOOST$ac_delim -SYSTEM_VIGRA!$SYSTEM_VIGRA$ac_delim -SYSTEM_ODBC_HEADERS!$SYSTEM_ODBC_HEADERS$ac_delim -WITH_MOZILLA!$WITH_MOZILLA$ac_delim -WITH_LDAP!$WITH_LDAP$ac_delim -WITH_OPENLDAP!$WITH_OPENLDAP$ac_delim -MOZ_NSS_CFLAGS!$MOZ_NSS_CFLAGS$ac_delim -MOZ_NSS_LIBS!$MOZ_NSS_LIBS$ac_delim -NSS_LIB!$NSS_LIB$ac_delim -MOZ_NSPR_CFLAGS!$MOZ_NSPR_CFLAGS$ac_delim -MOZ_NSPR_LIBS!$MOZ_NSPR_LIBS$ac_delim -NSPR_LIB!$NSPR_LIB$ac_delim -MOZILLAXPCOM_CFLAGS!$MOZILLAXPCOM_CFLAGS$ac_delim -MOZILLAXPCOM_LIBS!$MOZILLAXPCOM_LIBS$ac_delim -MOZILLA_VERSION!$MOZILLA_VERSION$ac_delim -MOZILLA_TOOLKIT!$MOZILLA_TOOLKIT$ac_delim -MOZGTK2_CFLAGS!$MOZGTK2_CFLAGS$ac_delim -MOZGTK2_LIBS!$MOZGTK2_LIBS$ac_delim -MOZLIBREQ_CFLAGS!$MOZLIBREQ_CFLAGS$ac_delim -MOZLIBREQ_LIBS!$MOZLIBREQ_LIBS$ac_delim -BUILD_MOZAB!$BUILD_MOZAB$ac_delim -SYSTEM_MOZILLA!$SYSTEM_MOZILLA$ac_delim -MOZ_FLAVOUR!$MOZ_FLAVOUR$ac_delim -MOZ_INC!$MOZ_INC$ac_delim -MOZ_LIB!$MOZ_LIB$ac_delim -MOZ_LIB_XPCOM!$MOZ_LIB_XPCOM$ac_delim -MOZ_LDAP_CFLAGS!$MOZ_LDAP_CFLAGS$ac_delim -SYSTEM_SANE_HEADER!$SYSTEM_SANE_HEADER$ac_delim -SYSTEM_GENBRK!$SYSTEM_GENBRK$ac_delim -SYSTEM_GENCCODE!$SYSTEM_GENCCODE$ac_delim -SYSTEM_GENCMN!$SYSTEM_GENCMN$ac_delim -SYSTEM_ICU!$SYSTEM_ICU$ac_delim -XMKMF!$XMKMF$ac_delim -X_CFLAGS!$X_CFLAGS$ac_delim -X_PRE_LIBS!$X_PRE_LIBS$ac_delim -X_LIBS!$X_LIBS$ac_delim -X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim -XINC!$XINC$ac_delim -XLIB!$XLIB$ac_delim -XAU_LIBS!$XAU_LIBS$ac_delim -DISABLE_XAW!$DISABLE_XAW$ac_delim -SYSTEM_XRENDER_HEADERS!$SYSTEM_XRENDER_HEADERS$ac_delim -XRENDER_LINK!$XRENDER_LINK$ac_delim -XRANDR_CFLAGS!$XRANDR_CFLAGS$ac_delim -XRANDR_LIBS!$XRANDR_LIBS$ac_delim -XRANDR_DLOPEN!$XRANDR_DLOPEN$ac_delim -ENABLE_RANDR!$ENABLE_RANDR$ac_delim -DISABLE_NEON!$DISABLE_NEON$ac_delim -NEON_CFLAGS!$NEON_CFLAGS$ac_delim -NEON_LIBS!$NEON_LIBS$ac_delim -OPENSSL_CFLAGS!$OPENSSL_CFLAGS$ac_delim -OPENSSL_LIBS!$OPENSSL_LIBS$ac_delim -SYSTEM_OPENSSL!$SYSTEM_OPENSSL$ac_delim -SYSTEM_NEON!$SYSTEM_NEON$ac_delim -NEON_VERSION!$NEON_VERSION$ac_delim -ENABLE_AGG!$ENABLE_AGG$ac_delim -AGG_CFLAGS!$AGG_CFLAGS$ac_delim -AGG_LIBS!$AGG_LIBS$ac_delim -SYSTEM_AGG!$SYSTEM_AGG$ac_delim -AGG_VERSION!$AGG_VERSION$ac_delim -REDLAND_CFLAGS!$REDLAND_CFLAGS$ac_delim -REDLAND_LIBS!$REDLAND_LIBS$ac_delim -SYSTEM_REDLAND!$SYSTEM_REDLAND$ac_delim -HUNSPELL_CFLAGS!$HUNSPELL_CFLAGS$ac_delim -HUNSPELL_LIBS!$HUNSPELL_LIBS$ac_delim -SYSTEM_HUNSPELL!$SYSTEM_HUNSPELL$ac_delim -SYSTEM_HYPH!$SYSTEM_HYPH$ac_delim -HYPHEN_LIB!$HYPHEN_LIB$ac_delim -SYSTEM_MYTHES!$SYSTEM_MYTHES$ac_delim -SYSTEM_LPSOLVE!$SYSTEM_LPSOLVE$ac_delim -PSDK_HOME!$PSDK_HOME$ac_delim -WINDOWS_VISTA_PSDK!$WINDOWS_VISTA_PSDK$ac_delim -DIRECTXSDK_HOME!$DIRECTXSDK_HOME$ac_delim -DIRECTXSDK_LIB!$DIRECTXSDK_LIB$ac_delim -NSIS_PATH!$NSIS_PATH$ac_delim -BISON!$BISON$ac_delim -FLEX!$FLEX$ac_delim -PATCH!$PATCH$ac_delim -GNUCP!$GNUCP$ac_delim -GNUPATCH!$GNUPATCH$ac_delim -CYGWIN_PATH!$CYGWIN_PATH$ac_delim -ML_EXE!$ML_EXE$ac_delim -ASM_HOME!$ASM_HOME$ac_delim -ZIP!$ZIP$ac_delim -UNZIP!$UNZIP$ac_delim -ZIP_HOME!$ZIP_HOME$ac_delim -WITH_GPC!$WITH_GPC$ac_delim -ENABLE_GTK!$ENABLE_GTK$ac_delim -_ACEOF - - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -if test -n "$ac_eof"; then - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` - ac_eof=`expr $ac_eof + 1` -fi +# +# CONFIG_FILES section. +# -cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -_ACEOF -sed ' -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -s/^/s,@/; s/!/@,|#_!!_#|/ -:n -t n -s/'"$ac_delim"'$/,g/; t -s/$/\\/; p -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF -CEOF$ac_eof -_ACEOF - - -ac_delim='%!_!# ' -for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -ENABLE_KDE!$ENABLE_KDE$ac_delim -GCONF_CFLAGS!$GCONF_CFLAGS$ac_delim -GCONF_LIBS!$GCONF_LIBS$ac_delim -ENABLE_GCONF!$ENABLE_GCONF$ac_delim -GNOMEVFS_CFLAGS!$GNOMEVFS_CFLAGS$ac_delim -GNOMEVFS_LIBS!$GNOMEVFS_LIBS$ac_delim -ENABLE_GNOMEVFS!$ENABLE_GNOMEVFS$ac_delim -GTK_CFLAGS!$GTK_CFLAGS$ac_delim -GTK_LIBS!$GTK_LIBS$ac_delim -DBUS_CFLAGS!$DBUS_CFLAGS$ac_delim -DBUS_LIBS!$DBUS_LIBS$ac_delim -GIO_CFLAGS!$GIO_CFLAGS$ac_delim -GIO_LIBS!$GIO_LIBS$ac_delim -ENABLE_GIO!$ENABLE_GIO$ac_delim -ENABLE_DBUS!$ENABLE_DBUS$ac_delim -ENABLE_SYSTRAY_GTK!$ENABLE_SYSTRAY_GTK$ac_delim -CAIRO_CFLAGS!$CAIRO_CFLAGS$ac_delim -CAIRO_LIBS!$CAIRO_LIBS$ac_delim -ENABLE_CAIRO!$ENABLE_CAIRO$ac_delim -BUILD_PIXMAN!$BUILD_PIXMAN$ac_delim -SYSTEM_CAIRO!$SYSTEM_CAIRO$ac_delim -ENABLE_OPENGL!$ENABLE_OPENGL$ac_delim -ENABLE_MINIMIZER!$ENABLE_MINIMIZER$ac_delim -ENABLE_PRESENTER_SCREEN!$ENABLE_PRESENTER_SCREEN$ac_delim -POPPLER_CFLAGS!$POPPLER_CFLAGS$ac_delim -POPPLER_LIBS!$POPPLER_LIBS$ac_delim -ENABLE_PDFIMPORT!$ENABLE_PDFIMPORT$ac_delim -SYSTEM_POPPLER!$SYSTEM_POPPLER$ac_delim -ENABLE_MEDIAWIKI!$ENABLE_MEDIAWIKI$ac_delim -SYSTEM_SERVLETAPI!$SYSTEM_SERVLETAPI$ac_delim -SERVLETAPI_JAR!$SERVLETAPI_JAR$ac_delim -ENABLE_REPORTBUILDER!$ENABLE_REPORTBUILDER$ac_delim -SYSTEM_JFREEREPORT!$SYSTEM_JFREEREPORT$ac_delim -SAC_JAR!$SAC_JAR$ac_delim -LIBXML_JAR!$LIBXML_JAR$ac_delim -FLUTE_JAR!$FLUTE_JAR$ac_delim -JFREEREPORT_JAR!$JFREEREPORT_JAR$ac_delim -LIBBASE_JAR!$LIBBASE_JAR$ac_delim -LIBLAYOUT_JAR!$LIBLAYOUT_JAR$ac_delim -LIBLOADER_JAR!$LIBLOADER_JAR$ac_delim -LIBFORMULA_JAR!$LIBFORMULA_JAR$ac_delim -LIBREPOSITORY_JAR!$LIBREPOSITORY_JAR$ac_delim -LIBFONTS_JAR!$LIBFONTS_JAR$ac_delim -LIBSERIALIZER_JAR!$LIBSERIALIZER_JAR$ac_delim -SYSTEM_APACHE_COMMONS!$SYSTEM_APACHE_COMMONS$ac_delim -COMMONS_CODEC_JAR!$COMMONS_CODEC_JAR$ac_delim -COMMONS_LANG_JAR!$COMMONS_LANG_JAR$ac_delim -COMMONS_HTTPCLIENT_JAR!$COMMONS_HTTPCLIENT_JAR$ac_delim -COMMONS_LOGGING_JAR!$COMMONS_LOGGING_JAR$ac_delim -MOC!$MOC$ac_delim -KDE_CFLAGS!$KDE_CFLAGS$ac_delim -KDE_LIBS!$KDE_LIBS$ac_delim -ENABLE_LOCKDOWN!$ENABLE_LOCKDOWN$ac_delim -GOBJECT_CFLAGS!$GOBJECT_CFLAGS$ac_delim -GOBJECT_LIBS!$GOBJECT_LIBS$ac_delim -ENABLE_EVOAB2!$ENABLE_EVOAB2$ac_delim -ENABLE_KAB!$ENABLE_KAB$ac_delim -WITH_FONTOOO!$WITH_FONTOOO$ac_delim -SYSTEM_MSPACK!$SYSTEM_MSPACK$ac_delim -WITH_FONTS!$WITH_FONTS$ac_delim -WITHOUT_PPDS!$WITHOUT_PPDS$ac_delim -WITHOUT_AFMS!$WITHOUT_AFMS$ac_delim -SCPDEFS!$SCPDEFS$ac_delim -USE_XINERAMA!$USE_XINERAMA$ac_delim -XINERAMA_LINK!$XINERAMA_LINK$ac_delim -ANT!$ANT$ac_delim -ANT_HOME!$ANT_HOME$ac_delim -ANT_LIB!$ANT_LIB$ac_delim -WITH_LANG!$WITH_LANG$ac_delim -WITH_POOR_HELP_LOCALIZATIONS!$WITH_POOR_HELP_LOCALIZATIONS$ac_delim -WITH_DICT!$WITH_DICT$ac_delim -INTRO_BITMAPS!$INTRO_BITMAPS$ac_delim -ABOUT_BITMAPS!$ABOUT_BITMAPS$ac_delim -OOO_VENDOR!$OOO_VENDOR$ac_delim -UNIXWRAPPERNAME!$UNIXWRAPPERNAME$ac_delim -ENABLE_STATIC_GTK!$ENABLE_STATIC_GTK$ac_delim -ENABLE_LAYOUT!$ENABLE_LAYOUT$ac_delim -VERBOSE!$VERBOSE$ac_delim -LOCAL_SOLVER!$LOCAL_SOLVER$ac_delim -BUILD_TYPE!$BUILD_TYPE$ac_delim -LIBOBJS!$LIBOBJS$ac_delim -LTLIBOBJS!$LTLIBOBJS$ac_delim -_ACEOF - - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 82; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " +# No need to generate the scripts if there are no CONFIG_FILES. +# This happens for instance when ./config.status config.h +if test -n "\$CONFIG_FILES"; then + # Protect against being on the right side of a sed subst in config.status. + sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; + s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF +s,@SHELL@,$SHELL,;t t +s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t +s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t +s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t +s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t +s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t +s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t +s,@exec_prefix@,$exec_prefix,;t t +s,@prefix@,$prefix,;t t +s,@program_transform_name@,$program_transform_name,;t t +s,@bindir@,$bindir,;t t +s,@sbindir@,$sbindir,;t t +s,@libexecdir@,$libexecdir,;t t +s,@datadir@,$datadir,;t t +s,@sysconfdir@,$sysconfdir,;t t +s,@sharedstatedir@,$sharedstatedir,;t t +s,@localstatedir@,$localstatedir,;t t +s,@libdir@,$libdir,;t t +s,@includedir@,$includedir,;t t +s,@oldincludedir@,$oldincludedir,;t t +s,@infodir@,$infodir,;t t +s,@mandir@,$mandir,;t t +s,@build_alias@,$build_alias,;t t +s,@host_alias@,$host_alias,;t t +s,@target_alias@,$target_alias,;t t +s,@DEFS@,$DEFS,;t t +s,@ECHO_C@,$ECHO_C,;t t +s,@ECHO_N@,$ECHO_N,;t t +s,@ECHO_T@,$ECHO_T,;t t +s,@LIBS@,$LIBS,;t t +s,@EGREP@,$EGREP,;t t +s,@AWK@,$AWK,;t t +s,@SED@,$SED,;t t +s,@LOCAL_SOLENV@,$LOCAL_SOLENV,;t t +s,@_solenv@,$_solenv,;t t +s,@UPD@,$UPD,;t t +s,@SOURCEVERSION@,$SOURCEVERSION,;t t +s,@build@,$build,;t t +s,@build_cpu@,$build_cpu,;t t +s,@build_vendor@,$build_vendor,;t t +s,@build_os@,$build_os,;t t +s,@host@,$host,;t t +s,@host_cpu@,$host_cpu,;t t +s,@host_vendor@,$host_vendor,;t t +s,@host_os@,$host_os,;t t +s,@target@,$target,;t t +s,@target_cpu@,$target_cpu,;t t +s,@target_vendor@,$target_vendor,;t t +s,@target_os@,$target_os,;t t +s,@GNUTAR@,$GNUTAR,;t t +s,@OSVERSION@,$OSVERSION,;t t +s,@PTHREAD_CFLAGS@,$PTHREAD_CFLAGS,;t t +s,@PTHREAD_LIBS@,$PTHREAD_LIBS,;t t +s,@ENABLE_CRASHDUMP@,$ENABLE_CRASHDUMP,;t t +s,@VC_STANDARD@,$VC_STANDARD,;t t +s,@ENABLE_WERROR@,$ENABLE_WERROR,;t t +s,@ENABLE_DEBUG@,$ENABLE_DEBUG,;t t +s,@PRODUCT@,$PRODUCT,;t t +s,@PROFULLSWITCH@,$PROFULLSWITCH,;t t +s,@PROEXT@,$PROEXT,;t t +s,@ENABLE_SYMBOLS@,$ENABLE_SYMBOLS,;t t +s,@DISABLE_STRIP@,$DISABLE_STRIP,;t t +s,@ENABLE_CUPS@,$ENABLE_CUPS,;t t +s,@ENABLE_FONTCONFIG@,$ENABLE_FONTCONFIG,;t t +s,@WITH_BINFILTER@,$WITH_BINFILTER,;t t +s,@ENABLE_DIRECTX@,$ENABLE_DIRECTX,;t t +s,@DISABLE_ACTIVEX@,$DISABLE_ACTIVEX,;t t +s,@DISABLE_ATL@,$DISABLE_ATL,;t t +s,@ENABLE_RPATH@,$ENABLE_RPATH,;t t +s,@WITH_MYSPELL_DICTS@,$WITH_MYSPELL_DICTS,;t t +s,@SYSTEM_DICTS@,$SYSTEM_DICTS,;t t +s,@DICT_SYSTEM_DIR@,$DICT_SYSTEM_DIR,;t t +s,@HYPH_SYSTEM_DIR@,$HYPH_SYSTEM_DIR,;t t +s,@THES_SYSTEM_DIR@,$THES_SYSTEM_DIR,;t t +s,@USE_SHELL@,$USE_SHELL,;t t +s,@WITH_MINGWIN@,$WITH_MINGWIN,;t t +s,@SHELLPATH@,$SHELLPATH,;t t +s,@GCC_HOME@,$GCC_HOME,;t t +s,@CC@,$CC,;t t +s,@CFLAGS@,$CFLAGS,;t t +s,@LDFLAGS@,$LDFLAGS,;t t +s,@CPPFLAGS@,$CPPFLAGS,;t t +s,@ac_ct_CC@,$ac_ct_CC,;t t +s,@EXEEXT@,$EXEEXT,;t t +s,@OBJEXT@,$OBJEXT,;t t +s,@COMPATH@,$COMPATH,;t t +s,@GCCVER@,$GCCVER,;t t +s,@HAVE_LD_BSYMBOLIC_FUNCTIONS@,$HAVE_LD_BSYMBOLIC_FUNCTIONS,;t t +s,@ENABLE_PCH@,$ENABLE_PCH,;t t +s,@NO_HIDS@,$NO_HIDS,;t t +s,@GNUMAKE@,$GNUMAKE,;t t +s,@_cc@,$_cc,;t t +s,@HAVE_LD_HASH_STYLE@,$HAVE_LD_HASH_STYLE,;t t +s,@PERL@,$PERL,;t t +s,@MSPDB_PATH@,$MSPDB_PATH,;t t +s,@COMEX@,$COMEX,;t t +s,@USE_MINGW@,$USE_MINGW,;t t +s,@MIDL_PATH@,$MIDL_PATH,;t t +s,@CSC_PATH@,$CSC_PATH,;t t +s,@FRAME_HOME@,$FRAME_HOME,;t t +s,@CPP@,$CPP,;t t +s,@CXX@,$CXX,;t t +s,@CXXFLAGS@,$CXXFLAGS,;t t +s,@ac_ct_CXX@,$ac_ct_CXX,;t t +s,@CXXCPP@,$CXXCPP,;t t +s,@SIZEOF_LONG@,$SIZEOF_LONG,;t t +s,@WORDS_BIGENDIAN@,$WORDS_BIGENDIAN,;t t +s,@LFS_CFLAGS@,$LFS_CFLAGS,;t t +s,@ENABLE_VBA@,$ENABLE_VBA,;t t +s,@VBA_EXTENSION@,$VBA_EXTENSION,;t t +s,@PAM@,$PAM,;t t +s,@NEW_SHADOW_API@,$NEW_SHADOW_API,;t t +s,@PAM_LINK@,$PAM_LINK,;t t +s,@CRYPT_LINK@,$CRYPT_LINK,;t t +s,@GXX_INCLUDE_PATH@,$GXX_INCLUDE_PATH,;t t +s,@MINGW_LIB_INCLUDE_PATH@,$MINGW_LIB_INCLUDE_PATH,;t t +s,@STLPORT4@,$STLPORT4,;t t +s,@STLPORT_VER@,$STLPORT_VER,;t t +s,@USE_SYSTEM_STL@,$USE_SYSTEM_STL,;t t +s,@HAVE_GCC_VISIBILITY_FEATURE@,$HAVE_GCC_VISIBILITY_FEATURE,;t t +s,@ALLOC@,$ALLOC,;t t +s,@BUILD_VER_STRING@,$BUILD_VER_STRING,;t t +s,@SOLAR_JAVA@,$SOLAR_JAVA,;t t +s,@JAVAINTERPRETER@,$JAVAINTERPRETER,;t t +s,@JAVACOMPILER@,$JAVACOMPILER,;t t +s,@JAVACISGCJ@,$JAVACISGCJ,;t t +s,@JAVADOC@,$JAVADOC,;t t +s,@AWTLIB@,$AWTLIB,;t t +s,@JAVAAOTCOMPILER@,$JAVAAOTCOMPILER,;t t +s,@JAVA_HOME@,$JAVA_HOME,;t t +s,@JDK@,$JDK,;t t +s,@JAVAFLAGS@,$JAVAFLAGS,;t t +s,@DMAKE@,$DMAKE,;t t +s,@BUILD_DMAKE@,$BUILD_DMAKE,;t t +s,@EPM@,$EPM,;t t +s,@DPKG@,$DPKG,;t t +s,@PKGMK@,$PKGMK,;t t +s,@BUILD_EPM@,$BUILD_EPM,;t t +s,@PKGFORMAT@,$PKGFORMAT,;t t +s,@RPM@,$RPM,;t t +s,@GPERF@,$GPERF,;t t +s,@MINGWCXX@,$MINGWCXX,;t t +s,@ac_ct_MINGWCXX@,$ac_ct_MINGWCXX,;t t +s,@MINGWSTRIP@,$MINGWSTRIP,;t t +s,@ac_ct_MINGWSTRIP@,$ac_ct_MINGWSTRIP,;t t +s,@BUILD_UNOWINREG@,$BUILD_UNOWINREG,;t t +s,@BUILD_QADEVOOO@,$BUILD_QADEVOOO,;t t +s,@SYSTEM_STDLIBS@,$SYSTEM_STDLIBS,;t t +s,@SYSTEM_ZLIB@,$SYSTEM_ZLIB,;t t +s,@SYSTEM_JPEG@,$SYSTEM_JPEG,;t t +s,@SYSTEM_EXPAT@,$SYSTEM_EXPAT,;t t +s,@PKG_CONFIG@,$PKG_CONFIG,;t t +s,@LIBWPD_CFLAGS@,$LIBWPD_CFLAGS,;t t +s,@LIBWPD_LIBS@,$LIBWPD_LIBS,;t t +s,@SYSTEM_LIBWPD@,$SYSTEM_LIBWPD,;t t +s,@FREETYPE_CFLAGS@,$FREETYPE_CFLAGS,;t t +s,@FREETYPE_LIBS@,$FREETYPE_LIBS,;t t +s,@USE_FT_EMBOLDEN@,$USE_FT_EMBOLDEN,;t t +s,@LIBXSLT_CFLAGS@,$LIBXSLT_CFLAGS,;t t +s,@LIBXSLT_LIBS@,$LIBXSLT_LIBS,;t t +s,@XSLTPROC@,$XSLTPROC,;t t +s,@SYSTEM_LIBXSLT@,$SYSTEM_LIBXSLT,;t t +s,@LIBXML_CFLAGS@,$LIBXML_CFLAGS,;t t +s,@LIBXML_LIBS@,$LIBXML_LIBS,;t t +s,@SYSTEM_LIBXML@,$SYSTEM_LIBXML,;t t +s,@PYTHON@,$PYTHON,;t t +s,@PYTHON_VERSION@,$PYTHON_VERSION,;t t +s,@PYTHON_PREFIX@,$PYTHON_PREFIX,;t t +s,@PYTHON_EXEC_PREFIX@,$PYTHON_EXEC_PREFIX,;t t +s,@PYTHON_PLATFORM@,$PYTHON_PLATFORM,;t t +s,@pythondir@,$pythondir,;t t +s,@pkgpythondir@,$pkgpythondir,;t t +s,@pyexecdir@,$pyexecdir,;t t +s,@pkgpyexecdir@,$pkgpyexecdir,;t t +s,@BZIP2@,$BZIP2,;t t +s,@SYSTEM_PYTHON@,$SYSTEM_PYTHON,;t t +s,@PYTHON_CFLAGS@,$PYTHON_CFLAGS,;t t +s,@PYTHON_LIBS@,$PYTHON_LIBS,;t t +s,@HOME@,$HOME,;t t +s,@SYSTEM_DB@,$SYSTEM_DB,;t t +s,@DB_VERSION@,$DB_VERSION,;t t +s,@DB_INCLUDES@,$DB_INCLUDES,;t t +s,@DB_JAR@,$DB_JAR,;t t +s,@SYSTEM_LUCENE@,$SYSTEM_LUCENE,;t t +s,@LUCENE_CORE_JAR@,$LUCENE_CORE_JAR,;t t +s,@LUCENE_ANALYZERS_JAR@,$LUCENE_ANALYZERS_JAR,;t t +s,@SYSTEM_HSQLDB@,$SYSTEM_HSQLDB,;t t +s,@HSQLDB_JAR@,$HSQLDB_JAR,;t t +s,@SYSTEM_BSH@,$SYSTEM_BSH,;t t +s,@BSH_JAR@,$BSH_JAR,;t t +s,@SERIALIZER_JAR@,$SERIALIZER_JAR,;t t +s,@SYSTEM_SAXON@,$SYSTEM_SAXON,;t t +s,@SAXON_JAR@,$SAXON_JAR,;t t +s,@CURLCONFIG@,$CURLCONFIG,;t t +s,@SYSTEM_CURL@,$SYSTEM_CURL,;t t +s,@CURL_CFLAGS@,$CURL_CFLAGS,;t t +s,@CURL_LIBS@,$CURL_LIBS,;t t +s,@SYSTEM_BOOST@,$SYSTEM_BOOST,;t t +s,@SYSTEM_VIGRA@,$SYSTEM_VIGRA,;t t +s,@SYSTEM_ODBC_HEADERS@,$SYSTEM_ODBC_HEADERS,;t t +s,@WITH_MOZILLA@,$WITH_MOZILLA,;t t +s,@WITH_LDAP@,$WITH_LDAP,;t t +s,@WITH_OPENLDAP@,$WITH_OPENLDAP,;t t +s,@MOZ_NSS_CFLAGS@,$MOZ_NSS_CFLAGS,;t t +s,@MOZ_NSS_LIBS@,$MOZ_NSS_LIBS,;t t +s,@NSS_LIB@,$NSS_LIB,;t t +s,@MOZ_NSPR_CFLAGS@,$MOZ_NSPR_CFLAGS,;t t +s,@MOZ_NSPR_LIBS@,$MOZ_NSPR_LIBS,;t t +s,@NSPR_LIB@,$NSPR_LIB,;t t +s,@MOZILLAXPCOM_CFLAGS@,$MOZILLAXPCOM_CFLAGS,;t t +s,@MOZILLAXPCOM_LIBS@,$MOZILLAXPCOM_LIBS,;t t +s,@MOZILLA_VERSION@,$MOZILLA_VERSION,;t t +s,@MOZILLA_TOOLKIT@,$MOZILLA_TOOLKIT,;t t +s,@MOZGTK2_CFLAGS@,$MOZGTK2_CFLAGS,;t t +s,@MOZGTK2_LIBS@,$MOZGTK2_LIBS,;t t +s,@MOZLIBREQ_CFLAGS@,$MOZLIBREQ_CFLAGS,;t t +s,@MOZLIBREQ_LIBS@,$MOZLIBREQ_LIBS,;t t +s,@BUILD_MOZAB@,$BUILD_MOZAB,;t t +s,@SYSTEM_MOZILLA@,$SYSTEM_MOZILLA,;t t +s,@MOZ_FLAVOUR@,$MOZ_FLAVOUR,;t t +s,@MOZ_INC@,$MOZ_INC,;t t +s,@MOZ_LIB@,$MOZ_LIB,;t t +s,@MOZ_LIB_XPCOM@,$MOZ_LIB_XPCOM,;t t +s,@MOZ_LDAP_CFLAGS@,$MOZ_LDAP_CFLAGS,;t t +s,@SYSTEM_SANE_HEADER@,$SYSTEM_SANE_HEADER,;t t +s,@SYSTEM_GENBRK@,$SYSTEM_GENBRK,;t t +s,@SYSTEM_GENCCODE@,$SYSTEM_GENCCODE,;t t +s,@SYSTEM_GENCMN@,$SYSTEM_GENCMN,;t t +s,@SYSTEM_ICU@,$SYSTEM_ICU,;t t +s,@X_CFLAGS@,$X_CFLAGS,;t t +s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t +s,@X_LIBS@,$X_LIBS,;t t +s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t +s,@XINC@,$XINC,;t t +s,@XLIB@,$XLIB,;t t +s,@XAU_LIBS@,$XAU_LIBS,;t t +s,@DISABLE_XAW@,$DISABLE_XAW,;t t +s,@SYSTEM_XRENDER_HEADERS@,$SYSTEM_XRENDER_HEADERS,;t t +s,@XRENDER_LINK@,$XRENDER_LINK,;t t +s,@XRANDR_CFLAGS@,$XRANDR_CFLAGS,;t t +s,@XRANDR_LIBS@,$XRANDR_LIBS,;t t +s,@XRANDR_DLOPEN@,$XRANDR_DLOPEN,;t t +s,@ENABLE_RANDR@,$ENABLE_RANDR,;t t +s,@DISABLE_NEON@,$DISABLE_NEON,;t t +s,@NEON_CFLAGS@,$NEON_CFLAGS,;t t +s,@NEON_LIBS@,$NEON_LIBS,;t t +s,@OPENSSL_CFLAGS@,$OPENSSL_CFLAGS,;t t +s,@OPENSSL_LIBS@,$OPENSSL_LIBS,;t t +s,@SYSTEM_OPENSSL@,$SYSTEM_OPENSSL,;t t +s,@SYSTEM_NEON@,$SYSTEM_NEON,;t t +s,@NEON_VERSION@,$NEON_VERSION,;t t +s,@ENABLE_AGG@,$ENABLE_AGG,;t t +s,@AGG_CFLAGS@,$AGG_CFLAGS,;t t +s,@AGG_LIBS@,$AGG_LIBS,;t t +s,@SYSTEM_AGG@,$SYSTEM_AGG,;t t +s,@AGG_VERSION@,$AGG_VERSION,;t t +s,@REDLAND_CFLAGS@,$REDLAND_CFLAGS,;t t +s,@REDLAND_LIBS@,$REDLAND_LIBS,;t t +s,@SYSTEM_REDLAND@,$SYSTEM_REDLAND,;t t +s,@HUNSPELL_CFLAGS@,$HUNSPELL_CFLAGS,;t t +s,@HUNSPELL_LIBS@,$HUNSPELL_LIBS,;t t +s,@SYSTEM_HUNSPELL@,$SYSTEM_HUNSPELL,;t t +s,@SYSTEM_HYPH@,$SYSTEM_HYPH,;t t +s,@HYPHEN_LIB@,$HYPHEN_LIB,;t t +s,@SYSTEM_MYTHES@,$SYSTEM_MYTHES,;t t +s,@SYSTEM_LPSOLVE@,$SYSTEM_LPSOLVE,;t t +s,@PSDK_HOME@,$PSDK_HOME,;t t +s,@WINDOWS_VISTA_PSDK@,$WINDOWS_VISTA_PSDK,;t t +s,@DIRECTXSDK_HOME@,$DIRECTXSDK_HOME,;t t +s,@DIRECTXSDK_LIB@,$DIRECTXSDK_LIB,;t t +s,@NSIS_PATH@,$NSIS_PATH,;t t +s,@BISON@,$BISON,;t t +s,@FLEX@,$FLEX,;t t +s,@PATCH@,$PATCH,;t t +s,@GNUCP@,$GNUCP,;t t +s,@GNUPATCH@,$GNUPATCH,;t t +s,@CYGWIN_PATH@,$CYGWIN_PATH,;t t +s,@ML_EXE@,$ML_EXE,;t t +s,@ASM_HOME@,$ASM_HOME,;t t +s,@ZIP@,$ZIP,;t t +s,@UNZIP@,$UNZIP,;t t +s,@ZIP_HOME@,$ZIP_HOME,;t t +s,@WITH_GPC@,$WITH_GPC,;t t +s,@ENABLE_GTK@,$ENABLE_GTK,;t t +s,@ENABLE_KDE@,$ENABLE_KDE,;t t +s,@ENABLE_KDE4@,$ENABLE_KDE4,;t t +s,@GCONF_CFLAGS@,$GCONF_CFLAGS,;t t +s,@GCONF_LIBS@,$GCONF_LIBS,;t t +s,@ENABLE_GCONF@,$ENABLE_GCONF,;t t +s,@GNOMEVFS_CFLAGS@,$GNOMEVFS_CFLAGS,;t t +s,@GNOMEVFS_LIBS@,$GNOMEVFS_LIBS,;t t +s,@ENABLE_GNOMEVFS@,$ENABLE_GNOMEVFS,;t t +s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t +s,@GTK_LIBS@,$GTK_LIBS,;t t +s,@DBUS_CFLAGS@,$DBUS_CFLAGS,;t t +s,@DBUS_LIBS@,$DBUS_LIBS,;t t +s,@GIO_CFLAGS@,$GIO_CFLAGS,;t t +s,@GIO_LIBS@,$GIO_LIBS,;t t +s,@ENABLE_GIO@,$ENABLE_GIO,;t t +s,@ENABLE_DBUS@,$ENABLE_DBUS,;t t +s,@ENABLE_SYSTRAY_GTK@,$ENABLE_SYSTRAY_GTK,;t t +s,@CAIRO_CFLAGS@,$CAIRO_CFLAGS,;t t +s,@CAIRO_LIBS@,$CAIRO_LIBS,;t t +s,@ENABLE_CAIRO@,$ENABLE_CAIRO,;t t +s,@BUILD_PIXMAN@,$BUILD_PIXMAN,;t t +s,@SYSTEM_CAIRO@,$SYSTEM_CAIRO,;t t +s,@ENABLE_OPENGL@,$ENABLE_OPENGL,;t t +s,@ENABLE_MINIMIZER@,$ENABLE_MINIMIZER,;t t +s,@ENABLE_PRESENTER_SCREEN@,$ENABLE_PRESENTER_SCREEN,;t t +s,@POPPLER_CFLAGS@,$POPPLER_CFLAGS,;t t +s,@POPPLER_LIBS@,$POPPLER_LIBS,;t t +s,@ENABLE_PDFIMPORT@,$ENABLE_PDFIMPORT,;t t +s,@SYSTEM_POPPLER@,$SYSTEM_POPPLER,;t t +s,@ENABLE_MEDIAWIKI@,$ENABLE_MEDIAWIKI,;t t +s,@SYSTEM_SERVLETAPI@,$SYSTEM_SERVLETAPI,;t t +s,@SERVLETAPI_JAR@,$SERVLETAPI_JAR,;t t +s,@ENABLE_REPORTBUILDER@,$ENABLE_REPORTBUILDER,;t t +s,@SYSTEM_JFREEREPORT@,$SYSTEM_JFREEREPORT,;t t +s,@SAC_JAR@,$SAC_JAR,;t t +s,@LIBXML_JAR@,$LIBXML_JAR,;t t +s,@FLUTE_JAR@,$FLUTE_JAR,;t t +s,@JFREEREPORT_JAR@,$JFREEREPORT_JAR,;t t +s,@LIBBASE_JAR@,$LIBBASE_JAR,;t t +s,@LIBLAYOUT_JAR@,$LIBLAYOUT_JAR,;t t +s,@LIBLOADER_JAR@,$LIBLOADER_JAR,;t t +s,@LIBFORMULA_JAR@,$LIBFORMULA_JAR,;t t +s,@LIBREPOSITORY_JAR@,$LIBREPOSITORY_JAR,;t t +s,@LIBFONTS_JAR@,$LIBFONTS_JAR,;t t +s,@LIBSERIALIZER_JAR@,$LIBSERIALIZER_JAR,;t t +s,@SYSTEM_APACHE_COMMONS@,$SYSTEM_APACHE_COMMONS,;t t +s,@COMMONS_CODEC_JAR@,$COMMONS_CODEC_JAR,;t t +s,@COMMONS_LANG_JAR@,$COMMONS_LANG_JAR,;t t +s,@COMMONS_HTTPCLIENT_JAR@,$COMMONS_HTTPCLIENT_JAR,;t t +s,@COMMONS_LOGGING_JAR@,$COMMONS_LOGGING_JAR,;t t +s,@MOC@,$MOC,;t t +s,@KDE_CFLAGS@,$KDE_CFLAGS,;t t +s,@KDE_LIBS@,$KDE_LIBS,;t t +s,@MOC4@,$MOC4,;t t +s,@KDE4_CFLAGS@,$KDE4_CFLAGS,;t t +s,@KDE4_LIBS@,$KDE4_LIBS,;t t +s,@ENABLE_LOCKDOWN@,$ENABLE_LOCKDOWN,;t t +s,@GOBJECT_CFLAGS@,$GOBJECT_CFLAGS,;t t +s,@GOBJECT_LIBS@,$GOBJECT_LIBS,;t t +s,@ENABLE_EVOAB2@,$ENABLE_EVOAB2,;t t +s,@ENABLE_KAB@,$ENABLE_KAB,;t t +s,@WITH_FONTOOO@,$WITH_FONTOOO,;t t +s,@SYSTEM_MSPACK@,$SYSTEM_MSPACK,;t t +s,@WITH_FONTS@,$WITH_FONTS,;t t +s,@WITHOUT_PPDS@,$WITHOUT_PPDS,;t t +s,@WITHOUT_AFMS@,$WITHOUT_AFMS,;t t +s,@SCPDEFS@,$SCPDEFS,;t t +s,@USE_XINERAMA@,$USE_XINERAMA,;t t +s,@XINERAMA_LINK@,$XINERAMA_LINK,;t t +s,@ANT@,$ANT,;t t +s,@ANT_HOME@,$ANT_HOME,;t t +s,@ANT_LIB@,$ANT_LIB,;t t +s,@WITH_LANG@,$WITH_LANG,;t t +s,@WITH_POOR_HELP_LOCALIZATIONS@,$WITH_POOR_HELP_LOCALIZATIONS,;t t +s,@WITH_DICT@,$WITH_DICT,;t t +s,@INTRO_BITMAPS@,$INTRO_BITMAPS,;t t +s,@ABOUT_BITMAPS@,$ABOUT_BITMAPS,;t t +s,@OOO_VENDOR@,$OOO_VENDOR,;t t +s,@UNIXWRAPPERNAME@,$UNIXWRAPPERNAME,;t t +s,@ENABLE_STATIC_GTK@,$ENABLE_STATIC_GTK,;t t +s,@ENABLE_LAYOUT@,$ENABLE_LAYOUT,;t t +s,@VERBOSE@,$VERBOSE,;t t +s,@LOCAL_SOLVER@,$LOCAL_SOLVER,;t t +s,@BUILD_TYPE@,$BUILD_TYPE,;t t +s,@LIBOBJS@,$LIBOBJS,;t t +s,@LTLIBOBJS@,$LTLIBOBJS,;t t +CEOF + +_ACEOF + + cat >>$CONFIG_STATUS <<\_ACEOF + # Split the substitutions into bite-sized pieces for seds with + # small command number limits, like on Digital OSF/1 and HP-UX. + ac_max_sed_lines=48 + ac_sed_frag=1 # Number of current file. + ac_beg=1 # First line for current file. + ac_end=$ac_max_sed_lines # Line after last line for current file. + ac_more_lines=: + ac_sed_cmds= + while $ac_more_lines; do + if test $ac_beg -gt 1; then + sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag + else + sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag + fi + if test ! -s $tmp/subs.frag; then + ac_more_lines=false + else + # The purpose of the label and of the branching condition is to + # speed up the sed processing (if there are no `@' at all, there + # is no need to browse any of the substitutions). + # These are the two extra sed commands mentioned above. + (echo ':t + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed + if test -z "$ac_sed_cmds"; then + ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" + else + ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" + fi + ac_sed_frag=`expr $ac_sed_frag + 1` + ac_beg=$ac_end + ac_end=`expr $ac_end + $ac_max_sed_lines` + fi + done + if test -z "$ac_sed_cmds"; then + ac_sed_cmds=cat fi -done - -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -if test -n "$ac_eof"; then - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` - ac_eof=`expr $ac_eof + 1` -fi +fi # test -n "$CONFIG_FILES" -cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end -_ACEOF -sed ' -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -s/^/s,@/; s/!/@,|#_!!_#|/ -:n -t n -s/'"$ac_delim"'$/,g/; t -s/$/\\/; p -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF -:end -s/|#_!!_#|//g -CEOF$ac_eof _ACEOF - - -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ -s/:*$// -s/^[^=]*=[ ]*$// -}' -fi - cat >>$CONFIG_STATUS <<\_ACEOF -fi # test -n "$CONFIG_FILES" - - -for ac_tag in :F $CONFIG_FILES -do - case $ac_tag in - :[FHLC]) ac_mode=$ac_tag; continue;; - esac - case $ac_mode$ac_tag in - :[FHL]*:*);; - :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 -echo "$as_me: error: Invalid tag $ac_tag." >&2;} - { (exit 1); exit 1; }; };; - :[FH]-) ac_tag=-:-;; - :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; - esac - ac_save_IFS=$IFS - IFS=: - set x $ac_tag - IFS=$ac_save_IFS - shift - ac_file=$1 - shift - - case $ac_mode in - :L) ac_source=$1;; - :[FH]) - ac_file_inputs= - for ac_f - do - case $ac_f in - -) ac_f="$tmp/stdin";; - *) # Look for the file first in the build tree, then in the source tree - # (if the path is not absolute). The absolute path cannot be DOS-style, - # because $ac_f cannot contain `:'. - test -f "$ac_f" || - case $ac_f in - [\\/$]*) false;; - *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; - esac || - { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -echo "$as_me: error: cannot find input file: $ac_f" >&2;} - { (exit 1); exit 1; }; };; - esac - ac_file_inputs="$ac_file_inputs $ac_f" - done - - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - configure_input="Generated from "`IFS=: - echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." - if test x"$ac_file" != x-; then - configure_input="$ac_file. $configure_input" - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - fi - - case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin";; - esac - ;; +for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". + case $ac_file in + - | *:- | *:-:* ) # input from stdin + cat >$tmp/stdin + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + * ) ac_file_in=$ac_file.in ;; esac - ac_dir=`$as_dirname -- "$ac_file" || + # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. + ac_dir=`(dirname "$ac_file") 2>/dev/null || $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - { as_dir="$ac_dir" - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + { if $as_mkdir_p; then + mkdir -p "$ac_dir" + else + as_dir="$ac_dir" as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || + while test ! -d "$as_dir"; do + as_dirs="$as_dir $as_dirs" + as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -echo "$as_me: error: cannot create directory $as_dir" >&2;} + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} { (exit 1); exit 1; }; }; } + ac_builddir=. -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) +if test "$ac_dir" != .; then ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix + # A "../" for each directory in $ac_dir_suffix. + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +else + ac_dir_suffix= ac_top_builddir= +fi case $srcdir in - .) # We are building in place. + .) # No --srcdir option. We are building in place. ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. + if test -z "$ac_top_builddir"; then + ac_top_srcdir=. + else + ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` + fi ;; + [\\/]* | ?:[\\/]* ) # Absolute path. ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; + ac_top_srcdir=$srcdir ;; + *) # Relative path. + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_builddir$srcdir ;; esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix +# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be +# absolute. +ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` +ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` +ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` +ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` - case $ac_mode in - :F) - # - # CONFIG_FILE - # + if test x"$ac_file" != x-; then + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + if test x"$ac_file" = x-; then + configure_input= + else + configure_input="$ac_file. " + fi + configure_input=$configure_input"Generated from `echo $ac_file_in | + sed 's,.*/,,'` by configure." + + # First look for the input files in the build tree, otherwise in the + # src tree. + ac_file_inputs=`IFS=: + for f in $ac_file_in; do + case $f in + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; + *) # Relative + if test -f "$f"; then + # Build tree + echo $f + elif test -f "$srcdir/$f"; then + # Source tree + echo $srcdir/$f + else + # /dev/null tree + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; + esac + done` || { (exit 1); exit 1; } _ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF -# If the template does not know about datarootdir, expand it. -# FIXME: This hack should be removed a few years after 2.60. -ac_datarootdir_hack=; ac_datarootdir_seen= - -case `sed -n '/datarootdir/ { - p - q -} -/@datadir@/p -/@docdir@/p -/@infodir@/p -/@localedir@/p -/@mandir@/p -' $ac_file_inputs` in -*datarootdir*) ac_datarootdir_seen=yes;; -*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF - ac_datarootdir_hack=' - s&@datadir@&$datadir&g - s&@docdir@&$docdir&g - s&@infodir@&$infodir&g - s&@localedir@&$localedir&g - s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; -esac -_ACEOF - -# Neutralize VPATH when `$srcdir' = `.'. -# Shell code in configure.ac might set extrasub. -# FIXME: do we really want to maintain this feature? cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub $extrasub @@ -29572,39 +27788,28 @@ _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s&@configure_input@&$configure_input&;t t -s&@top_builddir@&$ac_top_builddir_sub&;t t -s&@srcdir@&$ac_srcdir&;t t -s&@abs_srcdir@&$ac_abs_srcdir&;t t -s&@top_srcdir@&$ac_top_srcdir&;t t -s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t -s&@builddir@&$ac_builddir&;t t -s&@abs_builddir@&$ac_abs_builddir&;t t -s&@abs_top_builddir@&$ac_abs_top_builddir&;t t -$ac_datarootdir_hack -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" >$tmp/out - -test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && - { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 -echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} - - rm -f "$tmp/stdin" - case $ac_file in - -) cat "$tmp/out"; rm -f "$tmp/out";; - *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; - esac - ;; - - - - esac +s,@configure_input@,$configure_input,;t t +s,@srcdir@,$ac_srcdir,;t t +s,@abs_srcdir@,$ac_abs_srcdir,;t t +s,@top_srcdir@,$ac_top_srcdir,;t t +s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t +s,@builddir@,$ac_builddir,;t t +s,@abs_builddir@,$ac_abs_builddir,;t t +s,@top_builddir@,$ac_top_builddir,;t t +s,@abs_top_builddir@,$ac_abs_top_builddir,;t t +" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out + rm -f $tmp/stdin + if test x"$ac_file" != x-; then + mv $tmp/out $ac_file + else + cat $tmp/out + rm -f $tmp/out + fi -done # for ac_tag +done +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF { (exit 0); exit 0; } _ACEOF -- cgit From 7a16d4872376246bb30e7d956bd41aea77734aa5 Mon Sep 17 00:00:00 2001 From: Release Engineers Date: Tue, 11 Aug 2009 10:24:27 +0000 Subject: #i10000# fix multiple definition gids --- scp2/source/ooo/file_library_ooo.scp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 9ffcfb414105..351360c3939f 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -906,9 +906,8 @@ End #endif -STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Lng, lng) - #ifdef WNT + File gid_File_Lib_Rebasemsi TXT_FILE_BODY; Name = "rebase.dll"; -- cgit From 79801828e4d97a018bf489535522fc613ee6d226 Mon Sep 17 00:00:00 2001 From: Release Engineers Date: Tue, 11 Aug 2009 10:37:02 +0000 Subject: #i10000# added fallback for TMPDIR --- solenv/bin/mhids.pl | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/solenv/bin/mhids.pl b/solenv/bin/mhids.pl index 4b3ce1f2b4dc..6970ad275c3f 100644 --- a/solenv/bin/mhids.pl +++ b/solenv/bin/mhids.pl @@ -120,8 +120,13 @@ if ( $ENV{NO_HID_FILES} ) { $no_hid_files = $ENV{"NO_HID_FILES"}; } $solarincludes = $ENV{SOLARINCLUDES}; -$tmpdir = $ENV{TMPDIR}; -die "ERROR - \"TMPDIR\" environment variable not set\n" if ( !defined $tmpdir ); +if (defined $ENV{TMPDIR}) { + $tmpdir = $ENV{TMPDIR}; +} elsif (defined $ENV{TMP}) { + $tmpdir = $ENV{TMP}; +} else { + die "ERROR - \"TMPDIR\" & \"TMP\" environment variables not set\n"; +}; die "ERROR - \"$tmpdir\" doesn't exist\n" if ( ! -d $tmpdir ); setcompiler(); -- cgit From 847cd1ac5714c210a1e109fd6f3d25b79cc549c4 Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Mon, 17 Aug 2009 11:42:47 +0000 Subject: #i10000# no more OpenOffice_SDK --- instsetoo_native/util/pack.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instsetoo_native/util/pack.lst b/instsetoo_native/util/pack.lst index 875865d8accc..4b7f1954f084 100755 --- a/instsetoo_native/util/pack.lst +++ b/instsetoo_native/util/pack.lst @@ -14,7 +14,7 @@ OpenOffice unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12 #BrOffice_wJRE pt-BR brofficewithjre OpenOffice_Dev unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxmacxi.pro,unxlngx6.pro en-US openofficedev #BrOffice_Dev pt-BR brofficedev -OpenOffice_SDK unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12 en-US sdkoo +#OpenOffice_SDK unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12 en-US sdkoo OpenOffice_Dev_SDK unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12 en-US sdkoodev #URE unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngi6,unxsoli4,unxsols4,wntmsci12 en-US ure OpenOfficeLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro de ooolanguagepack -- cgit From 8f3d03669bac6c79d17a46edf7482ebc5f3120aa Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Mon, 17 Aug 2009 14:12:14 +0000 Subject: CWS-TOOLING: integrate CWS graphite01 2009-08-06 11:09:01 +0200 hdu r274708 : #i10000# fix build breaker for SYSTEM_GRAPHITE=NO 2009-07-21 12:01:52 +0200 hdu r274174 : #i93645# fix include files for EXT_USE_STLPORT 2009-07-21 11:51:07 +0200 hdu r274173 : #i93645# convert line-endings of files to be patched 2009-07-21 10:49:01 +0200 hdu r274170 : #i93645# adjust makefile.vc8 for HH-RelEng env (thanks ause) 2009-07-20 05:21:32 +0200 kstribley r274105 : attempt to fix Windows build error caused by NULL variable in nmake file 2009-07-16 10:22:36 +0200 hdu r274032 : #i69129# also use solar minor version to find graphite lib 2009-07-16 05:36:06 +0200 kstribley r274029 : allow windows build to have Graphite disabled with SAL_DISABLE_GRAPHITE 2009-07-15 13:59:22 +0200 hdu r274011 : #i69129# default to ENABLE_GRAPHITE=TRUE 2009-07-15 13:19:54 +0200 hdu r274008 : #i93645# ignore compile warnings for graphite 2009-07-15 13:18:25 +0200 hdu r274006 : #i93645# stlport needs libmath, use solar minor version to find matching libs 2009-07-15 09:21:13 +0200 hdu r273989 : #i100000# avoid compile warning 2009-07-14 12:19:08 +0200 hdu r273963 : CWS-TOOLING: rebase CWS graphite01 to trunk@273858 (milestone: DEV300:m52) 2009-07-13 06:54:56 +0200 kstribley r273912 : change to use standard file headers 2009-07-13 05:39:14 +0200 kstribley r273911 : Remove unnecessary change to configure.in as reported by Rene 2009-07-10 16:58:44 +0200 hdu r273902 : #i100000# fix compile for precompiled-header support 2009-07-02 13:48:26 +0200 kstribley r273647 : #69129# fix a graphite bug which could crash with fonts containing obscure GDL positioning rules 2009-07-02 01:44:02 +0200 rene r273616 : #i10000# we need to link with -licuuc 2009-07-01 04:02:20 +0200 kstribley r273540 : restore missing sdf files from base 2009-07-01 04:01:40 +0200 kstribley r273539 : restore missing sdf files from base 2009-07-01 04:01:12 +0200 kstribley r273538 : restore missing sdf files from base 2009-07-01 03:59:41 +0200 kstribley r273537 : restore missing sdf files from base 2009-06-29 10:16:51 +0200 kstribley r273456 : #i69129# fixes a bug which caused occasional incorrect linebreaking when graphite is asked to render a part of a cluster not containing a base 2009-06-27 10:43:58 +0200 kstribley r273445 : #i69129# added kashida support for justified RTL text 2009-06-01 12:57:06 +0200 kstribley r272476 : CWS-TOOLING: rebase CWS graphite01 to trunk@272291 (milestone: DEV300:m49) 2009-05-26 10:50:06 +0200 kstribley r272286 : #i69129# fixes a build error when NDEBUG is not defined 2009-05-25 13:14:06 +0200 kstribley r272237 : #i69129# enable debugging by fixing compile warnings 2009-05-25 13:07:47 +0200 kstribley r272234 : #i69129# added env variable to disable GRAPHITE at run time on linux and fixed a bug with a rare attachment sequence 2009-04-20 17:39:25 +0200 kstribley r271001 : CWS-TOOLING: rebase CWS graphite01 to trunk@270723 (milestone: DEV300:m46) 2009-04-18 07:11:33 +0200 kstribley r270957 : #i101178# attempt to fix buildbot builds by reordering configure.in 2009-04-14 17:37:07 +0200 kstribley r270801 : #i93645# tweak configure to enable graphite by default on windows and linux to assist testing with tinderbox build 2009-04-14 16:33:17 +0200 kstribley r270796 : #i96925# another fix for rtl fallback and add optional debug info in MultiSalLayout 2009-04-08 13:27:55 +0200 kstribley r270641 : #i69129# fix features after a bad merge 2009-04-08 13:26:34 +0200 kstribley r270640 : #i69129# add a patch for WinFont 2009-03-24 12:37:54 +0100 kstribley r269937 : #i69129# fix build error due to locale being included in method for features 2009-03-24 12:36:10 +0100 kstribley r269936 : #i93645# change patch variable and fix configure 2009-03-20 04:18:56 +0100 kstribley r269776 : CWS-TOOLING: rebase CWS graphite01 to trunk@269297 (milestone: DEV300:m43) 2009-03-01 13:10:59 +0100 kstribley r268622 : added a patch to improve handling of a font with bad graphite language feature tables #i93645# 2009-02-12 04:50:51 +0100 kstribley r267631 : #i93645# fix windows build for graphite 2.3.1 and remove unnecessary patch 2009-02-10 04:48:50 +0100 kstribley r267535 : #i93645# fix a build error with stlport on Ubuntu 8.10 x86 2009-02-10 03:51:10 +0100 kstribley r267534 : #i69129# remove legacy config_office 2009-02-07 19:12:54 +0100 kstribley r267482 : #i93645# upgrade to using silgraphite-2.3.1 2009-02-02 18:17:57 +0100 kstribley r267290 : #i69129# backout unwanted checkin 2009-02-02 17:44:03 +0100 kstribley r267281 : #i69129# backout erroneous update to aclocal.m4 2009-02-01 10:05:03 +0100 kstribley r267236 : #i69129# fix build error due to locale being added to set font attributes 2009-02-01 06:02:52 +0100 kstribley r267235 : #i69129# fix erroneous merge 2009-01-31 16:24:56 +0100 kstribley r267234 : #i69129# update configure.in solenv.in in their new locations with enable graphite 2009-01-31 10:53:18 +0100 kstribley r267232 : CWS-TOOLING: rebase CWS graphite01 to trunk@267171 (milestone: DEV300:m41) 2008-12-17 04:17:33 +0100 kstribley r265577 : #i93645# remove superfluous autoreconf check and autoconf patch 2008-12-16 10:07:20 +0100 rene r265529 : fix aclocal.m4 breakage 2008-12-16 05:13:29 +0100 kstribley r265520 : #i93645# change to autoconf && configure 2008-12-16 04:39:48 +0100 kstribley r265519 : #i93645# modified LD_FLAGS so that system graphite isn't pulled in by accident and fixed autoconf problem 2008-12-15 14:16:25 +0100 rene r265497 : check for working STL 2008-12-15 12:53:39 +0100 rene r265473 : revert broken check 2008-12-15 11:59:21 +0100 kstribley r265472 : #i93645# added check for system STL, since this is a requirement for system graphite to work correctly and moved the position of the check further down 2008-12-15 11:55:34 +0100 kstribley r265471 : #i93645# remove references to gr3ooo to allow system graphite to be used 2008-12-12 18:48:18 +0100 rene r265437 : fix link for system-graphite 2008-12-12 18:46:45 +0100 rene r265436 : the tarball is in graphite, remove obsolete check 2008-12-12 18:22:22 +0100 rene r265433 : typo; re-autoconf 2008-12-12 17:35:26 +0100 rene r265432 : actually implement SYSTEM_GRAPHIT checks (as already checked for in makefile.mks) but remove the checks in graphit itself and move to BUILD_TYPE 2008-12-12 08:08:33 +0100 kstribley r265387 : #i69129# 2 of the patched files need windows line endings so patch works on linux as well as windows 2008-12-12 08:04:41 +0100 kstribley r265386 : #i69129# rtl fallback fix which prevents caching of segments with fallback 2008-12-08 04:28:12 +0100 kstribley r264969 : results of running autoconf with graphite config changes #i69129# 2008-12-05 08:12:47 +0100 kstribley r264886 : backout unintential change at r264884 2008-12-05 06:26:33 +0100 kstribley r264884 : #i96925# fixes for uniscribe fallback 2008-12-05 06:11:37 +0100 kstribley r264883 : #i69129# improvements to windows graphite code, including caching of sila table lookup 2008-12-02 13:28:51 +0100 kstribley r264694 : #i93645# add graphite library and append to patch 2008-11-27 06:47:10 +0100 kstribley r264445 : #69129# fix rtl loop bug and rtl caching problem 2008-11-27 06:42:20 +0100 kstribley r264444 : add caching for GraphiteFontAdaptor 2008-11-14 15:57:03 +0100 kstribley r263681 : #69129# add graphite addtional files from cvs 2008-11-14 15:54:47 +0100 kstribley r263680 : #69129# fix for modified resolution api 2008-11-13 16:24:09 +0100 kstribley r263652 : #69129# add skeleton to build graphite module library 2008-11-13 16:22:19 +0100 kstribley r263651 : #69129# add skeleton to build graphite module library 2008-11-13 16:16:10 +0100 kstribley r263650 : #69129# migrate from cvs 2008-11-13 15:26:54 +0100 kstribley r263646 : #69129# add a module for the graphite library --- configure.in | 39 +++++++++++++++++++++++++++++++++++++++ scp2/source/ooo/shortcut_ooo.scp | 22 ++++++++++++++++++++++ set_soenv.in | 4 ++++ solenv/config/sdev300.ini | 1 + solenv/inc/tg_ext.mk | 4 ++-- 5 files changed, 68 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 0fa4670b0d48..5cb5c0f61097 100644 --- a/configure.in +++ b/configure.in @@ -29,6 +29,12 @@ AC_ARG_WITH(gpc, [ --without-gpc Use the internal polygon clipping code instead of the external GPC polygon clipping library. ],,if test ! -e ./external/gpc/gpc.c && test ! -e ./external/gpc/gpc.h; then without_gpc=yes; fi) +AC_ARG_ENABLE(graphite, +[ --enable-graphite Enables the compilation of Graphite smart font rendering +],,) +AC_ARG_WITH(system-graphite, +[ --with-system-graphite use graphite library already installed on system +],,) AC_ARG_ENABLE(ldap, [ --disable-ldap Disables the use of LDAP backend via Netscape/Mozilla or OpenLDAP LDAP SDK @@ -4344,6 +4350,39 @@ AC_SUBST(SYSTEM_GENBRK) AC_SUBST(SYSTEM_GENCCODE) AC_SUBST(SYSTEM_GENCMN) +dnl =================================================================== +dnl Graphite +dnl =================================================================== + +AC_MSG_CHECKING([whether to enable graphite support]) +if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "z$enable_graphite" == "z" -o "$enable_graphite" != "no" ; then + AC_MSG_RESULT([yes]) + ENABLE_GRAPHITE="TRUE" + AC_MSG_CHECKING([which graphite to use]) + if test -n "$with_system_graphite" -o -n "$with_system_libs" && \ + test "$with_system_graphite" != "no"; then + AC_MSG_RESULT([external]) + SYSTEM_GRAPHITE=YES + PKG_CHECK_MODULES( GRAPHITE, silgraphite ) + AC_MSG_CHECKING([STL compatibility]) + if test "$WITH_STLPORT" != "no"; then + AC_MSG_ERROR([to use system graphite you need to use --without-stlport]) + else + AC_MSG_RESULT([OK]) + fi + else + AC_MSG_RESULT([internal]) + SYSTEM_GRAPHITE=NO + BUILD_TYPE="$BUILD_TYPE GRAPHITE" + fi +else + AC_MSG_RESULT([no]) +fi +AC_SUBST(ENABLE_GRAPHITE) +AC_SUBST(SYSTEM_GRAPHITE) +AC_SUBST(GRAPHITE_LIBS) +AC_SUBST(GRAPHITE_CFLAGS) + dnl =================================================================== dnl Checks for libraries. dnl =================================================================== diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp index 2740fe563b69..357f976771b3 100644 --- a/scp2/source/ooo/shortcut_ooo.scp +++ b/scp2/source/ooo/shortcut_ooo.scp @@ -62,6 +62,28 @@ Shortcut gid_Shortcut_Lib_Icuuc End #endif + +Shortcut gid_Shortcut_Lib_Graphite_0 + FileID = gid_File_Lib_Graphite; + Dir = gid_Dir_Program; + Name = STRING(CONCAT2(libgraphite,UNXSUFFIX)); + Styles = (NETWORK,RELATIVE); +End + +Shortcut gid_Shortcut_Lib_Graphite_1 + FileID = gid_File_Lib_Graphite; + Dir = gid_Dir_Program; + Name = STRING(CONCAT4(libgraphite,UNXSUFFIX,.,3)); + Styles = (NETWORK,RELATIVE); +End + +Shortcut gid_Shortcut_Lib_Graphite_2 + FileID = gid_File_Lib_Graphite; + Dir = gid_Dir_Program; + Name = STRING(CONCAT4(libgraphite,UNXSUFFIX,.,3.0)); + Styles = (NETWORK,RELATIVE); +End + #endif #ifdef MACOSX diff --git a/set_soenv.in b/set_soenv.in index c02b3ff603d7..22b0a5707f4d 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -1819,6 +1819,10 @@ ToFile( "ENABLE_DIRECTX", "@ENABLE_DIRECTX@", "e" ); ToFile( "ENABLE_LAYOUT", "@ENABLE_LAYOUT@", "e" ); ToFile( "ENABLE_PCH", "@ENABLE_PCH@", "e" ); ToFile( "NO_HIDS", "@NO_HIDS@", "e" ); +ToFile( "ENABLE_GRAPHITE", "@ENABLE_GRAPHITE@", "e"); +ToFile( "SYSTEM_GRAPHITE", "@SYSTEM_GRAPHITE@", "e"); +ToFile( "GRAPHITE_LIBS", "@GRAPHITE_LIBS@", "e"); +ToFile( "GRAPHITE_CFLAGS", "@GRAPHITE_CFLAGS@", "e"); ToFile( "VC_STANDARD", "@VC_STANDARD@", "e" ); ToFile( "WITH_GPC", "@WITH_GPC@", "e" ); ToFile( "WITH_MYSPELL_DICTS","@WITH_MYSPELL_DICTS@","e"); diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index c331c2f8f7c9..743110beec24 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -26,6 +26,7 @@ common ENABLE_GCONF TRUE ENABLE_GNOMEVFS TRUE ENABLE_GTK TRUE + ENABLE_GRAPHITE TRUE ENABLE_MEDIAWIKI YES ENABLE_MINIMIZER YES ENABLE_RANDR TRUE diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk index f000775b2279..058dfadcc608 100644 --- a/solenv/inc/tg_ext.mk +++ b/solenv/inc/tg_ext.mk @@ -34,9 +34,9 @@ # setup INCLUDE variable for use by VC++ .IF "$(GUI)$(COM)"=="WNTMSC" .IF "$(EXT_USE_STLPORT)"=="" -INCLUDE!:=$(subst,$/stl, $(SOLARINC)) +INCLUDE!:=. $(subst,$/stl, $(SOLARINC)) .ELSE # "$(EXT_USE_STLPORT)"=="" -INCLUDE!:=$(SOLARINC) +INCLUDE!:=. $(SOLARINC) .ENDIF # "$(EXT_USE_STLPORT)"=="" INCLUDE!:=$(INCLUDE:s/ -I/;/) .EXPORT : INCLUDE -- cgit From bb17a085406d117df6e6f04f5af708f6872e6b07 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Mon, 17 Aug 2009 16:56:28 +0000 Subject: DEV300 --- solenv/inc/minor.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index 7185775a9c81..3565d94b0cd5 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ RSCVERSION=300 -RSCREVISION=300m55(Build:9418) -BUILD=9418 -LAST_MINOR=m55 +RSCREVISION=300m56(Build:9419) +BUILD=9419 +LAST_MINOR=m56 SOURCEVERSION=DEV300 -- cgit From 96243aed0aa3d119266ea280da2073baff86507c Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Tue, 18 Aug 2009 10:26:49 +0000 Subject: #i10000# build fix, enable graphite only for linux and windows --- solenv/config/sdev300.ini | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index 743110beec24..133646e53bed 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -26,7 +26,6 @@ common ENABLE_GCONF TRUE ENABLE_GNOMEVFS TRUE ENABLE_GTK TRUE - ENABLE_GRAPHITE TRUE ENABLE_MEDIAWIKI YES ENABLE_MINIMIZER YES ENABLE_RANDR TRUE @@ -696,7 +695,8 @@ unxlngi6 } common2 { - BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin + ENABLE_GRAPHITE TRUE + BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin COM GCC COMMON_BUILD_TOOLS %SOLARROOT%$/btools COMMON_ENV_TOOLS %SOLARROOT%$/etools @@ -1022,7 +1022,8 @@ unxlngx6 } common2 { - BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.11/%WORK_STAMP%/bin + ENABLE_GRAPHITE TRUE + BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.11/%WORK_STAMP%/bin COM GCC COMMON_BUILD_TOOLS %SOLARROOT%$/btools COMMON_ENV_TOOLS %SOLARROOT%$/etools @@ -2555,7 +2556,8 @@ unxubti8 } common2 { - BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.11/%WORK_STAMP%/bin + ENABLE_GRAPHITE TRUE + BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.11/%WORK_STAMP%/bin COM GCC COMMON_BUILD_TOOLS %SRC_ROOT%/external/common COMMON_ENV_TOOLS %SOLARROOT%$/etools @@ -2828,7 +2830,8 @@ wntgcci1 } common2 { - BUILD_TOOLS %SOLARROOT%$/btw$/%WORK_STAMP% + ENABLE_GRAPHITE TRUE + BUILD_TOOLS %SOLARROOT%$/btw$/%WORK_STAMP% CALL_CDECL TRUE CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:o:$/%WORK_STAMP%$/src%UPDMINOREXT% COM GCC @@ -3170,7 +3173,8 @@ wntmsci11 } common2 { - BUILD_TOOLS %SOLARROOT%$/btw$/%WORK_STAMP% + ENABLE_GRAPHITE TRUE + BUILD_TOOLS %SOLARROOT%$/btw$/%WORK_STAMP% CALL_CDECL TRUE CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:o:$/%WORK_STAMP%$/src%UPDMINOREXT% COM MSC @@ -3522,7 +3526,8 @@ wntmsci12 } common2 { - BUILD_TOOLS %SOLARROOT%$/btw$/%BTOOLDIR% + ENABLE_GRAPHITE TRUE + BUILD_TOOLS %SOLARROOT%$/btw$/%BTOOLDIR% CALL_CDECL TRUE CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:$cp(%SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/src%UPDMINOREXT%) COM MSC -- cgit From f0ea564a473cc84e4dd6d81ed3c37246833a84c3 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Tue, 18 Aug 2009 12:50:33 +0000 Subject: #i10000# regen configure --- configure | 23543 +++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 13062 insertions(+), 10481 deletions(-) diff --git a/configure b/configure index 379f0a20b553..575c6158a4e6 100755 --- a/configure +++ b/configure @@ -1,62 +1,146 @@ #! /bin/sh # From configure.in Revision: 1.290 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.57. +# Generated by GNU Autoconf 2.63. # -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## -# Be Bourne compatible +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + + + +# PATH needs CR +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } fi # Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then as_unset=unset else as_unset=false fi +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi + # Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +done PS1='$ ' PS2='> ' PS4='+ ' # NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - $as_unset $as_var - fi -done +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE # Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then as_basename=basename else as_basename=false @@ -64,206 +148,450 @@ fi # Name of the executable. -as_me=`$as_basename "$0" || +as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` +# CDPATH. +$as_unset CDPATH -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh +if test "x$CONFIG_SHELL" = x; then + if (eval ":") 2>/dev/null; then + as_have_required=yes +else + as_have_required=no fi + if test $as_have_required = yes && (eval ": +(as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test \$exitcode = 0) || { (exit 1); exit 1; } + +( + as_lineno_1=\$LINENO + as_lineno_2=\$LINENO + test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && + test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } +") 2> /dev/null; then + : +else + as_candidate_shells= as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in + case $as_dir in /*) - if ("$as_dir/$as_base" -c ' + for as_base in sh bash ksh sh5; do + as_candidate_shells="$as_candidate_shells $as_dir/$as_base" + done;; + esac +done +IFS=$as_save_IFS + + + for as_shell in $as_candidate_shells $SHELL; do + # Try only shells that exist, to save several forks. + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { ("$as_shell") 2> /dev/null <<\_ASEOF +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + +: +_ASEOF +}; then + CONFIG_SHELL=$as_shell + as_have_required=yes + if { "$as_shell" 2> /dev/null <<\_ASEOF +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + +: +(as_func_return () { + (exit $1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = "$1" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test $exitcode = 0) || { (exit 1); exit 1; } + +( as_lineno_1=$LINENO as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } + +_ASEOF +}; then + break +fi + +fi + + done + + if test "x$CONFIG_SHELL" != x; then + for as_var in BASH_ENV ENV + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + done + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} +fi + + + if test $as_have_required = no; then + echo This script requires a shell more modern than all the + echo shells that I found on your system. Please install a + echo modern shell, or manually run the script under such a + echo shell if you do have one. + { (exit 1); exit 1; } +fi + + +fi + +fi + + + +(eval "as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test \$exitcode = 0") || { + echo No shell found that supports shell functions. + echo Please tell bug-autoconf@gnu.org about your system, + echo including any error possibly output before this message. + echo This can help us improve future autoconf versions. + echo Configuration will now proceed without shell functions. +} + + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { # Create $as_me.lineno as a copy of $as_myself, but with $LINENO # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. + # line-number line after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, and appends + # trailing '-' during substitution so that $LINENO is not a special + # case at line end. # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | + # scripts with optimization help from Paolo Bonzini. Blame Lee + # E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ t loop - s,-$,, - s,^['$as_cr_digits']*\n,, + s/-\n.*// ' >$as_me.lineno && - chmod +x $as_me.lineno || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + chmod +x "$as_me.lineno" || + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" # Exit status is that of the last command. exit } -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -esac +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi -if expr a : '\(a\)' >/dev/null 2>&1; then +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in +-n*) + case `echo 'x\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + *) ECHO_C='\c';; + esac;; +*) + ECHO_N='-n';; +esac +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi rm -f conf$$ conf$$.exe conf$$.file -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links - as_ln_s='cp -p' - else +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -p' fi -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln else as_ln_s='cp -p' fi -rm -f conf$$ conf$$.exe conf$$.file +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then as_mkdir_p=: else + test -d ./-p && rmdir ./-p as_mkdir_p=false fi -as_executable_p="test -f" +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" # Sed expression to map a string onto a valid variable name. -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" - +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" -# CDPATH. -$as_unset CDPATH +exec 7<&0 &1 # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` -exec 6>&1 - # # Initializations. # ac_default_prefix=/usr/local +ac_clean_files= ac_config_libobj_dir=. +LIBOBJS= cross_compiling=no subdirs= MFLAGS= MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} -# Maximum number of lines to put in a shell here document. -# This variable seems obsolete. It should probably be removed, and -# only ac_max_sed_lines should be used. -: ${ac_max_here_lines=38} - # Identity of this package. PACKAGE_NAME= PACKAGE_TARNAME= @@ -274,46 +602,611 @@ PACKAGE_BUGREPORT= # Factoring default headers for most tests. ac_includes_default="\ #include -#if HAVE_SYS_TYPES_H +#ifdef HAVE_SYS_TYPES_H # include #endif -#if HAVE_SYS_STAT_H +#ifdef HAVE_SYS_STAT_H # include #endif -#if STDC_HEADERS +#ifdef STDC_HEADERS # include # include #else -# if HAVE_STDLIB_H +# ifdef HAVE_STDLIB_H # include # endif #endif -#if HAVE_STRING_H -# if !STDC_HEADERS && HAVE_MEMORY_H +#ifdef HAVE_STRING_H +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H # include # endif # include #endif -#if HAVE_STRINGS_H +#ifdef HAVE_STRINGS_H # include #endif -#if HAVE_INTTYPES_H +#ifdef HAVE_INTTYPES_H # include -#else -# if HAVE_STDINT_H -# include -# endif #endif -#if HAVE_UNISTD_H +#ifdef HAVE_STDINT_H +# include +#endif +#ifdef HAVE_UNISTD_H # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS EGREP AWK SED LOCAL_SOLENV _solenv UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os GNUTAR OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP VC_STANDARD ENABLE_WERROR ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS DISABLE_STRIP ENABLE_CUPS ENABLE_FONTCONFIG WITH_BINFILTER ENABLE_DIRECTX DISABLE_ACTIVEX DISABLE_ATL ENABLE_RPATH WITH_MYSPELL_DICTS SYSTEM_DICTS DICT_SYSTEM_DIR HYPH_SYSTEM_DIR THES_SYSTEM_DIR USE_SHELL WITH_MINGWIN SHELLPATH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_LD_BSYMBOLIC_FUNCTIONS ENABLE_PCH NO_HIDS GNUMAKE _cc HAVE_LD_HASH_STYLE PERL MSPDB_PATH COMEX USE_MINGW MIDL_PATH CSC_PATH FRAME_HOME CPP CXX CXXFLAGS ac_ct_CXX CXXCPP SIZEOF_LONG WORDS_BIGENDIAN LFS_CFLAGS ENABLE_VBA VBA_EXTENSION PAM NEW_SHADOW_API PAM_LINK CRYPT_LINK GXX_INCLUDE_PATH MINGW_LIB_INCLUDE_PATH STLPORT4 STLPORT_VER USE_SYSTEM_STL HAVE_GCC_VISIBILITY_FEATURE ALLOC BUILD_VER_STRING SOLAR_JAVA JAVAINTERPRETER JAVACOMPILER JAVACISGCJ JAVADOC AWTLIB JAVAAOTCOMPILER JAVA_HOME JDK JAVAFLAGS DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM PKGFORMAT RPM GPERF MINGWCXX ac_ct_MINGWCXX MINGWSTRIP ac_ct_MINGWSTRIP BUILD_UNOWINREG BUILD_QADEVOOO SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD FREETYPE_CFLAGS FREETYPE_LIBS USE_FT_EMBOLDEN LIBXSLT_CFLAGS LIBXSLT_LIBS XSLTPROC SYSTEM_LIBXSLT LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir BZIP2 SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS HOME SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SYSTEM_LUCENE LUCENE_CORE_JAR LUCENE_ANALYZERS_JAR SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SERIALIZER_JAR SYSTEM_SAXON SAXON_JAR CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_VIGRA SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_LDAP WITH_OPENLDAP MOZ_NSS_CFLAGS MOZ_NSS_LIBS NSS_LIB MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS NSPR_LIB MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZGTK2_CFLAGS MOZGTK2_LIBS MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB SYSTEM_MOZILLA MOZ_FLAVOUR MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER SYSTEM_GENBRK SYSTEM_GENCCODE SYSTEM_GENCMN SYSTEM_ICU X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB XAU_LIBS DISABLE_XAW SYSTEM_XRENDER_HEADERS XRENDER_LINK XRANDR_CFLAGS XRANDR_LIBS XRANDR_DLOPEN ENABLE_RANDR DISABLE_NEON NEON_CFLAGS NEON_LIBS OPENSSL_CFLAGS OPENSSL_LIBS SYSTEM_OPENSSL SYSTEM_NEON NEON_VERSION ENABLE_AGG AGG_CFLAGS AGG_LIBS SYSTEM_AGG AGG_VERSION REDLAND_CFLAGS REDLAND_LIBS SYSTEM_REDLAND HUNSPELL_CFLAGS HUNSPELL_LIBS SYSTEM_HUNSPELL SYSTEM_HYPH HYPHEN_LIB SYSTEM_MYTHES SYSTEM_LPSOLVE PSDK_HOME WINDOWS_VISTA_PSDK DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH BISON FLEX PATCH GNUCP GNUPATCH CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME WITH_GPC ENABLE_GTK ENABLE_KDE ENABLE_KDE4 GCONF_CFLAGS GCONF_LIBS ENABLE_GCONF GNOMEVFS_CFLAGS GNOMEVFS_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS DBUS_CFLAGS DBUS_LIBS GIO_CFLAGS GIO_LIBS ENABLE_GIO ENABLE_DBUS ENABLE_SYSTRAY_GTK CAIRO_CFLAGS CAIRO_LIBS ENABLE_CAIRO BUILD_PIXMAN SYSTEM_CAIRO ENABLE_OPENGL ENABLE_MINIMIZER ENABLE_PRESENTER_SCREEN POPPLER_CFLAGS POPPLER_LIBS ENABLE_PDFIMPORT SYSTEM_POPPLER ENABLE_MEDIAWIKI SYSTEM_SERVLETAPI SERVLETAPI_JAR ENABLE_REPORTBUILDER SYSTEM_JFREEREPORT SAC_JAR LIBXML_JAR FLUTE_JAR JFREEREPORT_JAR LIBBASE_JAR LIBLAYOUT_JAR LIBLOADER_JAR LIBFORMULA_JAR LIBREPOSITORY_JAR LIBFONTS_JAR LIBSERIALIZER_JAR SYSTEM_APACHE_COMMONS COMMONS_CODEC_JAR COMMONS_LANG_JAR COMMONS_HTTPCLIENT_JAR COMMONS_LOGGING_JAR MOC KDE_CFLAGS KDE_LIBS MOC4 KDE4_CFLAGS KDE4_LIBS ENABLE_LOCKDOWN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTOOO SYSTEM_MSPACK WITH_FONTS WITHOUT_PPDS WITHOUT_AFMS SCPDEFS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB WITH_LANG WITH_POOR_HELP_LOCALIZATIONS WITH_DICT INTRO_BITMAPS ABOUT_BITMAPS OOO_VENDOR UNIXWRAPPERNAME ENABLE_STATIC_GTK ENABLE_LAYOUT VERBOSE LOCAL_SOLVER BUILD_TYPE LIBOBJS LTLIBOBJS' +ac_subst_vars='LTLIBOBJS +LIBOBJS +BUILD_TYPE +LOCAL_SOLVER +VERBOSE +ENABLE_LAYOUT +ENABLE_STATIC_GTK +UNIXWRAPPERNAME +OOO_VENDOR +ABOUT_BITMAPS +INTRO_BITMAPS +WITH_DICT +WITH_POOR_HELP_LOCALIZATIONS +WITH_LANG +ANT_LIB +ANT_HOME +ANT +XINERAMA_LINK +USE_XINERAMA +SCPDEFS +WITHOUT_AFMS +WITHOUT_PPDS +WITH_FONTS +SYSTEM_MSPACK +WITH_FONTOOO +ENABLE_KAB +ENABLE_EVOAB2 +GOBJECT_LIBS +GOBJECT_CFLAGS +ENABLE_LOCKDOWN +KDE4_LIBS +KDE4_CFLAGS +MOC4 +KDE_LIBS +KDE_CFLAGS +MOC +COMMONS_LOGGING_JAR +COMMONS_HTTPCLIENT_JAR +COMMONS_LANG_JAR +COMMONS_CODEC_JAR +SYSTEM_APACHE_COMMONS +LIBSERIALIZER_JAR +LIBFONTS_JAR +LIBREPOSITORY_JAR +LIBFORMULA_JAR +LIBLOADER_JAR +LIBLAYOUT_JAR +LIBBASE_JAR +JFREEREPORT_JAR +FLUTE_JAR +LIBXML_JAR +SAC_JAR +SYSTEM_JFREEREPORT +ENABLE_REPORTBUILDER +SERVLETAPI_JAR +SYSTEM_SERVLETAPI +ENABLE_MEDIAWIKI +SYSTEM_POPPLER +ENABLE_PDFIMPORT +POPPLER_LIBS +POPPLER_CFLAGS +ENABLE_PRESENTER_SCREEN +ENABLE_MINIMIZER +ENABLE_OPENGL +SYSTEM_CAIRO +BUILD_PIXMAN +ENABLE_CAIRO +CAIRO_LIBS +CAIRO_CFLAGS +ENABLE_SYSTRAY_GTK +ENABLE_DBUS +ENABLE_GIO +GIO_LIBS +GIO_CFLAGS +DBUS_LIBS +DBUS_CFLAGS +GTK_LIBS +GTK_CFLAGS +ENABLE_GNOMEVFS +GNOMEVFS_LIBS +GNOMEVFS_CFLAGS +ENABLE_GCONF +GCONF_LIBS +GCONF_CFLAGS +ENABLE_KDE4 +ENABLE_KDE +ENABLE_GTK +WITH_GPC +ZIP_HOME +UNZIP +ZIP +ASM_HOME +ML_EXE +CYGWIN_PATH +GNUPATCH +GNUCP +PATCH +FLEX +BISON +NSIS_PATH +DIRECTXSDK_LIB +DIRECTXSDK_HOME +WINDOWS_VISTA_PSDK +PSDK_HOME +SYSTEM_LPSOLVE +SYSTEM_MYTHES +HYPHEN_LIB +SYSTEM_HYPH +SYSTEM_HUNSPELL +HUNSPELL_LIBS +HUNSPELL_CFLAGS +SYSTEM_REDLAND +REDLAND_LIBS +REDLAND_CFLAGS +AGG_VERSION +SYSTEM_AGG +AGG_LIBS +AGG_CFLAGS +ENABLE_AGG +NEON_VERSION +SYSTEM_NEON +SYSTEM_OPENSSL +OPENSSL_LIBS +OPENSSL_CFLAGS +NEON_LIBS +NEON_CFLAGS +DISABLE_NEON +ENABLE_RANDR +XRANDR_DLOPEN +XRANDR_LIBS +XRANDR_CFLAGS +XRENDER_LINK +SYSTEM_XRENDER_HEADERS +DISABLE_XAW +XAU_LIBS +XLIB +XINC +X_EXTRA_LIBS +X_LIBS +X_PRE_LIBS +X_CFLAGS +XMKMF +SYSTEM_GRAPHITE +ENABLE_GRAPHITE +GRAPHITE_LIBS +GRAPHITE_CFLAGS +SYSTEM_ICU +SYSTEM_GENCMN +SYSTEM_GENCCODE +SYSTEM_GENBRK +SYSTEM_SANE_HEADER +MOZ_LDAP_CFLAGS +MOZ_LIB_XPCOM +MOZ_LIB +MOZ_INC +MOZ_FLAVOUR +SYSTEM_MOZILLA +BUILD_MOZAB +MOZLIBREQ_LIBS +MOZLIBREQ_CFLAGS +MOZGTK2_LIBS +MOZGTK2_CFLAGS +MOZILLA_TOOLKIT +MOZILLA_VERSION +MOZILLAXPCOM_LIBS +MOZILLAXPCOM_CFLAGS +NSPR_LIB +MOZ_NSPR_LIBS +MOZ_NSPR_CFLAGS +NSS_LIB +MOZ_NSS_LIBS +MOZ_NSS_CFLAGS +WITH_OPENLDAP +WITH_LDAP +WITH_MOZILLA +SYSTEM_ODBC_HEADERS +SYSTEM_VIGRA +SYSTEM_BOOST +CURL_LIBS +CURL_CFLAGS +SYSTEM_CURL +CURLCONFIG +SAXON_JAR +SYSTEM_SAXON +SERIALIZER_JAR +BSH_JAR +SYSTEM_BSH +HSQLDB_JAR +SYSTEM_HSQLDB +LUCENE_ANALYZERS_JAR +LUCENE_CORE_JAR +SYSTEM_LUCENE +DB_JAR +DB_INCLUDES +DB_VERSION +SYSTEM_DB +HOME +PYTHON_LIBS +PYTHON_CFLAGS +SYSTEM_PYTHON +BZIP2 +pkgpyexecdir +pyexecdir +pkgpythondir +pythondir +PYTHON_PLATFORM +PYTHON_EXEC_PREFIX +PYTHON_PREFIX +PYTHON_VERSION +PYTHON +SYSTEM_LIBXML +LIBXML_LIBS +LIBXML_CFLAGS +SYSTEM_LIBXSLT +XSLTPROC +LIBXSLT_LIBS +LIBXSLT_CFLAGS +USE_FT_EMBOLDEN +FREETYPE_LIBS +FREETYPE_CFLAGS +SYSTEM_LIBWPD +LIBWPD_LIBS +LIBWPD_CFLAGS +PKG_CONFIG +SYSTEM_EXPAT +SYSTEM_JPEG +SYSTEM_ZLIB +SYSTEM_STDLIBS +BUILD_QADEVOOO +BUILD_UNOWINREG +MINGWSTRIP +MINGWCXX +GPERF +RPM +PKGFORMAT +BUILD_EPM +PKGMK +DPKG +EPM +BUILD_DMAKE +DMAKE +JAVAFLAGS +JDK +JAVA_HOME +JAVAAOTCOMPILER +AWTLIB +JAVADOC +JAVACISGCJ +JAVACOMPILER +JAVAINTERPRETER +SOLAR_JAVA +BUILD_VER_STRING +ALLOC +HAVE_GCC_VISIBILITY_FEATURE +USE_SYSTEM_STL +STLPORT_VER +STLPORT4 +MINGW_LIB_INCLUDE_PATH +GXX_INCLUDE_PATH +CRYPT_LINK +PAM_LINK +NEW_SHADOW_API +PAM +VBA_EXTENSION +ENABLE_VBA +LFS_CFLAGS +WORDS_BIGENDIAN +SIZEOF_LONG +CXXCPP +ac_ct_CXX +CXXFLAGS +CXX +CPP +FRAME_HOME +CSC_PATH +MIDL_PATH +USE_MINGW +COMEX +MSPDB_PATH +PERL +HAVE_LD_HASH_STYLE +_cc +GNUMAKE +NO_HIDS +ENABLE_PCH +HAVE_LD_BSYMBOLIC_FUNCTIONS +GCCVER +COMPATH +OBJEXT +EXEEXT +ac_ct_CC +CPPFLAGS +LDFLAGS +CFLAGS +CC +GCC_HOME +SHELLPATH +WITH_MINGWIN +USE_SHELL +THES_SYSTEM_DIR +HYPH_SYSTEM_DIR +DICT_SYSTEM_DIR +SYSTEM_DICTS +WITH_MYSPELL_DICTS +ENABLE_RPATH +DISABLE_ATL +DISABLE_ACTIVEX +ENABLE_DIRECTX +WITH_BINFILTER +ENABLE_FONTCONFIG +ENABLE_CUPS +DISABLE_STRIP +ENABLE_SYMBOLS +PROEXT +PROFULLSWITCH +PRODUCT +ENABLE_DEBUG +ENABLE_WERROR +VC_STANDARD +ENABLE_CRASHDUMP +PTHREAD_LIBS +PTHREAD_CFLAGS +OSVERSION +GNUTAR +target_os +target_vendor +target_cpu +target +host_os +host_vendor +host_cpu +host +build_os +build_vendor +build_cpu +build +SOURCEVERSION +UPD +_solenv +LOCAL_SOLENV +SED +AWK +EGREP +GREP +target_alias +host_alias +build_alias +LIBS +ECHO_T +ECHO_N +ECHO_C +DEFS +mandir +localedir +libdir +psdir +pdfdir +dvidir +htmldir +infodir +docdir +oldincludedir +includedir +localstatedir +sharedstatedir +sysconfdir +datadir +datarootdir +libexecdir +sbindir +bindir +program_transform_name +prefix +exec_prefix +PACKAGE_BUGREPORT +PACKAGE_STRING +PACKAGE_VERSION +PACKAGE_TARNAME +PACKAGE_NAME +PATH_SEPARATOR +SHELL' ac_subst_files='' +ac_user_opts=' +enable_option_checking +with_gnu_patch +with_agg +with_gnu_cp +with_gpc +enable_graphite +with_system_graphite +enable_ldap +with_openldap +enable_lockdown +enable_vba +with_vba_package_format +enable_pch +enable_hids +enable_mozilla +with_fonts +with_ppds +with_afms +enable_epm +with_epm +with_package_format +enable_odk +enable_qadevooo +enable_fontooo +enable_mathmldtd +enable_evolution2 +with_system_stdlibs +with_system_mspack +enable_cups +enable_fontconfig +enable_directx +enable_activex +enable_atl +enable_symbols +enable_strip_solver +enable_werror +enable_debug +enable_dbgutil +enable_crashdump +enable_cl_standard +enable_gtk +enable_systray +enable_cairo +with_system_cairo +enable_opengl +enable_dbus +enable_gconf +enable_gnome_vfs +enable_gio +enable_static_gtk +enable_layout +enable_build_mozilla +with_mozilla_version +with_mozilla_toolkit +enable_kde +enable_kdeab +enable_kde4 +enable_binfilter +enable_rpath +enable_pam +enable_pam_link +enable_crypt_link +enable_xrender_link +enable_randr +enable_randr_link +with_myspell_dicts +with_system_dicts +with_external_dict_dir +with_external_hyph_dir +with_external_thes_dir +with_system_libs +with_system_headers +with_system_jars +with_system_zlib +with_system_openssl +with_system_jpeg +with_system_expat +with_system_libwpd +with_system_libxml +with_system_python +with_system_icu +with_system_poppler +with_system_db +with_system_lucene +with_lucene_core_jar +with_lucene_analyzers_jar +with_system_hsqldb +with_hsqldb_jar +with_system_beanshell +with_beanshell_jar +enable_minimizer +enable_presenter_console +enable_pdfimport +enable_wiki_publisher +with_commons_codec_jar +with_commons_lang_jar +with_commons_httpclient_jar +with_commons_logging_jar +with_servlet_api_jar +enable_report_builder +with_system_jfreereport +with_sac_jar +with_libxml_jar +with_flute_jar +with_jfreereport_jar +with_liblayout_jar +with_libloader_jar +with_libformula_jar +with_librepository_jar +with_libfonts_jar +with_libserializer_jar +with_libbase_jar +with_system_saxon +with_saxon_jar +with_system_libxslt +with_system_odbc +with_system_sane +with_system_xrender +with_system_curl +with_system_boost +with_system_vigra +enable_neon +enable_Xaw +with_system_neon +with_system_agg +with_system_hunspell +with_system_mythes +with_system_altlinuxhyph +with_system_lpsolve +with_system_mozilla +with_stlport +with_jdk_home +with_gxx_include_path +with_java +enable_gcjaot +with_ant_home +with_perl_home +with_cl_home +with_mspdb_path +with_midl_path +with_csc_path +with_nsis_path +with_frame_home +with_psdk_home +with_directx_home +with_local_solenv +with_local_solver +enable_check_only +with_lang +with_poor_help_localizations +with_dict +with_intro_bitmaps +with_about_bitmaps +with_vendor +with_unix_wrapper +with_asm_home +with_os_version +with_unzip_home +with_zip_home +with_mingwin +with_use_shell +with_build_version +enable_sgistl +with_alloc +enable_verbose +enable_largefile +with_x +' + ac_precious_vars='build_alias +host_alias +target_alias +CC +CFLAGS +LDFLAGS +LIBS +CPPFLAGS +CPP +CXX +CXXFLAGS +CCC +CXXCPP +XMKMF' + # Initialize some variables set by options. ac_init_help= ac_init_version=false +ac_unrecognized_opts= +ac_unrecognized_sep= # The variables have the same names as the options, with # dashes changed to underlines. cache_file=/dev/null @@ -336,34 +1229,48 @@ x_libraries=NONE # and all the variables that are supposed to be based on exec_prefix # by default will actually change. # Use braces instead of parens because sh, perl, etc. also accept them. +# (The list follows the same order as the GNU Coding Standards.) bindir='${exec_prefix}/bin' sbindir='${exec_prefix}/sbin' libexecdir='${exec_prefix}/libexec' -datadir='${prefix}/share' +datarootdir='${prefix}/share' +datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -libdir='${exec_prefix}/lib' includedir='${prefix}/include' oldincludedir='/usr/include' -infodir='${prefix}/info' -mandir='${prefix}/man' +docdir='${datarootdir}/doc/${PACKAGE}' +infodir='${datarootdir}/info' +htmldir='${docdir}' +dvidir='${docdir}' +pdfdir='${docdir}' +psdir='${docdir}' +libdir='${exec_prefix}/lib' +localedir='${datarootdir}/locale' +mandir='${datarootdir}/man' ac_prev= +ac_dashdash= for ac_option do # If the previous option needs an argument, assign it. if test -n "$ac_prev"; then - eval "$ac_prev=\$ac_option" + eval $ac_prev=\$ac_option ac_prev= continue fi - ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` + case $ac_option in + *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *) ac_optarg=yes ;; + esac # Accept the important Cygnus configure options, so we can diagnose typos. - case $ac_option in + case $ac_dashdash$ac_option in + --) + ac_dashdash=yes ;; -bindir | --bindir | --bindi | --bind | --bin | --bi) ac_prev=bindir ;; @@ -385,33 +1292,61 @@ do --config-cache | -C) cache_file=config.cache ;; - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) + -datadir | --datadir | --datadi | --datad) ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ - | --da=*) + -datadir=* | --datadir=* | --datadi=* | --datad=*) datadir=$ac_optarg ;; + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ + | --dataroo | --dataro | --datar) + ac_prev=datarootdir ;; + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) + datarootdir=$ac_optarg ;; + -disable-* | --disable-*) - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - eval "enable_$ac_feature=no" ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 + { (exit 1); exit 1; }; } + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=no ;; + + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; + -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) + docdir=$ac_optarg ;; + + -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) + ac_prev=dvidir ;; + -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) + dvidir=$ac_optarg ;; -enable-* | --enable-*) - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 + { (exit 1); exit 1; }; } + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; esac - eval "enable_$ac_feature='$ac_optarg'" ;; + eval enable_$ac_useropt=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -438,6 +1373,12 @@ do -host=* | --host=* | --hos=* | --ho=*) host_alias=$ac_optarg ;; + -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) + ac_prev=htmldir ;; + -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ + | --ht=*) + htmldir=$ac_optarg ;; + -includedir | --includedir | --includedi | --included | --include \ | --includ | --inclu | --incl | --inc) ac_prev=includedir ;; @@ -462,13 +1403,16 @@ do | --libexe=* | --libex=* | --libe=*) libexecdir=$ac_optarg ;; + -localedir | --localedir | --localedi | --localed | --locale) + ac_prev=localedir ;; + -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) + localedir=$ac_optarg ;; + -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst \ - | --locals | --local | --loca | --loc | --lo) + | --localstate | --localstat | --localsta | --localst | --locals) ac_prev=localstatedir ;; -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) + | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) localstatedir=$ac_optarg ;; -mandir | --mandir | --mandi | --mand | --man | --ma | --m) @@ -533,6 +1477,16 @@ do | --progr-tra=* | --program-tr=* | --program-t=*) program_transform_name=$ac_optarg ;; + -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) + ac_prev=pdfdir ;; + -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) + pdfdir=$ac_optarg ;; + + -psdir | --psdir | --psdi | --psd | --ps) + ac_prev=psdir ;; + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) + psdir=$ac_optarg ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; @@ -583,26 +1537,38 @@ do ac_init_version=: ;; -with-* | --with-*) - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package| sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 + { (exit 1); exit 1; }; } + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" + ac_unrecognized_sep=', ';; esac - eval "with_$ac_package='$ac_optarg'" ;; + eval with_$ac_useropt=\$ac_optarg ;; -without-* | --without-*) - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/-/_/g'` - eval "with_$ac_package=no" ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 + { (exit 1); exit 1; }; } + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=no ;; --x) # Obsolete; use --with-x. @@ -622,7 +1588,7 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) { echo "$as_me: error: unrecognized option: $ac_option + -*) { $as_echo "$as_me: error: unrecognized option: $ac_option Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } ;; @@ -631,17 +1597,16 @@ Try \`$0 --help' for more information." >&2 ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` # Reject names that are not valid shell variable names. expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 + { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 { (exit 1); exit 1; }; } - ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` - eval "$ac_envvar='$ac_optarg'" + eval $ac_envvar=\$ac_optarg export $ac_envvar ;; *) # FIXME: should be removed in autoconf 3.0. - echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ;; @@ -650,31 +1615,39 @@ done if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { echo "$as_me: error: missing argument to $ac_option" >&2 + { $as_echo "$as_me: error: missing argument to $ac_option" >&2 { (exit 1); exit 1; }; } fi -# Be sure to have absolute paths. -for ac_var in exec_prefix prefix -do - eval ac_val=$`echo $ac_var` - case $ac_val in - [\\/$]* | ?:[\\/]* | NONE | '' ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; +if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; + fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 + { (exit 1); exit 1; }; } ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac -done +fi -# Be sure to have absolute paths. -for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir +# Check all directory arguments for consistency. +for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir do - eval ac_val=$`echo $ac_var` + eval ac_val=\$$ac_var + # Remove trailing slashes. case $ac_val in - [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; + */ ) + ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` + eval $ac_var=\$ac_val;; + esac + # Be sure to have absolute directory names. + case $ac_val in + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac + { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; } done # There might be people who depend on the old broken behavior: `$host' @@ -688,7 +1661,7 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. If a cross compiler is detected then cross compile mode will be used." >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes @@ -701,88 +1674,78 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias- test "$silent" = yes && exec 6>/dev/null +ac_pwd=`pwd` && test -n "$ac_pwd" && +ac_ls_di=`ls -di .` && +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || + { $as_echo "$as_me: error: working directory cannot be determined" >&2 + { (exit 1); exit 1; }; } +test "X$ac_ls_di" = "X$ac_pwd_ls_di" || + { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 + { (exit 1); exit 1; }; } + + # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes - # Try the directory containing this script, then its parent. - ac_confdir=`(dirname "$0") 2>/dev/null || -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$0" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + # Try the directory containing this script, then the parent directory. + ac_confdir=`$as_dirname -- "$as_myself" || +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_myself" : 'X\(//\)[^/]' \| \ + X"$as_myself" : 'X\(//\)$' \| \ + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_myself" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` srcdir=$ac_confdir - if test ! -r $srcdir/$ac_unique_file; then + if test ! -r "$srcdir/$ac_unique_file"; then srcdir=.. fi else ac_srcdir_defaulted=no fi -if test ! -r $srcdir/$ac_unique_file; then - if test "$ac_srcdir_defaulted" = yes; then - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 +if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." + { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 { (exit 1); exit 1; }; } - else - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } - fi -fi -(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || - { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 - { (exit 1); exit 1; }; } -srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` -ac_env_build_alias_set=${build_alias+set} -ac_env_build_alias_value=$build_alias -ac_cv_env_build_alias_set=${build_alias+set} -ac_cv_env_build_alias_value=$build_alias -ac_env_host_alias_set=${host_alias+set} -ac_env_host_alias_value=$host_alias -ac_cv_env_host_alias_set=${host_alias+set} -ac_cv_env_host_alias_value=$host_alias -ac_env_target_alias_set=${target_alias+set} -ac_env_target_alias_value=$target_alias -ac_cv_env_target_alias_set=${target_alias+set} -ac_cv_env_target_alias_value=$target_alias -ac_env_CC_set=${CC+set} -ac_env_CC_value=$CC -ac_cv_env_CC_set=${CC+set} -ac_cv_env_CC_value=$CC -ac_env_CFLAGS_set=${CFLAGS+set} -ac_env_CFLAGS_value=$CFLAGS -ac_cv_env_CFLAGS_set=${CFLAGS+set} -ac_cv_env_CFLAGS_value=$CFLAGS -ac_env_LDFLAGS_set=${LDFLAGS+set} -ac_env_LDFLAGS_value=$LDFLAGS -ac_cv_env_LDFLAGS_set=${LDFLAGS+set} -ac_cv_env_LDFLAGS_value=$LDFLAGS -ac_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_env_CPPFLAGS_value=$CPPFLAGS -ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_cv_env_CPPFLAGS_value=$CPPFLAGS -ac_env_CPP_set=${CPP+set} -ac_env_CPP_value=$CPP -ac_cv_env_CPP_set=${CPP+set} -ac_cv_env_CPP_value=$CPP -ac_env_CXX_set=${CXX+set} -ac_env_CXX_value=$CXX -ac_cv_env_CXX_set=${CXX+set} -ac_cv_env_CXX_value=$CXX -ac_env_CXXFLAGS_set=${CXXFLAGS+set} -ac_env_CXXFLAGS_value=$CXXFLAGS -ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set} -ac_cv_env_CXXFLAGS_value=$CXXFLAGS -ac_env_CXXCPP_set=${CXXCPP+set} -ac_env_CXXCPP_value=$CXXCPP -ac_cv_env_CXXCPP_set=${CXXCPP+set} -ac_cv_env_CXXCPP_value=$CXXCPP - -# +fi +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_abs_confdir=`( + cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 + { (exit 1); exit 1; }; } + pwd)` +# When building in place, set srcdir=. +if test "$ac_abs_confdir" = "$ac_pwd"; then + srcdir=. +fi +# Remove unnecessary trailing slashes from srcdir. +# Double slashes in file names in object file debugging info +# mess up M-x gdb in Emacs. +case $srcdir in +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; +esac +for ac_var in $ac_precious_vars; do + eval ac_env_${ac_var}_set=\${${ac_var}+set} + eval ac_env_${ac_var}_value=\$${ac_var} + eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} + eval ac_cv_env_${ac_var}_value=\$${ac_var} +done + +# # Report the --help message. # if test "$ac_init_help" = "long"; then @@ -809,9 +1772,6 @@ Configuration: -n, --no-create do not create output files --srcdir=DIR find the sources in DIR [configure dir or \`..'] -_ACEOF - - cat <<_ACEOF Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX [$ac_default_prefix] @@ -826,18 +1786,25 @@ for instance \`--prefix=\$HOME'. For better control, use the options below. Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data [PREFIX/share] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --infodir=DIR info documentation [PREFIX/info] - --mandir=DIR man documentation [PREFIX/man] + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] _ACEOF cat <<\_ACEOF @@ -858,8 +1825,11 @@ if test -n "$ac_init_help"; then cat <<\_ACEOF Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-graphite Enables the compilation of Graphite smart font rendering + --disable-ldap Disables the use of LDAP backend via Netscape/Mozilla or OpenLDAP LDAP SDK @@ -1055,6 +2025,8 @@ Optional Packages: --without-gpc Use the internal polygon clipping code instead of the external GPC polygon clipping library. + --with-system-graphite use graphite library already installed on system + --with-openldap Enables the use of the OpenLDAP LDAP SDK instead of the Netscape/Mozilla one @@ -1424,97 +2396,101 @@ Some influential environment variables: CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory - CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have - headers in a nonstandard directory + LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if + you have headers in a nonstandard directory CPP C preprocessor CXX C++ compiler command CXXFLAGS C++ compiler flags CXXCPP C++ preprocessor + XMKMF Path to xmkmf, Makefile generator for X Window System Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. _ACEOF +ac_status=$? fi if test "$ac_init_help" = "recursive"; then # If there are subdirs, report their specific --help. - ac_popdir=`pwd` for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d $ac_dir || continue + test -d "$ac_dir" || + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || + continue ac_builddir=. -if test "$ac_dir" != .; then - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix case $srcdir in - .) # No --srcdir option. We are building in place. + .) # We are building in place. ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be -# absolute. -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` - - cd $ac_dir - # Check for guested configure; otherwise get Cygnus style configure. - if test -f $ac_srcdir/configure.gnu; then - echo - $SHELL $ac_srcdir/configure.gnu --help=recursive - elif test -f $ac_srcdir/configure; then - echo - $SHELL $ac_srcdir/configure --help=recursive - elif test -f $ac_srcdir/configure.ac || - test -f $ac_srcdir/configure.in; then - echo - $ac_configure --help + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + cd "$ac_dir" || { ac_status=$?; continue; } + # Check for guested configure. + if test -f "$ac_srcdir/configure.gnu"; then + echo && + $SHELL "$ac_srcdir/configure.gnu" --help=recursive + elif test -f "$ac_srcdir/configure"; then + echo && + $SHELL "$ac_srcdir/configure" --help=recursive else - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi - cd $ac_popdir + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } done fi -test -n "$ac_init_help" && exit 0 +test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF +configure +generated by GNU Autoconf 2.63 -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF - exit 0 + exit fi -exec 5>config.log -cat >&5 <<_ACEOF +cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.57. Invocation command line was +generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ _ACEOF +exec 5>>config.log { cat <<_ASUNAME ## --------- ## @@ -1533,7 +2509,7 @@ uname -v = `(uname -v) 2>/dev/null || echo unknown` /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -hostinfo = `(hostinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` @@ -1545,8 +2521,9 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - echo "PATH: $as_dir" + $as_echo "PATH: $as_dir" done +IFS=$as_save_IFS } >&5 @@ -1568,7 +2545,6 @@ _ACEOF ac_configure_args= ac_configure_args0= ac_configure_args1= -ac_sep= ac_must_keep_next=false for ac_pass in 1 2 do @@ -1579,31 +2555,29 @@ do -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) continue ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; 2) ac_configure_args1="$ac_configure_args1 '$ac_arg'" if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. + ac_must_keep_next=false # Got value, back to normal. else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac fi - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - # Get rid of the leading space. - ac_sep=" " + ac_configure_args="$ac_configure_args '$ac_arg'" ;; esac done @@ -1614,8 +2588,8 @@ $as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_ # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there # would cause problems or look ugly. -# WARNING: Be sure not to use single quotes in there, as some shells, -# such as our DU 5.0 friend, will then `close' the trap. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. trap 'exit_status=$? # Save into config.log some information that might help in debugging. { @@ -1628,20 +2602,35 @@ trap 'exit_status=$? _ASBOX echo # The following way of writing the cache mishandles newlines in values, -{ +( + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) $as_unset $ac_var ;; + esac ;; + esac + done (set) 2>&1 | - case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in - *ac_space=\ *) + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( + *${as_nl}ac_space=\ *) sed -n \ - "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" - ;; + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" + ;; #( *) - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; - esac; -} + esac | + sort +) echo cat <<\_ASBOX @@ -1652,22 +2641,28 @@ _ASBOX echo for ac_var in $ac_subst_vars do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" done | sort echo if test -n "$ac_subst_files"; then cat <<\_ASBOX -## ------------- ## -## Output files. ## -## ------------- ## +## ------------------- ## +## File substitutions. ## +## ------------------- ## _ASBOX echo for ac_var in $ac_subst_files do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" done | sort echo fi @@ -1679,26 +2674,24 @@ _ASBOX ## ----------- ## _ASBOX echo - sed "/^$/d" confdefs.h | sort + cat confdefs.h echo fi test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" - echo "$as_me: exit $exit_status" + $as_echo "$as_me: caught signal $ac_signal" + $as_echo "$as_me: exit $exit_status" } >&5 - rm -f core core.* *.core && - rm -rf conftest* confdefs* conf$$* $ac_clean_files && + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status - ' 0 +' 0 for ac_signal in 1 2 13 15; do trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal done ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo >confdefs.h +rm -f -r conftest* confdefs.h # Predefined preprocessor variables. @@ -1728,18 +2721,24 @@ _ACEOF # Let the site file select an alternate cache file if it wants to. -# Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi -fi -for ac_site_file in $CONFIG_SITE; do +# Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE +if test -n "$CONFIG_SITE"; then + ac_site_file1=$CONFIG_SITE +elif test "x$prefix" != xNONE; then + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site +else + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site +fi +for ac_site_file in "$ac_site_file1" "$ac_site_file2" +do + test "x$ac_site_file" = xNONE && continue if test -r "$ac_site_file"; then - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -echo "$as_me: loading site script $ac_site_file" >&6;} + { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 +$as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" fi @@ -1749,54 +2748,61 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:$LINENO: loading cache $cache_file" >&5 -echo "$as_me: loading cache $cache_file" >&6;} + { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in - [\\/]* | ?:[\\/]* ) . $cache_file;; - *) . ./$cache_file;; + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; esac fi else - { echo "$as_me:$LINENO: creating cache $cache_file" >&5 -echo "$as_me: creating cache $cache_file" >&6;} + { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 +$as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false -for ac_var in `(set) 2>&1 | - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do +for ac_var in $ac_precious_vars; do eval ac_old_set=\$ac_cv_env_${ac_var}_set eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val="\$ac_cv_env_${ac_var}_value" - eval ac_new_val="\$ac_env_${ac_var}_value" + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 -echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} + { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in @@ -1806,19 +2812,15 @@ echo "$as_me: current value: $ac_new_val" >&2;} fi done if $ac_cache_corrupted; then - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} + { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} + { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 +$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - @@ -1835,1016 +2837,1032 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu echo "$@" >config.parms -# Check whether --with-gnu-patch or --without-gnu-patch was given. +# Check whether --with-gnu-patch was given. if test "${with_gnu_patch+set}" = set; then - withval="$with_gnu_patch" + withval=$with_gnu_patch; +fi -fi; -# Check whether --with-agg or --without-agg was given. +# Check whether --with-agg was given. if test "${with_agg+set}" = set; then - withval="$with_agg" - + withval=$with_agg; else with_agg=yes -fi; +fi + -# Check whether --with-gnu-cp or --without-gnu-cp was given. +# Check whether --with-gnu-cp was given. if test "${with_gnu_cp+set}" = set; then - withval="$with_gnu_cp" + withval=$with_gnu_cp; +fi -fi; -# Check whether --with-gpc or --without-gpc was given. +# Check whether --with-gpc was given. if test "${with_gpc+set}" = set; then - withval="$with_gpc" - + withval=$with_gpc; else if test ! -e ./external/gpc/gpc.c && test ! -e ./external/gpc/gpc.h; then without_gpc=yes; fi -fi; -# Check whether --enable-ldap or --disable-ldap was given. +fi + +# Check whether --enable-graphite was given. +if test "${enable_graphite+set}" = set; then + enableval=$enable_graphite; +fi + + +# Check whether --with-system-graphite was given. +if test "${with_system_graphite+set}" = set; then + withval=$with_system_graphite; +fi + +# Check whether --enable-ldap was given. if test "${enable_ldap+set}" = set; then - enableval="$enable_ldap" + enableval=$enable_ldap; +fi -fi; -# Check whether --with-openldap or --without-openldap was given. +# Check whether --with-openldap was given. if test "${with_openldap+set}" = set; then - withval="$with_openldap" + withval=$with_openldap; +fi -fi; -# Check whether --enable-lockdown or --disable-lockdown was given. +# Check whether --enable-lockdown was given. if test "${enable_lockdown+set}" = set; then - enableval="$enable_lockdown" + enableval=$enable_lockdown; +fi -fi; -# Check whether --enable-vba or --disable-vba was given. +# Check whether --enable-vba was given. if test "${enable_vba+set}" = set; then - enableval="$enable_vba" + enableval=$enable_vba; +fi -fi; -# Check whether --with-vba-package-format or --without-vba-package-format was given. +# Check whether --with-vba-package-format was given. if test "${with_vba_package_format+set}" = set; then - withval="$with_vba_package_format" + withval=$with_vba_package_format; +fi -fi; -# Check whether --enable-pch or --disable-pch was given. +# Check whether --enable-pch was given. if test "${enable_pch+set}" = set; then - enableval="$enable_pch" + enableval=$enable_pch; +fi -fi; -# Check whether --enable-hids or --disable-hids was given. +# Check whether --enable-hids was given. if test "${enable_hids+set}" = set; then - enableval="$enable_hids" + enableval=$enable_hids; +fi -fi; -# Check whether --enable-mozilla or --disable-mozilla was given. +# Check whether --enable-mozilla was given. if test "${enable_mozilla+set}" = set; then - enableval="$enable_mozilla" - + enableval=$enable_mozilla; else enable_mozilla="yes" -fi; +fi -# Check whether --with-fonts or --without-fonts was given. + +# Check whether --with-fonts was given. if test "${with_fonts+set}" = set; then - withval="$with_fonts" + withval=$with_fonts; +fi -fi; -# Check whether --with-ppds or --without-ppds was given. +# Check whether --with-ppds was given. if test "${with_ppds+set}" = set; then - withval="$with_ppds" + withval=$with_ppds; +fi -fi; -# Check whether --with-afms or --without-afms was given. +# Check whether --with-afms was given. if test "${with_afms+set}" = set; then - withval="$with_afms" + withval=$with_afms; +fi -fi; -# Check whether --enable-epm or --disable-epm was given. +# Check whether --enable-epm was given. if test "${enable_epm+set}" = set; then - enableval="$enable_epm" - + enableval=$enable_epm; else enable_epm="yes" -fi; +fi -# Check whether --with-epm or --without-epm was given. + +# Check whether --with-epm was given. if test "${with_epm+set}" = set; then - withval="$with_epm" + withval=$with_epm; +fi -fi; -# Check whether --with-package-format or --without-package-format was given. +# Check whether --with-package-format was given. if test "${with_package_format+set}" = set; then - withval="$with_package_format" + withval=$with_package_format; +fi -fi; -# Check whether --enable-odk or --disable-odk was given. +# Check whether --enable-odk was given. if test "${enable_odk+set}" = set; then - enableval="$enable_odk" - + enableval=$enable_odk; else enable_odk="yes" -fi; -# Check whether --enable-qadevooo or --disable-qadevooo was given. -if test "${enable_qadevooo+set}" = set; then - enableval="$enable_qadevooo" +fi +# Check whether --enable-qadevooo was given. +if test "${enable_qadevooo+set}" = set; then + enableval=$enable_qadevooo; else enable_qadevooo="yes" -fi; -# Check whether --enable-fontooo or --disable-fontooo was given. -if test "${enable_fontooo+set}" = set; then - enableval="$enable_fontooo" +fi +# Check whether --enable-fontooo was given. +if test "${enable_fontooo+set}" = set; then + enableval=$enable_fontooo; else enable_fontooo="yes" -fi; -# Check whether --enable-mathmldtd or --disable-mathmldtd was given. -if test "${enable_mathmldtd+set}" = set; then - enableval="$enable_mathmldtd" +fi +# Check whether --enable-mathmldtd was given. +if test "${enable_mathmldtd+set}" = set; then + enableval=$enable_mathmldtd; else enable_mathmldtd="yes" -fi; -# Check whether --enable-evolution2 or --disable-evolution2 was given. +fi + +# Check whether --enable-evolution2 was given. if test "${enable_evolution2+set}" = set; then - enableval="$enable_evolution2" + enableval=$enable_evolution2; +fi -fi; -# Check whether --with-system-stdlibs or --without-system-stdlibs was given. +# Check whether --with-system-stdlibs was given. if test "${with_system_stdlibs+set}" = set; then - withval="$with_system_stdlibs" - + withval=$with_system_stdlibs; else checkforprelink=yes -fi; +fi -# Check whether --with-system-mspack or --without-system-mspack was given. + +# Check whether --with-system-mspack was given. if test "${with_system_mspack+set}" = set; then - withval="$with_system_mspack" + withval=$with_system_mspack; +fi -fi; -# Check whether --enable-cups or --disable-cups was given. +# Check whether --enable-cups was given. if test "${enable_cups+set}" = set; then - enableval="$enable_cups" - + enableval=$enable_cups; else enable_cups=yes -fi; -# Check whether --enable-fontconfig or --disable-fontconfig was given. -if test "${enable_fontconfig+set}" = set; then - enableval="$enable_fontconfig" +fi +# Check whether --enable-fontconfig was given. +if test "${enable_fontconfig+set}" = set; then + enableval=$enable_fontconfig; else enable_fontconfig=yes -fi; -# Check whether --enable-directx or --disable-directx was given. -if test "${enable_directx+set}" = set; then - enableval="$enable_directx" +fi +# Check whether --enable-directx was given. +if test "${enable_directx+set}" = set; then + enableval=$enable_directx; else enable_directx=yes -fi; -# Check whether --enable-activex or --disable-activex was given. +fi + +# Check whether --enable-activex was given. if test "${enable_activex+set}" = set; then - enableval="$enable_activex" + enableval=$enable_activex; +fi -fi; -# Check whether --enable-atl or --disable-atl was given. +# Check whether --enable-atl was given. if test "${enable_atl+set}" = set; then - enableval="$enable_atl" + enableval=$enable_atl; +fi -fi; -# Check whether --enable-symbols or --disable-symbols was given. +# Check whether --enable-symbols was given. if test "${enable_symbols+set}" = set; then - enableval="$enable_symbols" + enableval=$enable_symbols; +fi -fi; -# Check whether --enable-strip-solver or --disable-strip-solver was given. +# Check whether --enable-strip-solver was given. if test "${enable_strip_solver+set}" = set; then - enableval="$enable_strip_solver" + enableval=$enable_strip_solver; +fi -fi; -# Check whether --enable-werror or --disable-werror was given. +# Check whether --enable-werror was given. if test "${enable_werror+set}" = set; then - enableval="$enable_werror" + enableval=$enable_werror; +fi -fi; -# Check whether --enable-debug or --disable-debug was given. +# Check whether --enable-debug was given. if test "${enable_debug+set}" = set; then - enableval="$enable_debug" + enableval=$enable_debug; +fi -fi; -# Check whether --enable-dbgutil or --disable-dbgutil was given. +# Check whether --enable-dbgutil was given. if test "${enable_dbgutil+set}" = set; then - enableval="$enable_dbgutil" + enableval=$enable_dbgutil; +fi -fi; -# Check whether --enable-crashdump or --disable-crashdump was given. +# Check whether --enable-crashdump was given. if test "${enable_crashdump+set}" = set; then - enableval="$enable_crashdump" - + enableval=$enable_crashdump; else enable_crashdump=no -fi; -# Check whether --enable-cl-standard or --disable-cl-standard was given. +fi + +# Check whether --enable-cl-standard was given. if test "${enable_cl_standard+set}" = set; then - enableval="$enable_cl_standard" + enableval=$enable_cl_standard; +fi -fi; -# Check whether --enable-gtk or --disable-gtk was given. +# Check whether --enable-gtk was given. if test "${enable_gtk+set}" = set; then - enableval="$enable_gtk" - + enableval=$enable_gtk; else enable_gtk=yes -fi; -# Check whether --enable-systray or --disable-systray was given. -if test "${enable_systray+set}" = set; then - enableval="$enable_systray" +fi +# Check whether --enable-systray was given. +if test "${enable_systray+set}" = set; then + enableval=$enable_systray; else enable_systray=yes -fi; -# Check whether --enable-cairo or --disable-cairo was given. -if test "${enable_cairo+set}" = set; then - enableval="$enable_cairo" +fi +# Check whether --enable-cairo was given. +if test "${enable_cairo+set}" = set; then + enableval=$enable_cairo; else enable_cairo=no -fi; +fi -# Check whether --with-system-cairo or --without-system-cairo was given. + +# Check whether --with-system-cairo was given. if test "${with_system_cairo+set}" = set; then - withval="$with_system_cairo" + withval=$with_system_cairo; +fi -fi; -# Check whether --enable-opengl or --disable-opengl was given. +# Check whether --enable-opengl was given. if test "${enable_opengl+set}" = set; then - enableval="$enable_opengl" - + enableval=$enable_opengl; else enable_opengl=no -fi; -# Check whether --enable-dbus or --disable-dbus was given. -if test "${enable_dbus+set}" = set; then - enableval="$enable_dbus" +fi +# Check whether --enable-dbus was given. +if test "${enable_dbus+set}" = set; then + enableval=$enable_dbus; else enable_dbus=no -fi; -# Check whether --enable-gconf or --disable-gconf was given. -if test "${enable_gconf+set}" = set; then - enableval="$enable_gconf" +fi +# Check whether --enable-gconf was given. +if test "${enable_gconf+set}" = set; then + enableval=$enable_gconf; else enable_gconf=yes -fi; -# Check whether --enable-gnome-vfs or --disable-gnome-vfs was given. -if test "${enable_gnome_vfs+set}" = set; then - enableval="$enable_gnome_vfs" +fi +# Check whether --enable-gnome-vfs was given. +if test "${enable_gnome_vfs+set}" = set; then + enableval=$enable_gnome_vfs; else enable_gnome_vfs=yes -fi; -# Check whether --enable-gio or --disable-gio was given. -if test "${enable_gio+set}" = set; then - enableval="$enable_gio" +fi +# Check whether --enable-gio was given. +if test "${enable_gio+set}" = set; then + enableval=$enable_gio; else enable_gio=no -fi; -# Check whether --enable-static-gtk or --disable-static-gtk was given. +fi + +# Check whether --enable-static-gtk was given. if test "${enable_static_gtk+set}" = set; then - enableval="$enable_static_gtk" + enableval=$enable_static_gtk; +fi -fi; -# Check whether --enable-layout or --disable-layout was given. +# Check whether --enable-layout was given. if test "${enable_layout+set}" = set; then - enableval="$enable_layout" + enableval=$enable_layout; +fi -fi; -# Check whether --enable-build-mozilla or --disable-build-mozilla was given. +# Check whether --enable-build-mozilla was given. if test "${enable_build_mozilla+set}" = set; then - enableval="$enable_build_mozilla" + enableval=$enable_build_mozilla; +fi -fi; -# Check whether --with-mozilla-version or --without-mozilla-version was given. +# Check whether --with-mozilla-version was given. if test "${with_mozilla_version+set}" = set; then - withval="$with_mozilla_version" + withval=$with_mozilla_version; +fi -fi; -# Check whether --with-mozilla-toolkit or --without-mozilla-toolkit was given. +# Check whether --with-mozilla-toolkit was given. if test "${with_mozilla_toolkit+set}" = set; then - withval="$with_mozilla_toolkit" + withval=$with_mozilla_toolkit; +fi -fi; -# Check whether --enable-kde or --disable-kde was given. +# Check whether --enable-kde was given. if test "${enable_kde+set}" = set; then - enableval="$enable_kde" + enableval=$enable_kde; +fi -fi; -# Check whether --enable-kdeab or --disable-kdeab was given. +# Check whether --enable-kdeab was given. if test "${enable_kdeab+set}" = set; then - enableval="$enable_kdeab" - + enableval=$enable_kdeab; else if test "$enable_kde" = "yes"; then enable_kdeab=yes; fi -fi; -# Check whether --enable-kde4 or --disable-kde4 was given. +fi + +# Check whether --enable-kde4 was given. if test "${enable_kde4+set}" = set; then - enableval="$enable_kde4" + enableval=$enable_kde4; +fi -fi; -# Check whether --enable-binfilter or --disable-binfilter was given. +# Check whether --enable-binfilter was given. if test "${enable_binfilter+set}" = set; then - enableval="$enable_binfilter" - + enableval=$enable_binfilter; else if ! test -d ./binfilter; then enable_binfilter=no; fi -fi; -# Check whether --enable-rpath or --disable-rpath was given. +fi + +# Check whether --enable-rpath was given. if test "${enable_rpath+set}" = set; then - enableval="$enable_rpath" + enableval=$enable_rpath; +fi -fi; -# Check whether --enable-pam or --disable-pam was given. +# Check whether --enable-pam was given. if test "${enable_pam+set}" = set; then - enableval="$enable_pam" + enableval=$enable_pam; +fi -fi; -# Check whether --enable-pam-link or --disable-pam-link was given. +# Check whether --enable-pam-link was given. if test "${enable_pam_link+set}" = set; then - enableval="$enable_pam_link" + enableval=$enable_pam_link; +fi -fi; -# Check whether --enable-crypt-link or --disable-crypt-link was given. +# Check whether --enable-crypt-link was given. if test "${enable_crypt_link+set}" = set; then - enableval="$enable_crypt_link" - + enableval=$enable_crypt_link; else enable_crypt_link=yes -fi; -# Check whether --enable-xrender-link or --disable-xrender-link was given. +fi + +# Check whether --enable-xrender-link was given. if test "${enable_xrender_link+set}" = set; then - enableval="$enable_xrender_link" + enableval=$enable_xrender_link; +fi -fi; -# Check whether --enable-randr or --disable-randr was given. +# Check whether --enable-randr was given. if test "${enable_randr+set}" = set; then - enableval="$enable_randr" - + enableval=$enable_randr; else enable_randr=yes -fi; -# Check whether --enable-randr-link or --disable-randr-link was given. -if test "${enable_randr_link+set}" = set; then - enableval="$enable_randr_link" +fi +# Check whether --enable-randr-link was given. +if test "${enable_randr_link+set}" = set; then + enableval=$enable_randr_link; else enable_randr_link=yes -fi; +fi -# Check whether --with-myspell-dicts or --without-myspell-dicts was given. + +# Check whether --with-myspell-dicts was given. if test "${with_myspell_dicts+set}" = set; then - withval="$with_myspell_dicts" + withval=$with_myspell_dicts; +fi -fi; -# Check whether --with-system-dicts or --without-system-dicts was given. +# Check whether --with-system-dicts was given. if test "${with_system_dicts+set}" = set; then - withval="$with_system_dicts" + withval=$with_system_dicts; +fi -fi; -# Check whether --with-external-dict-dir or --without-external-dict-dir was given. +# Check whether --with-external-dict-dir was given. if test "${with_external_dict_dir+set}" = set; then - withval="$with_external_dict_dir" + withval=$with_external_dict_dir; +fi -fi; -# Check whether --with-external-hyph-dir or --without-external-hyph-dir was given. +# Check whether --with-external-hyph-dir was given. if test "${with_external_hyph_dir+set}" = set; then - withval="$with_external_hyph_dir" + withval=$with_external_hyph_dir; +fi -fi; -# Check whether --with-external-thes-dir or --without-external-thes-dir was given. +# Check whether --with-external-thes-dir was given. if test "${with_external_thes_dir+set}" = set; then - withval="$with_external_thes_dir" + withval=$with_external_thes_dir; +fi -fi; -# Check whether --with-system-libs or --without-system-libs was given. +# Check whether --with-system-libs was given. if test "${with_system_libs+set}" = set; then - withval="$with_system_libs" + withval=$with_system_libs; +fi -fi; -# Check whether --with-system-headers or --without-system-headers was given. +# Check whether --with-system-headers was given. if test "${with_system_headers+set}" = set; then - withval="$with_system_headers" + withval=$with_system_headers; +fi -fi; -# Check whether --with-system-jars or --without-system-jars was given. +# Check whether --with-system-jars was given. if test "${with_system_jars+set}" = set; then - withval="$with_system_jars" + withval=$with_system_jars; +fi -fi; -# Check whether --with-system-zlib or --without-system-zlib was given. +# Check whether --with-system-zlib was given. if test "${with_system_zlib+set}" = set; then - withval="$with_system_zlib" + withval=$with_system_zlib; +fi -fi; -# Check whether --with-system-openssl or --without-system-openssl was given. +# Check whether --with-system-openssl was given. if test "${with_system_openssl+set}" = set; then - withval="$with_system_openssl" + withval=$with_system_openssl; +fi -fi; -# Check whether --with-system-jpeg or --without-system-jpeg was given. +# Check whether --with-system-jpeg was given. if test "${with_system_jpeg+set}" = set; then - withval="$with_system_jpeg" + withval=$with_system_jpeg; +fi -fi; -# Check whether --with-system-expat or --without-system-expat was given. +# Check whether --with-system-expat was given. if test "${with_system_expat+set}" = set; then - withval="$with_system_expat" + withval=$with_system_expat; +fi -fi; -# Check whether --with-system-libwpd or --without-system-libwpd was given. +# Check whether --with-system-libwpd was given. if test "${with_system_libwpd+set}" = set; then - withval="$with_system_libwpd" + withval=$with_system_libwpd; +fi -fi; -# Check whether --with-system-libxml or --without-system-libxml was given. +# Check whether --with-system-libxml was given. if test "${with_system_libxml+set}" = set; then - withval="$with_system_libxml" + withval=$with_system_libxml; +fi -fi; -# Check whether --with-system-python or --without-system-python was given. +# Check whether --with-system-python was given. if test "${with_system_python+set}" = set; then - withval="$with_system_python" + withval=$with_system_python; +fi -fi; -# Check whether --with-system-icu or --without-system-icu was given. +# Check whether --with-system-icu was given. if test "${with_system_icu+set}" = set; then - withval="$with_system_icu" + withval=$with_system_icu; +fi -fi; -# Check whether --with-system-poppler or --without-system-poppler was given. +# Check whether --with-system-poppler was given. if test "${with_system_poppler+set}" = set; then - withval="$with_system_poppler" + withval=$with_system_poppler; +fi -fi; -# Check whether --with-system-db or --without-system-db was given. +# Check whether --with-system-db was given. if test "${with_system_db+set}" = set; then - withval="$with_system_db" + withval=$with_system_db; +fi -fi; -# Check whether --with-system-lucene or --without-system-lucene was given. +# Check whether --with-system-lucene was given. if test "${with_system_lucene+set}" = set; then - withval="$with_system_lucene" + withval=$with_system_lucene; +fi -fi; -# Check whether --with-lucene-core-jar or --without-lucene-core-jar was given. +# Check whether --with-lucene-core-jar was given. if test "${with_lucene_core_jar+set}" = set; then - withval="$with_lucene_core_jar" - LUCENE_CORE_JAR="$withval" + withval=$with_lucene_core_jar; LUCENE_CORE_JAR="$withval" + +fi -fi; -# Check whether --with-lucene-analyzers-jar or --without-lucene-analyzers-jar was given. +# Check whether --with-lucene-analyzers-jar was given. if test "${with_lucene_analyzers_jar+set}" = set; then - withval="$with_lucene_analyzers_jar" - LUCENE_ANALYZERS_JAR="$withval" + withval=$with_lucene_analyzers_jar; LUCENE_ANALYZERS_JAR="$withval" + +fi -fi; -# Check whether --with-system-hsqldb or --without-system-hsqldb was given. +# Check whether --with-system-hsqldb was given. if test "${with_system_hsqldb+set}" = set; then - withval="$with_system_hsqldb" + withval=$with_system_hsqldb; +fi -fi; -# Check whether --with-hsqldb-jar or --without-hsqldb-jar was given. +# Check whether --with-hsqldb-jar was given. if test "${with_hsqldb_jar+set}" = set; then - withval="$with_hsqldb_jar" - HSQLDB_JAR="$withval" + withval=$with_hsqldb_jar; HSQLDB_JAR="$withval" + +fi -fi; -# Check whether --with-system-beanshell or --without-system-beanshell was given. +# Check whether --with-system-beanshell was given. if test "${with_system_beanshell+set}" = set; then - withval="$with_system_beanshell" + withval=$with_system_beanshell; +fi -fi; -# Check whether --with-beanshell-jar or --without-beanshell-jar was given. +# Check whether --with-beanshell-jar was given. if test "${with_beanshell_jar+set}" = set; then - withval="$with_beanshell_jar" - BSH_JAR="$withval" + withval=$with_beanshell_jar; BSH_JAR="$withval" -fi; -# Check whether --enable-minimizer or --disable-minimizer was given. +fi + +# Check whether --enable-minimizer was given. if test "${enable_minimizer+set}" = set; then - enableval="$enable_minimizer" + enableval=$enable_minimizer; +fi -fi; -# Check whether --enable-presenter-console or --disable-presenter-console was given. +# Check whether --enable-presenter-console was given. if test "${enable_presenter_console+set}" = set; then - enableval="$enable_presenter_console" + enableval=$enable_presenter_console; +fi -fi; -# Check whether --enable-pdfimport or --disable-pdfimport was given. +# Check whether --enable-pdfimport was given. if test "${enable_pdfimport+set}" = set; then - enableval="$enable_pdfimport" + enableval=$enable_pdfimport; +fi -fi; -# Check whether --enable-wiki-publisher or --disable-wiki-publisher was given. +# Check whether --enable-wiki-publisher was given. if test "${enable_wiki_publisher+set}" = set; then - enableval="$enable_wiki_publisher" + enableval=$enable_wiki_publisher; +fi -fi; -# Check whether --with-commons-codec-jar or --without-commons-codec-jar was given. +# Check whether --with-commons-codec-jar was given. if test "${with_commons_codec_jar+set}" = set; then - withval="$with_commons_codec_jar" - COMMONS_CODEC_JAR="$withval" + withval=$with_commons_codec_jar; COMMONS_CODEC_JAR="$withval" + +fi -fi; -# Check whether --with-commons-lang-jar or --without-commons-lang-jar was given. +# Check whether --with-commons-lang-jar was given. if test "${with_commons_lang_jar+set}" = set; then - withval="$with_commons_lang_jar" - COMMONS_LANG_JAR="$withval" + withval=$with_commons_lang_jar; COMMONS_LANG_JAR="$withval" + +fi -fi; -# Check whether --with-commons-httpclient-jar or --without-commons-httpclient-jar was given. +# Check whether --with-commons-httpclient-jar was given. if test "${with_commons_httpclient_jar+set}" = set; then - withval="$with_commons_httpclient_jar" - COMMONS_HTTPCLIENT_JAR="$withval" + withval=$with_commons_httpclient_jar; COMMONS_HTTPCLIENT_JAR="$withval" + +fi -fi; -# Check whether --with-commons-logging-jar or --without-commons-logging-jar was given. +# Check whether --with-commons-logging-jar was given. if test "${with_commons_logging_jar+set}" = set; then - withval="$with_commons_logging_jar" - COMMONS_LOGGING_JAR="$withval" + withval=$with_commons_logging_jar; COMMONS_LOGGING_JAR="$withval" + +fi -fi; -# Check whether --with-servlet-api-jar or --without-servlet-api-jar was given. +# Check whether --with-servlet-api-jar was given. if test "${with_servlet_api_jar+set}" = set; then - withval="$with_servlet_api_jar" - SERVLETAPI_JAR="$withval" + withval=$with_servlet_api_jar; SERVLETAPI_JAR="$withval" + +fi -fi; -# Check whether --enable-report-builder or --disable-report-builder was given. +# Check whether --enable-report-builder was given. if test "${enable_report_builder+set}" = set; then - enableval="$enable_report_builder" + enableval=$enable_report_builder; +fi -fi; -# Check whether --with-system-jfreereport or --without-system-jfreereport was given. +# Check whether --with-system-jfreereport was given. if test "${with_system_jfreereport+set}" = set; then - withval="$with_system_jfreereport" + withval=$with_system_jfreereport; +fi -fi; -# Check whether --with-sac-jar or --without-sac-jar was given. +# Check whether --with-sac-jar was given. if test "${with_sac_jar+set}" = set; then - withval="$with_sac_jar" - SAC_JAR="$withval" + withval=$with_sac_jar; SAC_JAR="$withval" + +fi -fi; -# Check whether --with-libxml-jar or --without-libxml-jar was given. +# Check whether --with-libxml-jar was given. if test "${with_libxml_jar+set}" = set; then - withval="$with_libxml_jar" - LIBXML_JAR="$withval" + withval=$with_libxml_jar; LIBXML_JAR="$withval" + +fi -fi; -# Check whether --with-flute-jar or --without-flute-jar was given. +# Check whether --with-flute-jar was given. if test "${with_flute_jar+set}" = set; then - withval="$with_flute_jar" - FLUTE_JAR="$withval" + withval=$with_flute_jar; FLUTE_JAR="$withval" + +fi -fi; -# Check whether --with-jfreereport-jar or --without-jfreereport-jar was given. +# Check whether --with-jfreereport-jar was given. if test "${with_jfreereport_jar+set}" = set; then - withval="$with_jfreereport_jar" - JFREEREPORT_JAR="$withval" + withval=$with_jfreereport_jar; JFREEREPORT_JAR="$withval" + +fi -fi; -# Check whether --with-liblayout-jar or --without-liblayout-jar was given. +# Check whether --with-liblayout-jar was given. if test "${with_liblayout_jar+set}" = set; then - withval="$with_liblayout_jar" - LIBLAYOUT_JAR="$withval" + withval=$with_liblayout_jar; LIBLAYOUT_JAR="$withval" + +fi -fi; -# Check whether --with-libloader-jar or --without-libloader-jar was given. +# Check whether --with-libloader-jar was given. if test "${with_libloader_jar+set}" = set; then - withval="$with_libloader_jar" - LIBLOADER_JAR="$withval" + withval=$with_libloader_jar; LIBLOADER_JAR="$withval" + +fi -fi; -# Check whether --with-libloader-jar or --without-libloader-jar was given. +# Check whether --with-libloader-jar was given. if test "${with_libloader_jar+set}" = set; then - withval="$with_libloader_jar" - LIBLOADER_JAR="$withval" + withval=$with_libloader_jar; LIBLOADER_JAR="$withval" + +fi -fi; -# Check whether --with-libformula-jar or --without-libformula-jar was given. +# Check whether --with-libformula-jar was given. if test "${with_libformula_jar+set}" = set; then - withval="$with_libformula_jar" - LIBFORMULA_JAR="$withval" + withval=$with_libformula_jar; LIBFORMULA_JAR="$withval" + +fi -fi; -# Check whether --with-librepository-jar or --without-librepository-jar was given. +# Check whether --with-librepository-jar was given. if test "${with_librepository_jar+set}" = set; then - withval="$with_librepository_jar" - LIBREPOSITORY_JAR="$withval" + withval=$with_librepository_jar; LIBREPOSITORY_JAR="$withval" + +fi -fi; -# Check whether --with-libfonts-jar or --without-libfonts-jar was given. +# Check whether --with-libfonts-jar was given. if test "${with_libfonts_jar+set}" = set; then - withval="$with_libfonts_jar" - LIBFONTS_JAR="$withval" + withval=$with_libfonts_jar; LIBFONTS_JAR="$withval" + +fi -fi; -# Check whether --with-libserializer-jar or --without-libserializer-jar was given. +# Check whether --with-libserializer-jar was given. if test "${with_libserializer_jar+set}" = set; then - withval="$with_libserializer_jar" - LIBSERIALIZER_JAR="$withval" + withval=$with_libserializer_jar; LIBSERIALIZER_JAR="$withval" + +fi -fi; -# Check whether --with-libbase-jar or --without-libbase-jar was given. +# Check whether --with-libbase-jar was given. if test "${with_libbase_jar+set}" = set; then - withval="$with_libbase_jar" - LIBBASE_JAR="$withval" + withval=$with_libbase_jar; LIBBASE_JAR="$withval" + +fi -fi; -# Check whether --with-system-saxon or --without-system-saxon was given. +# Check whether --with-system-saxon was given. if test "${with_system_saxon+set}" = set; then - withval="$with_system_saxon" + withval=$with_system_saxon; +fi -fi; -# Check whether --with-saxon-jar or --without-saxon-jar was given. +# Check whether --with-saxon-jar was given. if test "${with_saxon_jar+set}" = set; then - withval="$with_saxon_jar" - SAXON_JAR="$withval" + withval=$with_saxon_jar; SAXON_JAR="$withval" + +fi -fi; -# Check whether --with-system-libxslt or --without-system-libxslt was given. +# Check whether --with-system-libxslt was given. if test "${with_system_libxslt+set}" = set; then - withval="$with_system_libxslt" + withval=$with_system_libxslt; +fi -fi; -# Check whether --with-system-odbc or --without-system-odbc was given. +# Check whether --with-system-odbc was given. if test "${with_system_odbc+set}" = set; then - withval="$with_system_odbc" + withval=$with_system_odbc; +fi -fi; -# Check whether --with-system-sane or --without-system-sane was given. +# Check whether --with-system-sane was given. if test "${with_system_sane+set}" = set; then - withval="$with_system_sane" + withval=$with_system_sane; +fi -fi; -# Check whether --with-system-xrender or --without-system-xrender was given. +# Check whether --with-system-xrender was given. if test "${with_system_xrender+set}" = set; then - withval="$with_system_xrender" + withval=$with_system_xrender; +fi -fi; -# Check whether --with-system-curl or --without-system-curl was given. +# Check whether --with-system-curl was given. if test "${with_system_curl+set}" = set; then - withval="$with_system_curl" + withval=$with_system_curl; +fi -fi; -# Check whether --with-system-boost or --without-system-boost was given. +# Check whether --with-system-boost was given. if test "${with_system_boost+set}" = set; then - withval="$with_system_boost" + withval=$with_system_boost; +fi -fi; -# Check whether --with-system-vigra or --without-system-vigra was given. +# Check whether --with-system-vigra was given. if test "${with_system_vigra+set}" = set; then - withval="$with_system_vigra" + withval=$with_system_vigra; +fi -fi; -# Check whether --enable-neon or --disable-neon was given. +# Check whether --enable-neon was given. if test "${enable_neon+set}" = set; then - enableval="$enable_neon" + enableval=$enable_neon; +fi -fi; -# Check whether --enable-Xaw or --disable-Xaw was given. +# Check whether --enable-Xaw was given. if test "${enable_Xaw+set}" = set; then - enableval="$enable_Xaw" + enableval=$enable_Xaw; +fi -fi; -# Check whether --with-system-neon or --without-system-neon was given. +# Check whether --with-system-neon was given. if test "${with_system_neon+set}" = set; then - withval="$with_system_neon" + withval=$with_system_neon; +fi -fi; -# Check whether --with-system-agg or --without-system-agg was given. +# Check whether --with-system-agg was given. if test "${with_system_agg+set}" = set; then - withval="$with_system_agg" + withval=$with_system_agg; +fi -fi; -# Check whether --with-system-hunspell or --without-system-hunspell was given. +# Check whether --with-system-hunspell was given. if test "${with_system_hunspell+set}" = set; then - withval="$with_system_hunspell" + withval=$with_system_hunspell; +fi -fi; -# Check whether --with-system-mythes or --without-system-mythes was given. +# Check whether --with-system-mythes was given. if test "${with_system_mythes+set}" = set; then - withval="$with_system_mythes" + withval=$with_system_mythes; +fi -fi; -# Check whether --with-system-altlinuxhyph or --without-system-altlinuxhyph was given. +# Check whether --with-system-altlinuxhyph was given. if test "${with_system_altlinuxhyph+set}" = set; then - withval="$with_system_altlinuxhyph" + withval=$with_system_altlinuxhyph; +fi -fi; -# Check whether --with-system-lpsolve or --without-system-lpsolve was given. +# Check whether --with-system-lpsolve was given. if test "${with_system_lpsolve+set}" = set; then - withval="$with_system_lpsolve" + withval=$with_system_lpsolve; +fi -fi; -# Check whether --with-system-mozilla or --without-system-mozilla was given. +# Check whether --with-system-mozilla was given. if test "${with_system_mozilla+set}" = set; then - withval="$with_system_mozilla" - WITH_SYSTEM_MOZILLA=$withval + withval=$with_system_mozilla; WITH_SYSTEM_MOZILLA=$withval else WITH_SYSTEM_MOZILLA=no -fi; +fi + -# Check whether --with-stlport or --without-stlport was given. +# Check whether --with-stlport was given. if test "${with_stlport+set}" = set; then - withval="$with_stlport" - WITH_STLPORT=$withval + withval=$with_stlport; WITH_STLPORT=$withval else WITH_STLPORT=auto -fi; +fi + -# Check whether --with-jdk-home or --without-jdk-home was given. +# Check whether --with-jdk-home was given. if test "${with_jdk_home+set}" = set; then - withval="$with_jdk_home" + withval=$with_jdk_home; +fi -fi; -# Check whether --with-gxx_include_path or --without-gxx_include_path was given. +# Check whether --with-gxx_include_path was given. if test "${with_gxx_include_path+set}" = set; then - withval="$with_gxx_include_path" + withval=$with_gxx_include_path; +fi -fi; -# Check whether --with-java or --without-java was given. +# Check whether --with-java was given. if test "${with_java+set}" = set; then - withval="$with_java" - if test "$withval" = "yes"; then WITH_JAVA=java; else WITH_JAVA=$withval; fi + withval=$with_java; if test "$withval" = "yes"; then WITH_JAVA=java; else WITH_JAVA=$withval; fi else WITH_JAVA=java -fi; -# Check whether --enable-gcjaot or --disable-gcjaot was given. +fi + +# Check whether --enable-gcjaot was given. if test "${enable_gcjaot+set}" = set; then - enableval="$enable_gcjaot" + enableval=$enable_gcjaot; +fi -fi; -# Check whether --with-ant-home or --without-ant-home was given. +# Check whether --with-ant-home was given. if test "${with_ant_home+set}" = set; then - withval="$with_ant_home" + withval=$with_ant_home; +fi -fi; -# Check whether --with-perl-home or --without-perl-home was given. +# Check whether --with-perl-home was given. if test "${with_perl_home+set}" = set; then - withval="$with_perl_home" + withval=$with_perl_home; +fi -fi; -# Check whether --with-cl-home or --without-cl-home was given. +# Check whether --with-cl-home was given. if test "${with_cl_home+set}" = set; then - withval="$with_cl_home" + withval=$with_cl_home; +fi -fi; -# Check whether --with-mspdb-path or --without-mspdb-path was given. +# Check whether --with-mspdb-path was given. if test "${with_mspdb_path+set}" = set; then - withval="$with_mspdb_path" + withval=$with_mspdb_path; +fi -fi; -# Check whether --with-midl-path or --without-midl-path was given. +# Check whether --with-midl-path was given. if test "${with_midl_path+set}" = set; then - withval="$with_midl_path" + withval=$with_midl_path; +fi -fi; -# Check whether --with-csc-path or --without-csc-path was given. +# Check whether --with-csc-path was given. if test "${with_csc_path+set}" = set; then - withval="$with_csc_path" + withval=$with_csc_path; +fi -fi; -# Check whether --with-nsis-path or --without-nsis-path was given. +# Check whether --with-nsis-path was given. if test "${with_nsis_path+set}" = set; then - withval="$with_nsis_path" + withval=$with_nsis_path; +fi -fi; -# Check whether --with-frame-home or --without-frame-home was given. +# Check whether --with-frame-home was given. if test "${with_frame_home+set}" = set; then - withval="$with_frame_home" + withval=$with_frame_home; +fi -fi; -# Check whether --with-psdk-home or --without-psdk-home was given. +# Check whether --with-psdk-home was given. if test "${with_psdk_home+set}" = set; then - withval="$with_psdk_home" + withval=$with_psdk_home; +fi -fi; -# Check whether --with-directx-home or --without-directx-home was given. +# Check whether --with-directx-home was given. if test "${with_directx_home+set}" = set; then - withval="$with_directx_home" + withval=$with_directx_home; +fi -fi; -# Check whether --with-local-solenv or --without-local-solenv was given. +# Check whether --with-local-solenv was given. if test "${with_local_solenv+set}" = set; then - withval="$with_local_solenv" + withval=$with_local_solenv; +fi -fi; -# Check whether --with-local-solver or --without-local-solver was given. +# Check whether --with-local-solver was given. if test "${with_local_solver+set}" = set; then - withval="$with_local_solver" + withval=$with_local_solver; +fi -fi; -# Check whether --enable-check-only or --disable-check-only was given. +# Check whether --enable-check-only was given. if test "${enable_check_only+set}" = set; then - enableval="$enable_check_only" + enableval=$enable_check_only; +fi -fi; -# Check whether --with-lang or --without-lang was given. +# Check whether --with-lang was given. if test "${with_lang+set}" = set; then - withval="$with_lang" + withval=$with_lang; +fi -fi; -# Check whether --with-poor-help-localizations or --without-poor-help-localizations was given. +# Check whether --with-poor-help-localizations was given. if test "${with_poor_help_localizations+set}" = set; then - withval="$with_poor_help_localizations" + withval=$with_poor_help_localizations; +fi -fi; -# Check whether --with-dict or --without-dict was given. +# Check whether --with-dict was given. if test "${with_dict+set}" = set; then - withval="$with_dict" + withval=$with_dict; +fi -fi; -# Check whether --with-intro-bitmaps or --without-intro-bitmaps was given. +# Check whether --with-intro-bitmaps was given. if test "${with_intro_bitmaps+set}" = set; then - withval="$with_intro_bitmaps" + withval=$with_intro_bitmaps; +fi -fi; -# Check whether --with-about-bitmaps or --without-about-bitmaps was given. +# Check whether --with-about-bitmaps was given. if test "${with_about_bitmaps+set}" = set; then - withval="$with_about_bitmaps" + withval=$with_about_bitmaps; +fi -fi; -# Check whether --with-vendor or --without-vendor was given. +# Check whether --with-vendor was given. if test "${with_vendor+set}" = set; then - withval="$with_vendor" + withval=$with_vendor; +fi -fi; -# Check whether --with-unix-wrapper or --without-unix-wrapper was given. +# Check whether --with-unix-wrapper was given. if test "${with_unix_wrapper+set}" = set; then - withval="$with_unix_wrapper" + withval=$with_unix_wrapper; +fi -fi; -# Check whether --with-asm-home or --without-asm-home was given. +# Check whether --with-asm-home was given. if test "${with_asm_home+set}" = set; then - withval="$with_asm_home" + withval=$with_asm_home; +fi -fi; -# Check whether --with-os-version or --without-os-version was given. +# Check whether --with-os-version was given. if test "${with_os_version+set}" = set; then - withval="$with_os_version" + withval=$with_os_version; +fi -fi; -# Check whether --with-unzip-home or --without-unzip-home was given. +# Check whether --with-unzip-home was given. if test "${with_unzip_home+set}" = set; then - withval="$with_unzip_home" + withval=$with_unzip_home; +fi -fi; -# Check whether --with-zip-home or --without-zip-home was given. +# Check whether --with-zip-home was given. if test "${with_zip_home+set}" = set; then - withval="$with_zip_home" + withval=$with_zip_home; +fi -fi; -# Check whether --with-mingwin or --without-mingwin was given. +# Check whether --with-mingwin was given. if test "${with_mingwin+set}" = set; then - withval="$with_mingwin" - WITH_MINGWIN=$withval + withval=$with_mingwin; WITH_MINGWIN=$withval else WITH_MINGWIN=0 -fi; +fi -# Check whether --with-use-shell or --without-use-shell was given. + +# Check whether --with-use-shell was given. if test "${with_use_shell+set}" = set; then - withval="$with_use_shell" - with_use_shell=$withval + withval=$with_use_shell; with_use_shell=$withval else with_use_shell="tcsh" -fi; +fi -# Check whether --with-build-version or --without-build-version was given. + +# Check whether --with-build-version was given. if test "${with_build_version+set}" = set; then - withval="$with_build_version" - with_build_version=$withval -fi; -# Check whether --enable-sgistl or --disable-sgistl was given. + withval=$with_build_version; with_build_version=$withval +fi + +# Check whether --enable-sgistl was given. if test "${enable_sgistl+set}" = set; then - enableval="$enable_sgistl" + enableval=$enable_sgistl; +fi -fi; -# Check whether --with-alloc or --without-alloc was given. +# Check whether --with-alloc was given. if test "${with_alloc+set}" = set; then - withval="$with_alloc" + withval=$with_alloc; +fi -fi; -# Check whether --enable-verbose or --disable-verbose was given. +# Check whether --enable-verbose was given. if test "${enable_verbose+set}" = set; then - enableval="$enable_verbose" + enableval=$enable_verbose; +fi -fi; BUILD_TYPE="OOo" @@ -2871,29 +3889,148 @@ echo "* *" echo "********************************************************************" echo "" cat /dev/null > warn -echo "$as_me:$LINENO: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6 -if test "${ac_cv_prog_egrep+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' +{ $as_echo "$as_me:$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 test "${ac_cv_path_GREP+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -z "$GREP"; then + ac_path_GREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue +# Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_GREP_found && break 3 + done + done +done +IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then + { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } + fi +else + ac_cv_path_GREP=$GREP +fi + +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +$as_echo "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } +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 + then ac_cv_path_EGREP="$GREP -E" + else + if test -z "$EGREP"; then + ac_path_EGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue +# Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_EGREP_found && break 3 + done + done +done +IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then + { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } + fi +else + ac_cv_path_EGREP=$EGREP +fi + + fi fi -echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 -echo "${ECHO_T}$ac_cv_prog_egrep" >&6 - EGREP=$ac_cv_prog_egrep +{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +$as_echo "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_AWK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. @@ -2904,34 +4041,36 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AWK="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:$LINENO: result: $AWK" >&5 -echo "${ECHO_T}$AWK" >&6 + { $as_echo "$as_me:$LINENO: result: $AWK" >&5 +$as_echo "$AWK" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + test -n "$AWK" && break done # Extract the first word of "$AWK", so it can be a program name with args. set dummy $AWK; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_AWK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $AWK in [\\/]* | ?:[\\/]*) @@ -2944,30 +4083,31 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_AWK="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi AWK=$ac_cv_path_AWK - if test -n "$AWK"; then - echo "$as_me:$LINENO: result: $AWK" >&5 -echo "${ECHO_T}$AWK" >&6 + { $as_echo "$as_me:$LINENO: result: $AWK" >&5 +$as_echo "$AWK" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + if test -z "$AWK"; then - { { echo "$as_me:$LINENO: error: install awk to run this script" >&5 -echo "$as_me: error: install awk to run this script" >&2;} + { { $as_echo "$as_me:$LINENO: error: install awk to run this script" >&5 +$as_echo "$as_me: error: install awk to run this script" >&2;} { (exit 1); exit 1; }; } fi @@ -2975,10 +4115,10 @@ for ac_prog in sed do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_SED+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $SED in [\\/]* | ?:[\\/]*) @@ -2991,46 +4131,47 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi SED=$ac_cv_path_SED - if test -n "$SED"; then - echo "$as_me:$LINENO: result: $SED" >&5 -echo "${ECHO_T}$SED" >&6 + { $as_echo "$as_me:$LINENO: result: $SED" >&5 +$as_echo "$SED" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + test -n "$SED" && break done if test -z "$SED"; then - { { echo "$as_me:$LINENO: error: install sed to run this script" >&5 -echo "$as_me: error: install sed to run this script" >&2;} + { { $as_echo "$as_me:$LINENO: error: install sed to run this script" >&5 +$as_echo "$as_me: error: install sed to run this script" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:$LINENO: checking for solenv environment" >&5 -echo $ECHO_N "checking for solenv environment... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for solenv environment" >&5 +$as_echo_n "checking for solenv environment... " >&6; } if test -z "$with_local_solenv"; then LOCAL_SOLENV="DEFAULT" - echo "$as_me:$LINENO: result: default" >&5 -echo "${ECHO_T}default" >&6 + { $as_echo "$as_me:$LINENO: result: default" >&5 +$as_echo "default" >&6; } else LOCAL_SOLENV=$with_local_solenv - echo "$as_me:$LINENO: result: $with_local_solenv" >&5 -echo "${ECHO_T}$with_local_solenv" >&6 + { $as_echo "$as_me:$LINENO: result: $with_local_solenv" >&5 +$as_echo "$with_local_solenv" >&6; } fi @@ -3048,110 +4189,160 @@ if test -e $_solenv/inc/minor.mk; then SOURCEVERSION="`grep SOURCEVERSION= $_solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`" else - { { echo "$as_me:$LINENO: error: $_solenv/inc/minor.mk missing but needed for architecture/os detecion and proper environment script generation..." >&5 -echo "$as_me: error: $_solenv/inc/minor.mk missing but needed for architecture/os detecion and proper environment script generation..." >&2;} + { { $as_echo "$as_me:$LINENO: error: $_solenv/inc/minor.mk missing but needed for architecture/os detecion and proper environment script generation..." >&5 +$as_echo "$as_me: error: $_solenv/inc/minor.mk missing but needed for architecture/os detecion and proper environment script generation..." >&2;} { (exit 1); exit 1; }; } fi ac_aux_dir= -for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then +for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do + if test -f "$ac_dir/install-sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" break - elif test -f $ac_dir/install.sh; then + elif test -f "$ac_dir/install.sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install.sh -c" break - elif test -f $ac_dir/shtool; then + elif test -f "$ac_dir/shtool"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/shtool install -c" break fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 -echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 +$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} { (exit 1); exit 1; }; } fi -ac_config_guess="$SHELL $ac_aux_dir/config.guess" -ac_config_sub="$SHELL $ac_aux_dir/config.sub" -ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + # Make sure we can run config.sub. -$ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 -echo "$as_me: error: cannot run $ac_config_sub" >&2;} +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 +$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:$LINENO: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } if test "${ac_cv_build+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else - ac_cv_build_alias=$build_alias -test -z "$ac_cv_build_alias" && - ac_cv_build_alias=`$ac_config_guess` -test -z "$ac_cv_build_alias" && - { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -echo "$as_me: error: cannot guess build type; you must specify one" >&2;} + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && + { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 +$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;} { (exit 1); exit 1; }; } -ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 +$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +$as_echo "$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 +$as_echo "$as_me: error: invalid value of canonical build" >&2;} + { (exit 1); exit 1; }; };; +esac build=$ac_cv_build -build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - - -echo "$as_me:$LINENO: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6 +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +{ $as_echo "$as_me:$LINENO: checking host system type" >&5 +$as_echo_n "checking host system type... " >&6; } if test "${ac_cv_host+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else - ac_cv_host_alias=$host_alias -test -z "$ac_cv_host_alias" && - ac_cv_host_alias=$ac_cv_build_alias -ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 +$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} { (exit 1); exit 1; }; } +fi fi -echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 +$as_echo "$as_me: error: invalid value of canonical host" >&2;} + { (exit 1); exit 1; }; };; +esac host=$ac_cv_host -host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - - -echo "$as_me:$LINENO: checking target system type" >&5 -echo $ECHO_N "checking target system type... $ECHO_C" >&6 +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + +{ $as_echo "$as_me:$LINENO: checking target system type" >&5 +$as_echo_n "checking target system type... " >&6; } if test "${ac_cv_target+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else - ac_cv_target_alias=$target_alias -test "x$ac_cv_target_alias" = "x" && - ac_cv_target_alias=$ac_cv_host_alias -ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} + if test "x$target_alias" = x; then + ac_cv_target=$ac_cv_host +else + ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || + { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5 +$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;} { (exit 1); exit 1; }; } +fi fi -echo "$as_me:$LINENO: result: $ac_cv_target" >&5 -echo "${ECHO_T}$ac_cv_target" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_target" >&5 +$as_echo "$ac_cv_target" >&6; } +case $ac_cv_target in +*-*-*) ;; +*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical target" >&5 +$as_echo "$as_me: error: invalid value of canonical target" >&2;} + { (exit 1); exit 1; }; };; +esac target=$ac_cv_target -target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_target +shift +target_cpu=$1 +target_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +target_os=$* +IFS=$ac_save_IFS +case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac # The aliases save the names the user supplied, while $host etc. @@ -3162,20 +4353,20 @@ test -n "$target_alias" && program_prefix=${target_alias}- if test "$build" != "$host" -o "$build" != "$target" \ -o "$host" != "$target"; then - { echo "$as_me:$LINENO: WARNING: cross-compiling by any means is not supported (yet)!" >&5 -echo "$as_me: WARNING: cross-compiling by any means is not supported (yet)!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: cross-compiling by any means is not supported (yet)!" >&5 +$as_echo "$as_me: WARNING: cross-compiling by any means is not supported (yet)!" >&2;} echo "cross-compiling by any means is not supported (yet)!" >> warn fi if echo "$build_os" | grep cygwin; then - echo "$as_me:$LINENO: checking Cygwin version" >&5 -echo $ECHO_N "checking Cygwin version... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking Cygwin version" >&5 +$as_echo_n "checking Cygwin version... " >&6; } CygwinVer=`uname -r` - echo "$as_me:$LINENO: result: $CygwinVer" >&5 -echo "${ECHO_T}$CygwinVer" >&6 + { $as_echo "$as_me:$LINENO: result: $CygwinVer" >&5 +$as_echo "$CygwinVer" >&6; } if test "`echo $CygwinVer | $AWK -F . '{ print $1$2 }'`" -lt "15"; then - { { echo "$as_me:$LINENO: error: You need at least Cygwin V1.5.x" >&5 -echo "$as_me: error: You need at least Cygwin V1.5.x" >&2;} + { { $as_echo "$as_me:$LINENO: error: You need at least Cygwin V1.5.x" >&5 +$as_echo "$as_me: error: You need at least Cygwin V1.5.x" >&2;} { (exit 1); exit 1; }; } fi else @@ -3193,10 +4384,10 @@ case "$build_os" in _os=SunOS # Extract the first word of "gtar", so it can be a program name with args. set dummy gtar; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_GNUTAR+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $GNUTAR in [\\/]* | ?:[\\/]*) @@ -3210,54 +4401,55 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GNUTAR="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi GNUTAR=$ac_cv_path_GNUTAR - if test -n "$GNUTAR"; then - echo "$as_me:$LINENO: result: $GNUTAR" >&5 -echo "${ECHO_T}$GNUTAR" >&6 + { $as_echo "$as_me:$LINENO: result: $GNUTAR" >&5 +$as_echo "$GNUTAR" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + if test -z "$GNUTAR"; then - { { echo "$as_me:$LINENO: error: gtar (gnu tar) not found but needed. Install it (SUN Freeware package)." >&5 -echo "$as_me: error: gtar (gnu tar) not found but needed. Install it (SUN Freeware package)." >&2;} + { { $as_echo "$as_me:$LINENO: error: gtar (gnu tar) not found but needed. Install it (SUN Freeware package)." >&5 +$as_echo "$as_me: error: gtar (gnu tar) not found but needed. Install it (SUN Freeware package)." >&2;} { (exit 1); exit 1; }; } fi - echo "$as_me:$LINENO: checking the Solaris operating system release" >&5 -echo $ECHO_N "checking the Solaris operating system release... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking the Solaris operating system release" >&5 +$as_echo_n "checking the Solaris operating system release... " >&6; } _os_release=`echo $build_os | $SED -e s/solaris2\.//` if test "$_os_release" -lt "6"; then - { { echo "$as_me:$LINENO: error: use solaris >= 6 to build OpenOffice.org" >&5 -echo "$as_me: error: use solaris >= 6 to build OpenOffice.org" >&2;} + { { $as_echo "$as_me:$LINENO: error: use solaris >= 6 to build OpenOffice.org" >&5 +$as_echo "$as_me: error: use solaris >= 6 to build OpenOffice.org" >&2;} { (exit 1); exit 1; }; } else - echo "$as_me:$LINENO: result: ok ($_os_release)" >&5 -echo "${ECHO_T}ok ($_os_release)" >&6 + { $as_echo "$as_me:$LINENO: result: ok ($_os_release)" >&5 +$as_echo "ok ($_os_release)" >&6; } fi - echo "$as_me:$LINENO: checking the processor type" >&5 -echo $ECHO_N "checking the processor type... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking the processor type" >&5 +$as_echo_n "checking the processor type... " >&6; } if test "$build_cpu" = "sparc" -o "$build_cpu" = "i386"; then - echo "$as_me:$LINENO: result: ok ($build_cpu)" >&5 -echo "${ECHO_T}ok ($build_cpu)" >&6 + { $as_echo "$as_me:$LINENO: result: ok ($build_cpu)" >&5 +$as_echo "ok ($build_cpu)" >&6; } else - { { echo "$as_me:$LINENO: error: only sparc and i386 processors are supported" >&5 -echo "$as_me: error: only sparc and i386 processors are supported" >&2;} + { { $as_echo "$as_me:$LINENO: error: only sparc and i386 processors are supported" >&5 +$as_echo "$as_me: error: only sparc and i386 processors are supported" >&2;} { (exit 1); exit 1; }; } fi ;; @@ -3292,8 +4484,8 @@ echo "$as_me: error: only sparc and i386 processors are supported" >&2;} test_freetype=no _os=Darwin if test "$enable_systray" = "yes" && test "$enable_gtk" != "no"; then - { echo "$as_me:$LINENO: WARNING: Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >&5 -echo "$as_me: WARNING: Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >&5 +$as_echo "$as_me: WARNING: Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >&2;} echo "Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >>warn enable_systray=no fi @@ -3314,17 +4506,17 @@ echo "$as_me: WARNING: Disabling gtk-quickstarter - not supported on Mac. Use -- test_cups=yes test_randr=yes test_freetype=yes - echo "$as_me:$LINENO: checking the FreeBSD operating system release" >&5 -echo $ECHO_N "checking the FreeBSD operating system release... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking the FreeBSD operating system release" >&5 +$as_echo_n "checking the FreeBSD operating system release... " >&6; } if test -n "$with_os_version"; then OSVERSION="$with_os_version" else OSVERSION=`/sbin/sysctl -n kern.osreldate` fi - echo "$as_me:$LINENO: result: found OSVERSION=$OSVERSION" >&5 -echo "${ECHO_T}found OSVERSION=$OSVERSION" >&6 - echo "$as_me:$LINENO: checking which thread library to use" >&5 -echo $ECHO_N "checking which thread library to use... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: result: found OSVERSION=$OSVERSION" >&5 +$as_echo "found OSVERSION=$OSVERSION" >&6; } + { $as_echo "$as_me:$LINENO: checking which thread library to use" >&5 +$as_echo_n "checking which thread library to use... " >&6; } if test "$OSVERSION" -lt "500016"; then PTHREAD_CFLAGS="-D_THREAD_SAFE" PTHREAD_LIBS="-pthread" @@ -3335,8 +4527,8 @@ echo $ECHO_N "checking which thread library to use... $ECHO_C" >&6 PTHREAD_CFLAGS="" PTHREAD_LIBS="-pthread" fi - echo "$as_me:$LINENO: result: $PTHREAD_LIBS" >&5 -echo "${ECHO_T}$PTHREAD_LIBS" >&6 + { $as_echo "$as_me:$LINENO: result: $PTHREAD_LIBS" >&5 +$as_echo "$PTHREAD_LIBS" >&6; } _os=FreeBSD ;; osf) @@ -3371,8 +4563,8 @@ echo "${ECHO_T}$PTHREAD_LIBS" >&6 _os=AIX ;; *) - { { echo "$as_me:$LINENO: error: $_os operating system is not suitable to build OpenOffice.org!" >&5 -echo "$as_me: error: $_os operating system is not suitable to build OpenOffice.org!" >&2;} + { { $as_echo "$as_me:$LINENO: error: $_os operating system is not suitable to build OpenOffice.org!" >&5 +$as_echo "$as_me: error: $_os operating system is not suitable to build OpenOffice.org!" >&2;} { (exit 1); exit 1; }; } ;; esac @@ -3381,27 +4573,27 @@ esac -echo "$as_me:$LINENO: checking whether to enable crashdump feature" >&5 -echo $ECHO_N "checking whether to enable crashdump feature... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to enable crashdump feature" >&5 +$as_echo_n "checking whether to enable crashdump feature... " >&6; } if test "$enable_crashdump" = "yes" -o "$enable_crashdump" = "TRUE"; then ENABLE_CRASHDUMP="TRUE" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } BUILD_TYPE="$BUILD_TYPE CRASHREP" else if test "$enable_crashdump" = "STATIC"; then ENABLE_CRASHDUMP="STATIC" - echo "$as_me:$LINENO: result: yes, STATIC" >&5 -echo "${ECHO_T}yes, STATIC" >&6 + { $as_echo "$as_me:$LINENO: result: yes, STATIC" >&5 +$as_echo "yes, STATIC" >&6; } BUILD_TYPE="$BUILD_TYPE CRASHREP" else if test "$enable_crashdump" = "" -o "$enable_crashdump" = "no"; then ENABLE_CRASHDUMP="" - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } else - { { echo "$as_me:$LINENO: error: --enable-crashdump only accepts yes, no, TRUE or STATIC as parameter." >&5 -echo "$as_me: error: --enable-crashdump only accepts yes, no, TRUE or STATIC as parameter." >&2;} + { { $as_echo "$as_me:$LINENO: error: --enable-crashdump only accepts yes, no, TRUE or STATIC as parameter." >&5 +$as_echo "$as_me: error: --enable-crashdump only accepts yes, no, TRUE or STATIC as parameter." >&2;} { (exit 1); exit 1; }; } fi fi @@ -3413,89 +4605,89 @@ if test "$_os" = "WINNT"; then fi if test "$_os" = "WINNT"; then - echo "$as_me:$LINENO: checking whether to use the standard non-optimizing compiler" >&5 -echo $ECHO_N "checking whether to use the standard non-optimizing compiler... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking whether to use the standard non-optimizing compiler" >&5 +$as_echo_n "checking whether to use the standard non-optimizing compiler... " >&6; } if test "$enable_cl_standard" = "" -o "$enable_cl_standard" = "no"; then VC_STANDARD="" - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } else VC_STANDARD="TRUE" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } fi fi -echo "$as_me:$LINENO: checking whether to turn warnings to errors" >&5 -echo $ECHO_N "checking whether to turn warnings to errors... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to turn warnings to errors" >&5 +$as_echo_n "checking whether to turn warnings to errors... " >&6; } if test -n "$enable_werror" && test "$enable_werror" != "no"; then ENABLE_WERROR="TRUE" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - { echo "$as_me:$LINENO: WARNING: Turning warnings to errors has no effect in modules or" >&5 -echo "$as_me: WARNING: Turning warnings to errors has no effect in modules or" >&2;} - { echo "$as_me:$LINENO: WARNING: on platforms where it has been disabled explicitely" >&5 -echo "$as_me: WARNING: on platforms where it has been disabled explicitely" >&2;} + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + { $as_echo "$as_me:$LINENO: WARNING: Turning warnings to errors has no effect in modules or" >&5 +$as_echo "$as_me: WARNING: Turning warnings to errors has no effect in modules or" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: on platforms where it has been disabled explicitely" >&5 +$as_echo "$as_me: WARNING: on platforms where it has been disabled explicitely" >&2;} echo "Turning warnings to errors has no effect in modules or on platforms where it has been disabled explicitely" >> warn else ENABLE_WERROR="FALSE" - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi -echo "$as_me:$LINENO: checking whether to do a debug build" >&5 -echo $ECHO_N "checking whether to do a debug build... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to do a debug build" >&5 +$as_echo_n "checking whether to do a debug build... " >&6; } if test -n "$enable_debug" && test "$enable_debug" != "no"; then ENABLE_DEBUG="TRUE" if test -z "$enable_symbols"; then enable_symbols="yes" fi - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else ENABLE_DEBUG="FALSE" - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi -echo "$as_me:$LINENO: checking whether to build with additional debug utilities" >&5 -echo $ECHO_N "checking whether to build with additional debug utilities... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to build with additional debug utilities" >&5 +$as_echo_n "checking whether to build with additional debug utilities... " >&6; } if test -n "$enable_dbgutil" && test "$enable_dbgutil" != "no"; then PROEXT="" PRODUCT="" PROFULLSWITCH="" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else PRODUCT="full" PROFULLSWITCH="product=full" PROEXT=".pro" - echo "$as_me:$LINENO: result: no, full product build" >&5 -echo "${ECHO_T}no, full product build" >&6 + { $as_echo "$as_me:$LINENO: result: no, full product build" >&5 +$as_echo "no, full product build" >&6; } fi -echo "$as_me:$LINENO: checking whether to include symbols into final build" >&5 -echo $ECHO_N "checking whether to include symbols into final build... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to include symbols into final build" >&5 +$as_echo_n "checking whether to include symbols into final build... " >&6; } if test -n "$enable_symbols" && test "$enable_symbols" != "no"; then if test "$enable_symbols" = "yes" -o "$enable_symbols" = "TRUE"; then ENABLE_SYMBOLS="TRUE" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else if test "$enable_symbols" = "SMALL" -o "$enable_symbols" = "small"; then ENABLE_SYMBOLS="SMALL" - echo "$as_me:$LINENO: result: yes, small ones" >&5 -echo "${ECHO_T}yes, small ones" >&6 + { $as_echo "$as_me:$LINENO: result: yes, small ones" >&5 +$as_echo "yes, small ones" >&6; } else if test "$enable_symbols" != "no" ; then echo enable symbols is: $enable_symbols - { { echo "$as_me:$LINENO: error: --enable-symbols only accepts yes, TRUE or SMALL as parameter." >&5 -echo "$as_me: error: --enable-symbols only accepts yes, TRUE or SMALL as parameter." >&2;} + { { $as_echo "$as_me:$LINENO: error: --enable-symbols only accepts yes, TRUE or SMALL as parameter." >&5 +$as_echo "$as_me: error: --enable-symbols only accepts yes, TRUE or SMALL as parameter." >&2;} { (exit 1); exit 1; }; } else ENABLE_SYMBOLS= @@ -3504,21 +4696,21 @@ echo "$as_me: error: --enable-symbols only accepts yes, TRUE or SMALL as paramet fi else ENABLE_SYMBOLS= - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi -echo "$as_me:$LINENO: checking whether to strip the solver or not." >&5 -echo $ECHO_N "checking whether to strip the solver or not.... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to strip the solver or not." >&5 +$as_echo_n "checking whether to strip the solver or not.... " >&6; } if test -n "$enable_strip_solver"; then if test "$enable_strip_solver" = "yes"; then DISABLE_STRIP= else if test "$enable_strip_solver" = "no"; then DISABLE_STRIP="TRUE" else - { { echo "$as_me:$LINENO: error: --disable-strip-solver only accepts yes or no as parameter." >&5 -echo "$as_me: error: --disable-strip-solver only accepts yes or no as parameter." >&2;} + { { $as_echo "$as_me:$LINENO: error: --disable-strip-solver only accepts yes or no as parameter." >&5 +$as_echo "$as_me: error: --disable-strip-solver only accepts yes or no as parameter." >&2;} { (exit 1); exit 1; }; } fi fi @@ -3531,151 +4723,151 @@ else fi -echo "$as_me:$LINENO: checking whether to enable native CUPS support" >&5 -echo $ECHO_N "checking whether to enable native CUPS support... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to enable native CUPS support" >&5 +$as_echo_n "checking whether to enable native CUPS support... " >&6; } if test "$test_cups" = "yes" -a \( "$enable_cups" = "yes" -o "$enable_cups" = "TRUE" \) ; then ENABLE_CUPS="TRUE" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else ENABLE_CUPS="" - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi -echo "$as_me:$LINENO: checking whether to enable fontconfig support" >&5 -echo $ECHO_N "checking whether to enable fontconfig support... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to enable fontconfig support" >&5 +$as_echo_n "checking whether to enable fontconfig support... " >&6; } if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a \( "$enable_fontconfig" = "yes" -o "$enable_fontconfig" = "TRUE" \); then ENABLE_FONTCONFIG="TRUE" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else ENABLE_FONTCONFIG="" - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi -echo "$as_me:$LINENO: checking whether to enable filters for legacy binary file formats (StarOffice 5.2)" >&5 -echo $ECHO_N "checking whether to enable filters for legacy binary file formats (StarOffice 5.2)... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to enable filters for legacy binary file formats (StarOffice 5.2)" >&5 +$as_echo_n "checking whether to enable filters for legacy binary file formats (StarOffice 5.2)... " >&6; } if test "$enable_binfilter" = "no"; then WITH_BINFILTER="NO" - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } else WITH_BINFILTER="YES" BUILD_TYPE="$BUILD_TYPE BINFILTER" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } fi if test "$_os" = "WINNT"; then - echo "$as_me:$LINENO: checking whether to use DirectX" >&5 -echo $ECHO_N "checking whether to use DirectX... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking whether to use DirectX" >&5 +$as_echo_n "checking whether to use DirectX... " >&6; } if test "$enable_directx" = "yes" -o "$enable_directx" = "TRUE" -o "$enable_directx" = ""; then ENABLE_DIRECTX="TRUE" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else ENABLE_DIRECTX="" - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi - echo "$as_me:$LINENO: checking whether to use ActiveX" >&5 -echo $ECHO_N "checking whether to use ActiveX... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking whether to use ActiveX" >&5 +$as_echo_n "checking whether to use ActiveX... " >&6; } if test "$enable_activex" = "yes" -o "$enable_activex" = "TRUE" -o "$enable_activex" = ""; then DISABLE_ACTIVEX="" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else DISABLE_ACTIVEX="TRUE" - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi - echo "$as_me:$LINENO: checking whether to use ATL" >&5 -echo $ECHO_N "checking whether to use ATL... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking whether to use ATL" >&5 +$as_echo_n "checking whether to use ATL... " >&6; } if test "$enable_atl" = "yes" -o "$enable_atl" = "TRUE" -o "$enable_atl" = ""; then DISABLE_ATL="" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else DISABLE_ATL="TRUE" - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi fi -echo "$as_me:$LINENO: checking whether to use RPATH in shared libraries" >&5 -echo $ECHO_N "checking whether to use RPATH in shared libraries... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to use RPATH in shared libraries" >&5 +$as_echo_n "checking whether to use RPATH in shared libraries... " >&6; } if test "$enable_rpath" = "no"; then ENABLE_RPATH="no" else ENABLE_RPATH="yes" fi -echo "$as_me:$LINENO: result: $ENABLE_RPATH" >&5 -echo "${ECHO_T}$ENABLE_RPATH" >&6 +{ $as_echo "$as_me:$LINENO: result: $ENABLE_RPATH" >&5 +$as_echo "$ENABLE_RPATH" >&6; } -echo "$as_me:$LINENO: checking whether to include MySpell dictionaries" >&5 -echo $ECHO_N "checking whether to include MySpell dictionaries... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to include MySpell dictionaries" >&5 +$as_echo_n "checking whether to include MySpell dictionaries... " >&6; } if test -z "$with_myspell_dicts" || test "$with_myspell_dicts" = "yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } WITH_MYSPELL_DICTS=YES BUILD_TYPE="$BUILD_TYPE DICTIONARIES" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } WITH_MYSPELL_DICTS=NO fi if test "$WITH_MYSPELL_DICTS" = "NO"; then - echo "$as_me:$LINENO: checking whether to use dicts from external paths" >&5 -echo $ECHO_N "checking whether to use dicts from external paths... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking whether to use dicts from external paths" >&5 +$as_echo_n "checking whether to use dicts from external paths... " >&6; } if test -n "$with_system_dicts" -a "$with_system_dicts" = "yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } SYSTEM_DICTS=YES - echo "$as_me:$LINENO: checking for spelling dictionary directory" >&5 -echo $ECHO_N "checking for spelling dictionary directory... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for spelling dictionary directory" >&5 +$as_echo_n "checking for spelling dictionary directory... " >&6; } if test -n "$with_external_dict_dir"; then DICT_SYSTEM_DIR=file://$with_external_dict_dir else DICT_SYSTEM_DIR=file:///usr/share/hunspell fi - echo "$as_me:$LINENO: result: $DICT_SYSTEM_DIR" >&5 -echo "${ECHO_T}$DICT_SYSTEM_DIR" >&6 - echo "$as_me:$LINENO: checking for hyphenation patterns directory" >&5 -echo $ECHO_N "checking for hyphenation patterns directory... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: result: $DICT_SYSTEM_DIR" >&5 +$as_echo "$DICT_SYSTEM_DIR" >&6; } + { $as_echo "$as_me:$LINENO: checking for hyphenation patterns directory" >&5 +$as_echo_n "checking for hyphenation patterns directory... " >&6; } if test -n "$with_external_hyph_dir"; then HYPH_SYSTEM_DIR=file://$with_external_hyph_dir else HYPH_SYSTEM_DIR=file:///usr/share/hyphen fi - echo "$as_me:$LINENO: result: $HYPH_SYSTEM_DIR" >&5 -echo "${ECHO_T}$HYPH_SYSTEM_DIR" >&6 - echo "$as_me:$LINENO: checking for thesaurus directory" >&5 -echo $ECHO_N "checking for thesaurus directory... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: result: $HYPH_SYSTEM_DIR" >&5 +$as_echo "$HYPH_SYSTEM_DIR" >&6; } + { $as_echo "$as_me:$LINENO: checking for thesaurus directory" >&5 +$as_echo_n "checking for thesaurus directory... " >&6; } if test -n "$with_external_thes_dir"; then THES_SYSTEM_DIR=file://$with_external_thes_dir else THES_SYSTEM_DIR=file:///usr/share/mythes fi - echo "$as_me:$LINENO: result: $THES_SYSTEM_DIR" >&5 -echo "${ECHO_T}$THES_SYSTEM_DIR" >&6 + { $as_echo "$as_me:$LINENO: result: $THES_SYSTEM_DIR" >&5 +$as_echo "$THES_SYSTEM_DIR" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } SYSTEM_DICTS=NO fi fi @@ -3684,19 +4876,19 @@ fi -echo "$as_me:$LINENO: checking which shell to use" >&5 -echo $ECHO_N "checking which shell to use... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking which shell to use" >&5 +$as_echo_n "checking which shell to use... " >&6; } if test $_os = "WINNT"; then if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "bash" -a "$with_use_shell" != "4nt"; then - { { echo "$as_me:$LINENO: error: only \"tcsh\",\"bash\" or \"4nt\" are supported options" >&5 -echo "$as_me: error: only \"tcsh\",\"bash\" or \"4nt\" are supported options" >&2;} + { { $as_echo "$as_me:$LINENO: error: only \"tcsh\",\"bash\" or \"4nt\" are supported options" >&5 +$as_echo "$as_me: error: only \"tcsh\",\"bash\" or \"4nt\" are supported options" >&2;} { (exit 1); exit 1; }; } fi if test -L $AWK -o -L `which awk` -o -L `which tar` -o -L `which gunzip` ; then - { { echo "$as_me:$LINENO: error: $AWK, awk, tar or gunzip is a cygwin symlink! + { { $as_echo "$as_me:$LINENO: error: $AWK, awk, tar or gunzip is a cygwin symlink! Native windows programs cannot use cygwin symlinks. Remove the symbolic link, and copy the program to the name of the link." >&5 -echo "$as_me: error: $AWK, awk, tar or gunzip is a cygwin symlink! +$as_echo "$as_me: error: $AWK, awk, tar or gunzip is a cygwin symlink! Native windows programs cannot use cygwin symlinks. Remove the symbolic link, and copy the program to the name of the link." >&2;} { (exit 1); exit 1; }; } @@ -3719,32 +4911,32 @@ link, and copy the program to the name of the link." >&2;} fi elif test $_os = "OS2"; then if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "4nt"; then - { { echo "$as_me:$LINENO: error: only \"tcsh\" or \"4nt\" are supported options" >&5 -echo "$as_me: error: only \"tcsh\" or \"4nt\" are supported options" >&2;} + { { $as_echo "$as_me:$LINENO: error: only \"tcsh\" or \"4nt\" are supported options" >&5 +$as_echo "$as_me: error: only \"tcsh\" or \"4nt\" are supported options" >&2;} { (exit 1); exit 1; }; } fi else if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "bash"; then - { { echo "$as_me:$LINENO: error: only \"tcsh\" or \"bash\" are supported options" >&5 -echo "$as_me: error: only \"tcsh\" or \"bash\" are supported options" >&2;} + { { $as_echo "$as_me:$LINENO: error: only \"tcsh\" or \"bash\" are supported options" >&5 +$as_echo "$as_me: error: only \"tcsh\" or \"bash\" are supported options" >&2;} { (exit 1); exit 1; }; } fi fi USE_SHELL="$with_use_shell" -echo "$as_me:$LINENO: result: $USE_SHELL" >&5 -echo "${ECHO_T}$USE_SHELL" >&6 +{ $as_echo "$as_me:$LINENO: result: $USE_SHELL" >&5 +$as_echo "$USE_SHELL" >&6; } if test "$_os" = "WINNT" -a "$with_use_shell" != "4nt" ; then - echo "$as_me:$LINENO: checking for cygwin gcc/g++" >&5 -echo $ECHO_N "checking for cygwin gcc/g++... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for cygwin gcc/g++" >&5 +$as_echo_n "checking for cygwin gcc/g++... " >&6; } if which gcc > /dev/null && which g++ > /dev/null ; then - echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6 + { $as_echo "$as_me:$LINENO: result: found" >&5 +$as_echo "found" >&6; } else - { { echo "$as_me:$LINENO: error: cygwin gcc and g++ are needed, please install them." >&5 -echo "$as_me: error: cygwin gcc and g++ are needed, please install them." >&2;} + { { $as_echo "$as_me:$LINENO: error: cygwin gcc and g++ are needed, please install them." >&5 +$as_echo "$as_me: error: cygwin gcc and g++ are needed, please install them." >&2;} { (exit 1); exit 1; }; } fi fi @@ -3753,10 +4945,10 @@ fi if test "$with_use_shell" = "tcsh"; then # Extract the first word of "tcsh", so it can be a program name with args. set dummy tcsh; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_SHELLPATH+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $SHELLPATH in [\\/]* | ?:[\\/]*) @@ -3769,30 +4961,31 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_SHELLPATH="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi SHELLPATH=$ac_cv_path_SHELLPATH - if test -n "$SHELLPATH"; then - echo "$as_me:$LINENO: result: $SHELLPATH" >&5 -echo "${ECHO_T}$SHELLPATH" >&6 + { $as_echo "$as_me:$LINENO: result: $SHELLPATH" >&5 +$as_echo "$SHELLPATH" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + if test -z "$SHELLPATH"; then - { { echo "$as_me:$LINENO: error: tcsh not found in \$PATH" >&5 -echo "$as_me: error: tcsh not found in \$PATH" >&2;} + { { $as_echo "$as_me:$LINENO: error: tcsh not found in \$PATH" >&5 +$as_echo "$as_me: error: tcsh not found in \$PATH" >&2;} { (exit 1); exit 1; }; } else SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/tcsh$//p"` @@ -3800,10 +4993,10 @@ echo "$as_me: error: tcsh not found in \$PATH" >&2;} elif test "$with_use_shell" = "bash"; then # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_SHELLPATH+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $SHELLPATH in [\\/]* | ?:[\\/]*) @@ -3816,50 +5009,51 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_SHELLPATH="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi SHELLPATH=$ac_cv_path_SHELLPATH - if test -n "$SHELLPATH"; then - echo "$as_me:$LINENO: result: $SHELLPATH" >&5 -echo "${ECHO_T}$SHELLPATH" >&6 + { $as_echo "$as_me:$LINENO: result: $SHELLPATH" >&5 +$as_echo "$SHELLPATH" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + if test -z "$SHELLPATH"; then - { { echo "$as_me:$LINENO: error: bash not found in \$PATH" >&5 -echo "$as_me: error: bash not found in \$PATH" >&2;} + { { $as_echo "$as_me:$LINENO: error: bash not found in \$PATH" >&5 +$as_echo "$as_me: error: bash not found in \$PATH" >&2;} { (exit 1); exit 1; }; } else SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/bash$//p"` fi else - { echo "$as_me:$LINENO: WARNING: Windows/OS/2 4NT builds don't test for the shell" >&5 -echo "$as_me: WARNING: Windows/OS/2 4NT builds don't test for the shell" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: Windows/OS/2 4NT builds don't test for the shell" >&5 +$as_echo "$as_me: WARNING: Windows/OS/2 4NT builds don't test for the shell" >&2;} SHELLPATH="NO_SHELLPATH_NEEDED" fi -echo "$as_me:$LINENO: checking gcc home" >&5 -echo $ECHO_N "checking gcc home... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking gcc home" >&5 +$as_echo_n "checking gcc home... " >&6; } if test -z "$with_gcc_home"; then GCC_HOME=`which gcc | $SED -e s,/bin/gcc,,` else GCC_HOME="$with_gcc_home" fi -echo "$as_me:$LINENO: result: $GCC_HOME" >&5 -echo "${ECHO_T}$GCC_HOME" >&6 +{ $as_echo "$as_me:$LINENO: result: $GCC_HOME" >&5 +$as_echo "$GCC_HOME" >&6; } if test -n "$with_gcc_home"; then @@ -3877,10 +5071,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -3891,34 +5085,36 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -3929,38 +5125,49 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + 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_CC="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_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_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi - CC=$ac_ct_CC + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi else CC="$ac_cv_prog_CC" fi if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -3971,76 +5178,36 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; 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_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi - CC=$ac_ct_CC -else - CC="$ac_cv_prog_CC" -fi + fi fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -4052,17 +5219,18 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS if test $ac_prog_rejected = yes; then # We found a bogon in the path, so make sure we never use it. @@ -4080,24 +5248,25 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test -z "$CC"; then if test -n "$ac_tool_prefix"; then - for ac_prog in cl + for ac_prog in cl.exe do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -4108,38 +5277,40 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + test -n "$CC" && break done fi if test -z "$CC"; then ac_ct_CC=$CC - for ac_prog in cl + for ac_prog in cl.exe do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -4150,62 +5321,93 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + 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_CC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_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_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + test -n "$ac_ct_CC" && break done - CC=$ac_ct_CC + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi fi fi -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH See \`config.log' for more details." >&5 -echo "$as_me: error: no acceptable C compiler found in \$PATH +$as_echo "$as_me: error: no acceptable C compiler found in \$PATH See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } # Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 +$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4221,111 +5423,150 @@ main () } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe b.out" +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:$LINENO: checking for C compiler default output" >&5 -echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 - (eval $ac_link_default) 2>&5 +{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + +# The possible output files: +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" + +ac_rmfiles= +for ac_file in $ac_files +do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac +done +rm -f $ac_rmfiles + +if { (ac_try="$ac_link_default" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link_default") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - # Find the output, starting from the most likely. This scheme is -# not robust to junk in `.', hence go to wildcards (a.*) only as a last -# resort. - -# Be careful to initialize this variable, since it used to be cached. -# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. -ac_cv_exeext= -# b.out is created by i960 compilers. -for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +# in a Makefile. We should not override ac_cv_exeext if it was cached, +# so that the user can short-circuit this test for compilers unknown to +# Autoconf. +for ac_file in $ac_files '' do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) - ;; - conftest.$ac_ext ) - # This is the source file. - ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) + ;; [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; + # We found the default executable, but exeext='' is most + # certainly right. + break;; *.* ) - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool, - # but it would be cool to find out if it's true. Does anybody - # maintain Libtool? --akim. - export ac_cv_exeext - break;; + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi + # We set ac_cv_exeext here because the later test for it is not + # safe: cross compilers may not add the suffix if given an `-o' + # argument, so we may need to know it at that point already. + # Even if this section looks crufty: it has the advantage of + # actually working. + break;; * ) - break;; + break;; esac done +test "$ac_cv_exeext" = no && ac_cv_exeext= + else - echo "$as_me: failed program was:" >&5 + ac_file='' +fi + +{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } +if test -z "$ac_file"; then + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables +{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables See \`config.log' for more details." >&5 -echo "$as_me: error: C compiler cannot create executables +$as_echo "$as_me: error: C compiler cannot create executables See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } + { (exit 77); exit 77; }; }; } fi ac_exeext=$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6 -# Check the compiler produces executables we can run. If not, either +# Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:$LINENO: error: cannot run C compiled programs. + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'. See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run C compiled programs. +$as_echo "$as_me: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'. See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } fi fi fi -echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +{ $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } -rm -f a.out a.exe conftest$ac_cv_exeext b.out +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -# Check the compiler produces executables we can run. If not, either +# Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6 - -echo "$as_me:$LINENO: checking for suffix of executables" >&5 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + +{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 +$as_echo_n "checking for suffix of executables... " >&6; } +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will @@ -4334,35 +5575,35 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - export ac_cv_exeext - break;; + break;; * ) break;; esac done else - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } fi rm -f conftest$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +$as_echo "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:$LINENO: checking for suffix of object files" >&5 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 +$as_echo_n "checking for suffix of object files... " >&6; } if test "${ac_cv_objext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4378,42 +5619,50 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac done else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of object files: cannot compile +$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +$as_echo "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 +{ $as_echo "$as_me:$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 test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4432,41 +5681,93 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_compiler_gnu=no + ac_compiler_gnu=no fi -rm -f conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 -GCC=`test $ac_compiler_gnu = yes && echo yes` +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -CFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + 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 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + CFLAGS="" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4482,28 +5783,82 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + 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 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_prog_cc_g=no + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then @@ -4519,15 +5874,14 @@ else CFLAGS= fi fi -echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if test "${ac_cv_prog_cc_c89+set}" = set; then + $as_echo_n "(cached) " >&6 else - ac_cv_prog_cc_stdc=no + ac_cv_prog_cc_c89=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4555,6 +5909,21 @@ static char *f (char * (*g) (char **, int), char **p, ...) va_end (v); return s; } + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + int test (int i, double x); struct s1 {int (*f) (int a);}; struct s2 {int (*f) (double a);}; @@ -4569,168 +5938,58 @@ return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; return 0; } _ACEOF -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX 10.20 and later -Ae -# HP-UX older versions -Aa -D_HPUX_SOURCE -# SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_prog_cc_stdc=$ac_arg -break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_c89=$ac_arg +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.$ac_objext + +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break done -rm -f conftest.$ac_ext conftest.$ac_objext +rm -f conftest.$ac_ext CC=$ac_save_CC fi - -case "x$ac_cv_prog_cc_stdc" in - x|xno) - echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6 ;; +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { $as_echo "$as_me:$LINENO: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:$LINENO: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; *) - echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 - CC="$CC $ac_cv_prog_cc_stdc" ;; + CC="$CC $ac_cv_prog_cc_c89" + { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac -# Some people use a C++ compiler to compile C. Since we use `exit', -# in C++ we need to declare it. In case someone uses the same compiler -# for both compiling C and C++ we need to have the C++ compiler decide -# the declaration of exit, since it's the most demanding environment. -cat >conftest.$ac_ext <<_ACEOF -#ifndef __cplusplus - choke me -#endif -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - for ac_declaration in \ - ''\ - '#include ' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -continue -fi -rm -f conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.$ac_objext conftest.$ac_ext -done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -fi -rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -4745,10 +6004,10 @@ if test "$COMPATH" = "." ; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_COMPATH+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $COMPATH in [\\/]* | ?:[\\/]*) @@ -4761,27 +6020,28 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_COMPATH="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi COMPATH=$ac_cv_path_COMPATH - if test -n "$COMPATH"; then - echo "$as_me:$LINENO: result: $COMPATH" >&5 -echo "${ECHO_T}$COMPATH" >&6 + { $as_echo "$as_me:$LINENO: result: $COMPATH" >&5 +$as_echo "$COMPATH" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + test -n "$COMPATH" && break done @@ -4790,51 +6050,50 @@ fi GCCVER=20995 if test \( "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes" \) -a "$GCC" = "yes"; then - echo "$as_me:$LINENO: checking the GNU gcc compiler version" >&5 -echo $ECHO_N "checking the GNU gcc compiler version... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking the GNU gcc compiler version" >&5 +$as_echo_n "checking the GNU gcc compiler version... " >&6; } _gcc_version=`$CC -dumpversion` _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` _gcc_longver=`echo $_gcc_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'` GCCVER=`echo $_gcc_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'` if test "$_gcc_major" -lt "3"; then - { { echo "$as_me:$LINENO: error: found version \"$_gcc_version\", use version 3+ of the gcc compiler" >&5 -echo "$as_me: error: found version \"$_gcc_version\", use version 3+ of the gcc compiler" >&2;} + { { $as_echo "$as_me:$LINENO: error: found version \"$_gcc_version\", use version 3+ of the gcc compiler" >&5 +$as_echo "$as_me: error: found version \"$_gcc_version\", use version 3+ of the gcc compiler" >&2;} { (exit 1); exit 1; }; } else if test "$GCCVER" -eq "030203"; then if test "$ENABLE_SYMBOLS" = "SMALL"; then - { { echo "$as_me:$LINENO: error: version \"$_gcc_version\" gives internal error with small." >&5 -echo "$as_me: error: version \"$_gcc_version\" gives internal error with small." >&2;} + { { $as_echo "$as_me:$LINENO: error: version \"$_gcc_version\" gives internal error with small." >&5 +$as_echo "$as_me: error: version \"$_gcc_version\" gives internal error with small." >&2;} { (exit 1); exit 1; }; } fi fi fi - echo "$as_me:$LINENO: result: checked (gcc $_gcc_version)" >&5 -echo "${ECHO_T}checked (gcc $_gcc_version)" >&6 + { $as_echo "$as_me:$LINENO: result: checked (gcc $_gcc_version)" >&5 +$as_echo "checked (gcc $_gcc_version)" >&6; } if test "$_os" = "SunOS"; then - echo "$as_me:$LINENO: checking gcc linker" >&5 -echo $ECHO_N "checking gcc linker... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking gcc linker" >&5 +$as_echo_n "checking gcc linker... " >&6; } if $CC -Wl,--version 2>&1 |head -n 1| grep -v GNU > /dev/null;then - { { echo "$as_me:$LINENO: error: failed (not GNU ld). Use GNU ld instead of Sun ld on Solaris" >&5 -echo "$as_me: error: failed (not GNU ld). Use GNU ld instead of Sun ld on Solaris" >&2;} + { { $as_echo "$as_me:$LINENO: error: failed (not GNU ld). Use GNU ld instead of Sun ld on Solaris" >&5 +$as_echo "$as_me: error: failed (not GNU ld). Use GNU ld instead of Sun ld on Solaris" >&2;} { (exit 1); exit 1; }; } fi - echo "$as_me:$LINENO: result: ok (GNU ld)" >&5 -echo "${ECHO_T}ok (GNU ld)" >&6 + { $as_echo "$as_me:$LINENO: result: ok (GNU ld)" >&5 +$as_echo "ok (GNU ld)" >&6; } fi fi HAVE_LD_BSYMBOLIC_FUNCTIONS= if test "$GCC" = "yes"; then - echo "$as_me:$LINENO: checking for -Bsymbolic-functions linker support " >&5 -echo $ECHO_N "checking for -Bsymbolic-functions linker support ... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for -Bsymbolic-functions linker support " >&5 +$as_echo_n "checking for -Bsymbolic-functions linker support ... " >&6; } bsymbolic_functions_ldflags_save=$LDFLAGS LDFLAGS="$LDFLAGS -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4854,73 +6113,86 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then HAVE_LD_BSYMBOLIC_FUNCTIONS=TRUE else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext if test "z$HAVE_LD_BSYMBOLIC_FUNCTIONS" = "zTRUE"; then - echo "$as_me:$LINENO: result: found " >&5 -echo "${ECHO_T}found " >&6 + { $as_echo "$as_me:$LINENO: result: found " >&5 +$as_echo "found " >&6; } else - echo "$as_me:$LINENO: result: not found " >&5 -echo "${ECHO_T}not found " >&6 + { $as_echo "$as_me:$LINENO: result: not found " >&5 +$as_echo "not found " >&6; } fi LDFLAGS=$bsymbolic_functions_ldflags_save fi -echo "$as_me:$LINENO: checking whether to enable pch feature" >&5 -echo $ECHO_N "checking whether to enable pch feature... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to enable pch feature" >&5 +$as_echo_n "checking whether to enable pch feature... " >&6; } if test -n "$enable_pch" && test "$enable_pch" != "no"; then if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then ENABLE_PCH="TRUE" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } elif test "$GCC" = "yes" -a "$GCCVER" -gt "030400"; then ENABLE_PCH="TRUE" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else ENABLE_PCH="" - { echo "$as_me:$LINENO: WARNING: Precompiled header not yet supported for your platform/compiler" >&5 -echo "$as_me: WARNING: Precompiled header not yet supported for your platform/compiler" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: Precompiled header not yet supported for your platform/compiler" >&5 +$as_echo "$as_me: WARNING: Precompiled header not yet supported for your platform/compiler" >&2;} fi else ENABLE_PCH="" - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi -echo "$as_me:$LINENO: checking whether to enable hid list feature" >&5 -echo $ECHO_N "checking whether to enable hid list feature... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to enable hid list feature" >&5 +$as_echo_n "checking whether to enable hid list feature... " >&6; } if test -n "$enable_hids" && test "$enable_hids" != "no"; then NO_HIDS="" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else NO_HIDS="TRUE" - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi -echo "$as_me:$LINENO: checking for GNU make" >&5 -echo $ECHO_N "checking for GNU make... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for GNU make" >&5 +$as_echo_n "checking for GNU make... " >&6; } for a in "$MAKE" $GNUMAKE make gmake gnumake; do $a --version 2> /dev/null | grep GNU 2>&1 > /dev/null if test $? -eq 0; then @@ -4928,40 +6200,40 @@ for a in "$MAKE" $GNUMAKE make gmake gnumake; do break fi done -echo "$as_me:$LINENO: result: $GNUMAKE" >&5 -echo "${ECHO_T}$GNUMAKE" >&6 +{ $as_echo "$as_me:$LINENO: result: $GNUMAKE" >&5 +$as_echo "$GNUMAKE" >&6; } if test -z "$GNUMAKE"; then - { { echo "$as_me:$LINENO: error: not found. install GNU make." >&5 -echo "$as_me: error: not found. install GNU make." >&2;} + { { $as_echo "$as_me:$LINENO: error: not found. install GNU make." >&5 +$as_echo "$as_me: error: not found. install GNU make." >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:$LINENO: checking the GNU make version" >&5 -echo $ECHO_N "checking the GNU make version... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking the GNU make version" >&5 +$as_echo_n "checking the GNU make version... " >&6; } _make_version=`$GNUMAKE --version | grep GNU | $SED -e 's@^[^0-9]*@@' -e 's@ .*@@' -e 's@,.*@@'`; _make_longver=`echo $_make_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'` if test "$_make_longver" -ge "037901" ; then - echo "$as_me:$LINENO: result: $GNUMAKE $_make_version" >&5 -echo "${ECHO_T}$GNUMAKE $_make_version" >&6 + { $as_echo "$as_me:$LINENO: result: $GNUMAKE $_make_version" >&5 +$as_echo "$GNUMAKE $_make_version" >&6; } else if test "$_os" = "Darwin"; then if test "$_make_longver" -ge "037900" ; then - echo "$as_me:$LINENO: result: $GNUMAKE $_make_version" >&5 -echo "${ECHO_T}$GNUMAKE $_make_version" >&6 + { $as_echo "$as_me:$LINENO: result: $GNUMAKE $_make_version" >&5 +$as_echo "$GNUMAKE $_make_version" >&6; } else - { echo "$as_me:$LINENO: WARNING: failed ($GNUMAKE $_make_version need 3.79.0+)" >&5 -echo "$as_me: WARNING: failed ($GNUMAKE $_make_version need 3.79.0+)" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: failed ($GNUMAKE $_make_version need 3.79.0+)" >&5 +$as_echo "$as_me: WARNING: failed ($GNUMAKE $_make_version need 3.79.0+)" >&2;} fi else - { { echo "$as_me:$LINENO: error: failed ($GNUMAKE $_make_version need 3.79.1+)" >&5 -echo "$as_me: error: failed ($GNUMAKE $_make_version need 3.79.1+)" >&2;} + { { $as_echo "$as_me:$LINENO: error: failed ($GNUMAKE $_make_version need 3.79.1+)" >&5 +$as_echo "$as_me: error: failed ($GNUMAKE $_make_version need 3.79.1+)" >&2;} { (exit 1); exit 1; }; } fi fi -echo "$as_me:$LINENO: checking for GNU tar" >&5 -echo $ECHO_N "checking for GNU tar... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for GNU tar" >&5 +$as_echo_n "checking for GNU tar... " >&6; } for a in $GNUTAR gtar gnutar tar; do $a --version 2> /dev/null | grep GNU 2>&1 > /dev/null if test $? -eq 0; then @@ -4969,11 +6241,11 @@ for a in $GNUTAR gtar gnutar tar; do break fi done -echo "$as_me:$LINENO: result: $GNUTAR" >&5 -echo "${ECHO_T}$GNUTAR" >&6 +{ $as_echo "$as_me:$LINENO: result: $GNUTAR" >&5 +$as_echo "$GNUTAR" >&6; } if test -z "$GNUTAR"; then - { { echo "$as_me:$LINENO: error: not found. install GNU tar." >&5 -echo "$as_me: error: not found. install GNU tar." >&2;} + { { $as_echo "$as_me:$LINENO: error: not found. install GNU tar." >&5 +$as_echo "$as_me: error: not found. install GNU tar." >&2;} { (exit 1); exit 1; }; } fi @@ -4985,10 +6257,10 @@ if test "$_os" = "SunOS"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path__cc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $_cc in [\\/]* | ?:[\\/]*) @@ -5001,61 +6273,61 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path__cc="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi _cc=$ac_cv_path__cc - if test -n "$_cc"; then - echo "$as_me:$LINENO: result: $_cc" >&5 -echo "${ECHO_T}$_cc" >&6 + { $as_echo "$as_me:$LINENO: result: $_cc" >&5 +$as_echo "$_cc" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + test -n "$_cc" && break done COMPATH=`echo $_cc | $SED -n "s/\/cc//p"` - echo "$as_me:$LINENO: checking the SunStudio C/C++ compiler version" >&5 -echo $ECHO_N "checking the SunStudio C/C++ compiler version... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking the SunStudio C/C++ compiler version" >&5 +$as_echo_n "checking the SunStudio C/C++ compiler version... " >&6; } _sunstudio_string=`$CC -V 2>&1 | grep '^cc' | sed -e 's/.* C //'` _sunstudio_version=`echo $_sunstudio_string | $AWK '{ print $1 }'` _sunstudio_major=`echo $_sunstudio_version | $AWK -F. '{ print $1 }'` if test "$_sunstudio_major" != "5"; then - { { echo "$as_me:$LINENO: error: found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" >&5 -echo "$as_me: error: found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" >&2;} + { { $as_echo "$as_me:$LINENO: error: found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" >&5 +$as_echo "$as_me: error: found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" >&2;} { (exit 1); exit 1; }; } else _sunstudio_minor=`echo $_sunstudio_version | $AWK -F. '{ if ($2 == 5) print "true"; else if ($2 == 7) print "true"; else if ($2 == 8) print "true"; else if ($2 == 9) print "true"; else print "false" }'` if test "$_sunstudio_minor" = "false"; then - { { echo "$as_me:$LINENO: error: found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" >&5 -echo "$as_me: error: found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" >&2;} + { { $as_echo "$as_me:$LINENO: error: found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" >&5 +$as_echo "$as_me: error: found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" >&2;} { (exit 1); exit 1; }; } else - echo "$as_me:$LINENO: result: checked" >&5 -echo "${ECHO_T}checked" >&6 + { $as_echo "$as_me:$LINENO: result: checked" >&5 +$as_echo "checked" >&6; } fi fi fi fi if test "$GCC" = "yes"; then - echo "$as_me:$LINENO: checking for --hash-style=both linker support " >&5 -echo $ECHO_N "checking for --hash-style=both linker support ... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for --hash-style=both linker support " >&5 +$as_echo_n "checking for --hash-style=both linker support ... " >&6; } hash_style_ldflags_save=$LDFLAGS LDFLAGS="$LDFLAGS -Wl,--hash-style=both" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5075,31 +6347,43 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then HAVE_LD_HASH_STYLE=TRUE else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -HAVE_LD_HASH_STYLE=FALSE + HAVE_LD_HASH_STYLE=FALSE fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext if test "z$HAVE_LD_HASH_STYLE" = "zTRUE"; then - echo "$as_me:$LINENO: result: found " >&5 -echo "${ECHO_T}found " >&6 + { $as_echo "$as_me:$LINENO: result: found " >&5 +$as_echo "found " >&6; } else - echo "$as_me:$LINENO: result: not found " >&5 -echo "${ECHO_T}not found " >&6 + { $as_echo "$as_me:$LINENO: result: not found " >&5 +$as_echo "not found " >&6; } fi LDFLAGS=$hash_style_ldflags_save fi @@ -5111,10 +6395,10 @@ if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path__cc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $_cc in [\\/]* | ?:[\\/]*) @@ -5127,48 +6411,49 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path__cc="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi _cc=$ac_cv_path__cc - if test -n "$_cc"; then - echo "$as_me:$LINENO: result: $_cc" >&5 -echo "${ECHO_T}$_cc" >&6 + { $as_echo "$as_me:$LINENO: result: $_cc" >&5 +$as_echo "$_cc" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + test -n "$_cc" && break done COMPATH=`echo $_cc | $SED -n "s/\/cc//p"` - echo "$as_me:$LINENO: checking the SGI MIPSpro C compiler version" >&5 -echo $ECHO_N "checking the SGI MIPSpro C compiler version... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking the SGI MIPSpro C compiler version" >&5 +$as_echo_n "checking the SGI MIPSpro C compiler version... " >&6; } _mipspro_version=`$CC -version 2>&1 | $AWK '{ print $4 }'` _mipspro_major=`echo $_mipspro_version | $AWK -F. '{ print $1 }'` if test "$_mipspro_major" != "7"; then - { { echo "$as_me:$LINENO: error: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&5 -echo "$as_me: error: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&2;} + { { $as_echo "$as_me:$LINENO: error: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&5 +$as_echo "$as_me: error: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&2;} { (exit 1); exit 1; }; } else _mipspro_minor=`echo $_mipspro_version | $AWK -F. '{ if ($2 <= 1) print "false"; else print "true" }'` if test "$_mipspro_minor" = "false"; then - { { echo "$as_me:$LINENO: error: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&5 -echo "$as_me: error: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&2;} + { { $as_echo "$as_me:$LINENO: error: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&5 +$as_echo "$as_me: error: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&2;} { (exit 1); exit 1; }; } else - echo "$as_me:$LINENO: result: checked" >&5 -echo "${ECHO_T}checked" >&6 + { $as_echo "$as_me:$LINENO: result: checked" >&5 +$as_echo "checked" >&6; } fi fi fi @@ -5180,10 +6465,10 @@ if test "$_os" = "OSF1"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path__cc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $_cc in [\\/]* | ?:[\\/]*) @@ -5196,44 +6481,45 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path__cc="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi _cc=$ac_cv_path__cc - if test -n "$_cc"; then - echo "$as_me:$LINENO: result: $_cc" >&5 -echo "${ECHO_T}$_cc" >&6 + { $as_echo "$as_me:$LINENO: result: $_cc" >&5 +$as_echo "$_cc" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + test -n "$_cc" && break done COMPATH=`echo $_cc | $SED -n "s/\/cc//p"` - { echo "$as_me:$LINENO: WARNING: ******* $_cc , $COMPATH" >&5 -echo "$as_me: WARNING: ******* $_cc , $COMPATH" >&2;} - echo "$as_me:$LINENO: checking the Compaq C compiler version" >&5 -echo $ECHO_N "checking the Compaq C compiler version... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: WARNING: ******* $_cc , $COMPATH" >&5 +$as_echo "$as_me: WARNING: ******* $_cc , $COMPATH" >&2;} + { $as_echo "$as_me:$LINENO: checking the Compaq C compiler version" >&5 +$as_echo_n "checking the Compaq C compiler version... " >&6; } _compaqc_version=`$CC -V 2>&1 | $AWK '{ print $3 }'` _compaqc_major=`echo $_compaqc_version | $AWK -F. '{ print $1 }'` if test "$_compaqc_major" != "T6"; then - { { echo "$as_me:$LINENO: error: found version \"$_compaqc_version\", use version 6 of the Compaq C compiler" >&5 -echo "$as_me: error: found version \"$_compaqc_version\", use version 6 of the Compaq C compiler" >&2;} + { { $as_echo "$as_me:$LINENO: error: found version \"$_compaqc_version\", use version 6 of the Compaq C compiler" >&5 +$as_echo "$as_me: error: found version \"$_compaqc_version\", use version 6 of the Compaq C compiler" >&2;} { (exit 1); exit 1; }; } else - echo "$as_me:$LINENO: result: checked" >&5 -echo "${ECHO_T}checked" >&6 + { $as_echo "$as_me:$LINENO: result: checked" >&5 +$as_echo "checked" >&6; } fi fi fi @@ -5241,10 +6527,10 @@ fi if test -z "$with_perl_home"; then # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_PERL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $PERL in [\\/]* | ?:[\\/]*) @@ -5257,27 +6543,28 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi PERL=$ac_cv_path_PERL - if test -n "$PERL"; then - echo "$as_me:$LINENO: result: $PERL" >&5 -echo "${ECHO_T}$PERL" >&6 + { $as_echo "$as_me:$LINENO: result: $PERL" >&5 +$as_echo "$PERL" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + else if test "$_os" = "WINNT"; then with_perl_home=`cygpath -u "$with_perl_home"` @@ -5286,46 +6573,46 @@ else if test -x "$_perl_path"; then PERL=$_perl_path else - { { echo "$as_me:$LINENO: error: $_perl_path not found" >&5 -echo "$as_me: error: $_perl_path not found" >&2;} + { { $as_echo "$as_me:$LINENO: error: $_perl_path not found" >&5 +$as_echo "$as_me: error: $_perl_path not found" >&2;} { (exit 1); exit 1; }; } fi fi if test "$PERL"; then - echo "$as_me:$LINENO: checking the Perl version" >&5 -echo $ECHO_N "checking the Perl version... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking the Perl version" >&5 +$as_echo_n "checking the Perl version... " >&6; } ${PERL} -e "exit($]);" _perl_version=$? if test "$_perl_version" -lt 5; then - { { echo "$as_me:$LINENO: error: found Perl version \"$_perl_version\", use version 5 of Perl" >&5 -echo "$as_me: error: found Perl version \"$_perl_version\", use version 5 of Perl" >&2;} + { { $as_echo "$as_me:$LINENO: error: found Perl version \"$_perl_version\", use version 5 of Perl" >&5 +$as_echo "$as_me: error: found Perl version \"$_perl_version\", use version 5 of Perl" >&2;} { (exit 1); exit 1; }; } fi - echo "$as_me:$LINENO: result: checked (perl $_perl_version)" >&5 -echo "${ECHO_T}checked (perl $_perl_version)" >&6 + { $as_echo "$as_me:$LINENO: result: checked (perl $_perl_version)" >&5 +$as_echo "checked (perl $_perl_version)" >&6; } else - { { echo "$as_me:$LINENO: error: Perl not found, install version 5 of Perl" >&5 -echo "$as_me: error: Perl not found, install version 5 of Perl" >&2;} + { { $as_echo "$as_me:$LINENO: error: Perl not found, install version 5 of Perl" >&5 +$as_echo "$as_me: error: Perl not found, install version 5 of Perl" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:$LINENO: checking for required Perl modules" >&5 -echo $ECHO_N "checking for required Perl modules... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for required Perl modules" >&5 +$as_echo_n "checking for required Perl modules... " >&6; } if `$PERL -e 'use Archive::Zip;'`; then - echo "$as_me:$LINENO: result: all modules found" >&5 -echo "${ECHO_T}all modules found" >&6 + { $as_echo "$as_me:$LINENO: result: all modules found" >&5 +$as_echo "all modules found" >&6; } else - { { echo "$as_me:$LINENO: error: Failed to find some modules" >&5 -echo "$as_me: error: Failed to find some modules" >&2;} + { { $as_echo "$as_me:$LINENO: error: Failed to find some modules" >&5 +$as_echo "$as_me: error: Failed to find some modules" >&2;} { (exit 1); exit 1; }; } fi if test "$_os" = "WINNT"; then if test "$WITH_MINGWIN" != "yes"; then - echo "$as_me:$LINENO: checking for friendly registry keys" >&5 -echo $ECHO_N "checking for friendly registry keys... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for friendly registry keys" >&5 +$as_echo_n "checking for friendly registry keys... " >&6; } # VS.Net 2003, VS.Net 2005 if test -z "$with_cl_home"; then vctest=`./oowintool --msvc-productdir`; @@ -5335,8 +6622,8 @@ echo $ECHO_N "checking for friendly registry keys... $ECHO_C" >&6 else with_cl_home=`cygpath -u "$with_cl_home"` fi - echo "$as_me:$LINENO: result: done" >&5 -echo "${ECHO_T}done" >&6 + { $as_echo "$as_me:$LINENO: result: done" >&5 +$as_echo "done" >&6; } if test -n "$with_mspdb_path";then with_mspdb_path=`cygpath -u "$with_mspdb_path"` @@ -5357,10 +6644,10 @@ echo "${ECHO_T}done" >&6 if test -z "$MSPDB_PATH";then # Extract the first word of "mspdb80.dll", so it can be a program name with args. set dummy mspdb80.dll; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_MSPDB_PATH+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $MSPDB_PATH in [\\/]* | ?:[\\/]*) @@ -5373,33 +6660,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_MSPDB_PATH="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi MSPDB_PATH=$ac_cv_path_MSPDB_PATH - if test -n "$MSPDB_PATH"; then - echo "$as_me:$LINENO: result: $MSPDB_PATH" >&5 -echo "${ECHO_T}$MSPDB_PATH" >&6 + { $as_echo "$as_me:$LINENO: result: $MSPDB_PATH" >&5 +$as_echo "$MSPDB_PATH" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + # Extract the first word of "mspdb71.dll", so it can be a program name with args. set dummy mspdb71.dll; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_MSPDB_PATH+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $MSPDB_PATH in [\\/]* | ?:[\\/]*) @@ -5412,50 +6700,51 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_MSPDB_PATH="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi MSPDB_PATH=$ac_cv_path_MSPDB_PATH - if test -n "$MSPDB_PATH"; then - echo "$as_me:$LINENO: result: $MSPDB_PATH" >&5 -echo "${ECHO_T}$MSPDB_PATH" >&6 + { $as_echo "$as_me:$LINENO: result: $MSPDB_PATH" >&5 +$as_echo "$MSPDB_PATH" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + MSPDB_PATH=`dirname "$MSPDB_PATH"` fi if test -z "$MSPDB_PATH"; then - { { echo "$as_me:$LINENO: error: You need a mspdb71.dll/mspdb80.dll, make sure it's in the path or use --with-mspdb-path" >&5 -echo "$as_me: error: You need a mspdb71.dll/mspdb80.dll, make sure it's in the path or use --with-mspdb-path" >&2;} + { { $as_echo "$as_me:$LINENO: error: You need a mspdb71.dll/mspdb80.dll, make sure it's in the path or use --with-mspdb-path" >&5 +$as_echo "$as_me: error: You need a mspdb71.dll/mspdb80.dll, make sure it's in the path or use --with-mspdb-path" >&2;} { (exit 1); exit 1; }; } fi MSPDB_PATH=`cygpath -d "$MSPDB_PATH"` MSPDB_PATH=`cygpath -u "$MSPDB_PATH"` PATH="$MSPDB_PATH:$PATH" - echo "$as_me:$LINENO: checking the Microsoft C/C++ Compiler" >&5 -echo $ECHO_N "checking the Microsoft C/C++ Compiler... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking the Microsoft C/C++ Compiler" >&5 +$as_echo_n "checking the Microsoft C/C++ Compiler... " >&6; } if test -x "$with_cl_home/bin/cl.exe"; then CC="$with_cl_home/bin/cl.exe" else # Extract the first word of "cl.exe", so it can be a program name with args. set dummy cl.exe; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $CC in [\\/]* | ?:[\\/]*) @@ -5468,39 +6757,40 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_CC="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi CC=$ac_cv_path_CC - if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test -e "$CC"; then # This gives us a posix path with 8.3 filename restrictions CC=`cygpath -d "$CC"` CC=`cygpath -u "$CC"` # Remove /cl.exe from CC case insensitive - echo "$as_me:$LINENO: result: found ($CC)" >&5 -echo "${ECHO_T}found ($CC)" >&6 + { $as_echo "$as_me:$LINENO: result: found ($CC)" >&5 +$as_echo "found ($CC)" >&6; } COMPATH=`echo $CC | $SED 's@/[cC][lL]\.[eE][xX][eE]@@'` export INCLUDE=`cygpath -d "$COMPATH/../Include"` - echo "$as_me:$LINENO: checking the Version of Microsoft C/C++ Compiler" >&5 -echo $ECHO_N "checking the Version of Microsoft C/C++ Compiler... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking the Version of Microsoft C/C++ Compiler" >&5 +$as_echo_n "checking the Version of Microsoft C/C++ Compiler... " >&6; } CCNUMVER=`$CC 2>&1 | $AWK "/Microsoft/ && /..\\...\\...../ { x = match( \\\$0, /..\\...\\...../ ) CCversion = substr( \\\$0, RSTART, RLENGTH) @@ -5509,47 +6799,47 @@ echo $ECHO_N "checking the Version of Microsoft C/C++ Compiler... $ECHO_C" >&6 printf (\"%04d\",vertoken[i] ) } }"` - echo "$as_me:$LINENO: result: found Compiler version $CCNUMVER." >&5 -echo "${ECHO_T}found Compiler version $CCNUMVER." >&6 + { $as_echo "$as_me:$LINENO: result: found Compiler version $CCNUMVER." >&5 +$as_echo "found Compiler version $CCNUMVER." >&6; } if test "$CCNUMVER" -ge "001500000000"; then COMEX=12 MSVSVER=2008 - echo "$as_me:$LINENO: result: found .NET 2008 / VS 9.0." >&5 -echo "${ECHO_T}found .NET 2008 / VS 9.0." >&6 + { $as_echo "$as_me:$LINENO: result: found .NET 2008 / VS 9.0." >&5 +$as_echo "found .NET 2008 / VS 9.0." >&6; } elif test "$CCNUMVER" -ge "001400000000"; then COMEX=11 MSVSVER=2005 - echo "$as_me:$LINENO: result: found .NET 2005." >&5 -echo "${ECHO_T}found .NET 2005." >&6 + { $as_echo "$as_me:$LINENO: result: found .NET 2005." >&5 +$as_echo "found .NET 2005." >&6; } elif test "$CCNUMVER" -ge "001300102240"; then COMEX=10 MSVSVER=2003 - echo "$as_me:$LINENO: result: found .NET 2003." >&5 -echo "${ECHO_T}found .NET 2003." >&6 + { $as_echo "$as_me:$LINENO: result: found .NET 2003." >&5 +$as_echo "found .NET 2003." >&6; } else - { { echo "$as_me:$LINENO: error: Compiler too old. Use Microsoft C/C++ .NET 2003/2005 compiler." >&5 -echo "$as_me: error: Compiler too old. Use Microsoft C/C++ .NET 2003/2005 compiler." >&2;} + { { $as_echo "$as_me:$LINENO: error: Compiler too old. Use Microsoft C/C++ .NET 2003/2005 compiler." >&5 +$as_echo "$as_me: error: Compiler too old. Use Microsoft C/C++ .NET 2003/2005 compiler." >&2;} { (exit 1); exit 1; }; } fi else - { { echo "$as_me:$LINENO: error: Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe." >&5 -echo "$as_me: error: Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe." >&2;} + { { $as_echo "$as_me:$LINENO: error: Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe." >&5 +$as_echo "$as_me: error: Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe." >&2;} { (exit 1); exit 1; }; } fi else - echo "$as_me:$LINENO: checking the Mingwin32 C++ Compiler" >&5 -echo $ECHO_N "checking the Mingwin32 C++ Compiler... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking the Mingwin32 C++ Compiler" >&5 +$as_echo_n "checking the Mingwin32 C++ Compiler... " >&6; } if test `$CC -dumpmachine | $SED -e 's/^.*-//'` = "mingw32"; then - echo "$as_me:$LINENO: result: found." >&5 -echo "${ECHO_T}found." >&6 + { $as_echo "$as_me:$LINENO: result: found." >&5 +$as_echo "found." >&6; } if $CC -dumpspecs | grep -q "mno-cygwin"; then USE_MINGW="cygwin" else USE_MINGW="pure-mingw" fi else - { { echo "$as_me:$LINENO: error: Mingwin32 C++ Compiler not found." >&5 -echo "$as_me: error: Mingwin32 C++ Compiler not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: Mingwin32 C++ Compiler not found." >&5 +$as_echo "$as_me: error: Mingwin32 C++ Compiler not found." >&2;} { (exit 1); exit 1; }; } fi fi @@ -5562,10 +6852,10 @@ if test "$_os" = "WINNT"; then if test "$WITH_MINGWIN" = "yes" || test "$COMEX" -ge "10"; then # Extract the first word of "midl.exe", so it can be a program name with args. set dummy midl.exe; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_MIDL_PATH+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $MIDL_PATH in [\\/]* | ?:[\\/]*) @@ -5578,27 +6868,28 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_MIDL_PATH="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi MIDL_PATH=$ac_cv_path_MIDL_PATH - if test -n "$MIDL_PATH"; then - echo "$as_me:$LINENO: result: $MIDL_PATH" >&5 -echo "${ECHO_T}$MIDL_PATH" >&6 + { $as_echo "$as_me:$LINENO: result: $MIDL_PATH" >&5 +$as_echo "$MIDL_PATH" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + if test -n "$MIDL_PATH";then MIDL_PATH=`dirname "$MIDL_PATH"` fi @@ -5624,8 +6915,8 @@ fi fi fi if test ! -x "$MIDL_PATH/midl.exe"; then - { { echo "$as_me:$LINENO: error: midl.exe not found. Make sure it's in the path or use --with-midl-path" >&5 -echo "$as_me: error: midl.exe not found. Make sure it's in the path or use --with-midl-path" >&2;} + { { $as_echo "$as_me:$LINENO: error: midl.exe not found. Make sure it's in the path or use --with-midl-path" >&5 +$as_echo "$as_me: error: midl.exe not found. Make sure it's in the path or use --with-midl-path" >&2;} { (exit 1); exit 1; }; } fi # Convert to posix path with 8.3 filename restrictions ( No spaces ) @@ -5634,10 +6925,10 @@ echo "$as_me: error: midl.exe not found. Make sure it's in the path or use --wit # Extract the first word of "csc.exe", so it can be a program name with args. set dummy csc.exe; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_CSC_PATH+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $CSC_PATH in [\\/]* | ?:[\\/]*) @@ -5650,27 +6941,28 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_CSC_PATH="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi CSC_PATH=$ac_cv_path_CSC_PATH - if test -n "$CSC_PATH"; then - echo "$as_me:$LINENO: result: $CSC_PATH" >&5 -echo "${ECHO_T}$CSC_PATH" >&6 + { $as_echo "$as_me:$LINENO: result: $CSC_PATH" >&5 +$as_echo "$CSC_PATH" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + if test -n "$CSC_PATH";then CSC_PATH=`dirname "$CSC_PATH"` fi @@ -5686,16 +6978,16 @@ fi fi fi if test ! -x "$CSC_PATH/csc.exe"; then - { { echo "$as_me:$LINENO: error: csc.exe not found. Make sure it's in the path or use --with-csc-path" >&5 -echo "$as_me: error: csc.exe not found. Make sure it's in the path or use --with-csc-path" >&2;} + { { $as_echo "$as_me:$LINENO: error: csc.exe not found. Make sure it's in the path or use --with-csc-path" >&5 +$as_echo "$as_me: error: csc.exe not found. Make sure it's in the path or use --with-csc-path" >&2;} { (exit 1); exit 1; }; } fi # Convert to posix path with 8.3 filename restrictions ( No spaces ) CSC_PATH=`cygpath -d "$CSC_PATH"` CSC_PATH=`cygpath -u "$CSC_PATH"` - echo "$as_me:$LINENO: checking .NET Framework" >&5 -echo $ECHO_N "checking .NET Framework... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking .NET Framework" >&5 +$as_echo_n "checking .NET Framework... " >&6; } if test -n "$with_frame_home"; then with_frame_home=`cygpath -u "$with_frame_home"` fi @@ -5717,12 +7009,12 @@ echo $ECHO_N "checking .NET Framework... $ECHO_C" >&6 fi fi if test ! -f "$FRAME_HOME/lib/mscoree.lib"; then - { { echo "$as_me:$LINENO: error: mscoree.lib (.NET Framework) not found. Make sure you use --with-frame-home" >&5 -echo "$as_me: error: mscoree.lib (.NET Framework) not found. Make sure you use --with-frame-home" >&2;} + { { $as_echo "$as_me:$LINENO: error: mscoree.lib (.NET Framework) not found. Make sure you use --with-frame-home" >&5 +$as_echo "$as_me: error: mscoree.lib (.NET Framework) not found. Make sure you use --with-frame-home" >&2;} { (exit 1); exit 1; }; } fi - echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6 + { $as_echo "$as_me:$LINENO: result: found" >&5 +$as_echo "found" >&6; } # Convert to posix path with 8.3 filename restrictions ( No spaces ) FRAME_HOME=`cygpath -d "$FRAME_HOME"` FRAME_HOME=`cygpath -u "$FRAME_HOME"` @@ -5738,15 +7030,15 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then if test "${ac_cv_prog_CPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" @@ -5761,7 +7053,6 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5772,39 +7063,39 @@ cat >>conftest.$ac_ext <<_ACEOF #else # include #endif - Syntax error + Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5812,33 +7103,34 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Passes both tests. ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -5856,8 +7148,8 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6 +{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 +$as_echo "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do @@ -5868,7 +7160,6 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5879,39 +7170,39 @@ cat >>conftest.$ac_ext <<_ACEOF #else # include #endif - Syntax error + Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5919,33 +7210,34 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Passes both tests. ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -5954,11 +7246,13 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check See \`config.log' for more details." >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } fi ac_ext=c @@ -5968,13 +7262,12 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5994,30 +7287,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_header_stdc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_stdc=no + ac_cv_header_stdc=no fi -rm -f conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6039,7 +7338,6 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6064,21 +7362,21 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include +#include #if ((' ' & 0x0FF) == 0x020) # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) #else # define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) #endif @@ -6089,37 +7387,51 @@ main () int i; for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - exit(2); - exit (0); + || toupper (i) != TOUPPER (i)) + return 2; + return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + fi fi -echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then cat >>confdefs.h <<\_ACEOF @@ -6131,20 +7443,24 @@ fi fi if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -n "$ac_tool_prefix"; then - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC +if test -z "$CXX"; then + if test -n "$CCC"; then + CXX=$CCC + else + if test -n "$ac_tool_prefix"; then + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$CXX"; then ac_cv_prog_CXX="$CXX" # Let the user override the test. @@ -6155,38 +7471,40 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - echo "$as_me:$LINENO: result: $CXX" >&5 -echo "${ECHO_T}$CXX" >&6 + { $as_echo "$as_me:$LINENO: result: $CXX" >&5 +$as_echo "$CXX" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + test -n "$CXX" && break done fi if test -z "$CXX"; then ac_ct_CXX=$CXX - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CXX"; then ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. @@ -6197,60 +7515,89 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + 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_CXX="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_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_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -echo "${ECHO_T}$ac_ct_CXX" >&6 + { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +$as_echo "$ac_ct_CXX" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + test -n "$ac_ct_CXX" && break done -test -n "$ac_ct_CXX" || ac_ct_CXX="g++" - CXX=$ac_ct_CXX + if test "x$ac_ct_CXX" = x; then + CXX="g++" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CXX=$ac_ct_CXX + fi fi - + fi +fi # Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C++ compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 +$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 +{ $as_echo "$as_me:$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 test "${ac_cv_cxx_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6269,41 +7616,54 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_compiler_gnu=no + ac_compiler_gnu=no fi -rm -f conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 -GXX=`test $ac_compiler_gnu = yes && echo yes` +{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GXX=yes +else + GXX= +fi ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS -CXXFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +$as_echo_n "checking whether $CXX accepts -g... " >&6; } if test "${ac_cv_prog_cxx_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" + ac_save_cxx_werror_flag=$ac_cxx_werror_flag + ac_cxx_werror_flag=yes + ac_cv_prog_cxx_g=no + CXXFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6319,148 +7679,152 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cxx_g=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_prog_cxx_g=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi -fi -for ac_declaration in \ - ''\ - '#include ' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" + CXXFLAGS="" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -$ac_declaration + int main () { -exit (42); + ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -continue -fi -rm -f conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" + ac_cxx_werror_flag=$ac_save_cxx_werror_flag + CXXFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_declaration + int main () { -exit (42); + ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cxx_g=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.$ac_objext conftest.$ac_ext -done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cxx_werror_flag=$ac_save_cxx_werror_flag +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +$as_echo "$ac_cv_prog_cxx_g" >&6; } +if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS=$ac_save_CXXFLAGS +elif test $ac_cv_prog_cxx_g = yes; then + if test "$GXX" = yes; then + CXXFLAGS="-g -O2" + else + CXXFLAGS="-g" + fi +else + if test "$GXX" = yes; then + CXXFLAGS="-O2" + else + CXXFLAGS= + fi +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_ext=cc +ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 +{ $as_echo "$as_me:$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 test "${ac_cv_prog_CXXCPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else # Double quotes because CXXCPP needs to be expanded for CXXCPP in "$CXX -E" "/lib/cpp" @@ -6475,7 +7839,6 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6486,39 +7849,39 @@ cat >>conftest.$ac_ext <<_ACEOF #else # include #endif - Syntax error + Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then : else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6526,33 +7889,34 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Passes both tests. ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -6570,8 +7934,8 @@ fi else ac_cv_prog_CXXCPP=$CXXCPP fi -echo "$as_me:$LINENO: result: $CXXCPP" >&5 -echo "${ECHO_T}$CXXCPP" >&6 +{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5 +$as_echo "$CXXCPP" >&6; } ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes do @@ -6582,7 +7946,6 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6593,39 +7956,39 @@ cat >>conftest.$ac_ext <<_ACEOF #else # include #endif - Syntax error + Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - else - ac_cpp_err= - fi + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then + : else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - : -else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6633,33 +7996,34 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Passes both tests. ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -6668,11 +8032,13 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check See \`config.log' for more details." >&5 -echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check +$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } fi ac_ext=c @@ -6690,15 +8056,15 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then if test "${ac_cv_prog_CPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" @@ -6713,7 +8079,6 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6724,39 +8089,39 @@ cat >>conftest.$ac_ext <<_ACEOF #else # include #endif - Syntax error + Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6764,33 +8129,34 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Passes both tests. ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -6808,8 +8174,8 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6 +{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 +$as_echo "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do @@ -6820,7 +8186,6 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6831,39 +8196,39 @@ cat >>conftest.$ac_ext <<_ACEOF #else # include #endif - Syntax error + Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6871,33 +8236,34 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Passes both tests. ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -6906,11 +8272,13 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check See \`config.log' for more details." >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } fi ac_ext=c @@ -6933,16 +8301,15 @@ fi for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h + inttypes.h stdint.h unistd.h do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -6953,31 +8320,42 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then eval "$as_ac_Header=yes" else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Header=no" + eval "$as_ac_Header=no" fi -rm -f conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF fi @@ -6985,68 +8363,18 @@ fi done -echo "$as_me:$LINENO: checking for long" >&5 -echo $ECHO_N "checking for long... $ECHO_C" >&6 -if test "${ac_cv_type_long+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -if ((long *) 0) - return 0; -if (sizeof (long)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_long=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_type_long=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5 -echo "${ECHO_T}$ac_cv_type_long" >&6 - -echo "$as_me:$LINENO: checking size of long" >&5 -echo $ECHO_N "checking size of long... $ECHO_C" >&6 +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:$LINENO: checking size of long" >&5 +$as_echo_n "checking size of long... " >&6; } if test "${ac_cv_sizeof_long+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else - if test "$ac_cv_type_long" = yes; then - # The cast to unsigned long works around a bug in the HP C Compiler - # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects - # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. - # This bug is HP SR number 8606223364. if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7056,7 +8384,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= 0)]; test_array [0] = 0 ; @@ -7064,21 +8392,26 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7088,7 +8421,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)]; test_array [0] = 0 ; @@ -7096,37 +8429,43 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=$ac_mid; break else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi -rm -f conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7136,7 +8475,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (long))) < 0)]; test_array [0] = 0 ; @@ -7144,21 +8483,26 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7168,7 +8512,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= $ac_mid)]; test_array [0] = 0 ; @@ -7176,45 +8520,53 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_lo=$ac_mid; break else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi -rm -f conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo= ac_hi= + ac_lo= ac_hi= fi -rm -f conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7224,7 +8576,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)]; test_array [0] = 0 ; @@ -7232,52 +8584,57 @@ test_array [0] = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=$ac_mid else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr '(' $ac_mid ')' + 1` + ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_long=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 +'') if test "$ac_cv_type_long" = yes; then + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (long), 77 +$as_echo "$as_me: error: cannot compute sizeof (long) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } ;; + { (exit 77); exit 77; }; }; } + else + ac_cv_sizeof_long=0 + fi ;; esac -else - if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run test program while cross compiling -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -long longval () { return (long) (sizeof (long)); } -unsigned long ulongval () { return (long) (sizeof (long)); } +static long int longval () { return (long int) (sizeof (long)); } +static unsigned long int ulongval () { return (long int) (sizeof (long)); } #include #include int @@ -7286,61 +8643,80 @@ main () FILE *f = fopen ("conftest.val", "w"); if (! f) - exit (1); - if (((long) (sizeof (long))) < 0) + return 1; + if (((long int) (sizeof (long))) < 0) { - long i = longval (); - if (i != ((long) (sizeof (long)))) - exit (1); - fprintf (f, "%ld\n", i); + long int i = longval (); + if (i != ((long int) (sizeof (long)))) + return 1; + fprintf (f, "%ld", i); } else { - unsigned long i = ulongval (); - if (i != ((long) (sizeof (long)))) - exit (1); - fprintf (f, "%lu\n", i); + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (long)))) + return 1; + fprintf (f, "%lu", i); } - exit (ferror (f) || fclose (f) != 0); + /* Do not output a trailing newline, as this causes \r\n confusion + on some platforms. */ + return ferror (f) || fclose (f) != 0; ; return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sizeof_long=`cat conftest.val` else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 +if test "$ac_cv_type_long" = yes; then + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (long), 77 +$as_echo "$as_me: error: cannot compute sizeof (long) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + { (exit 77); exit 77; }; }; } + else + ac_cv_sizeof_long=0 + fi fi +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.val -else - ac_cv_sizeof_long=0 -fi fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 -echo "${ECHO_T}$ac_cv_sizeof_long" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 +$as_echo "$ac_cv_sizeof_long" >&6; } + + + cat >>confdefs.h <<_ACEOF #define SIZEOF_LONG $ac_cv_sizeof_long _ACEOF @@ -7348,233 +8724,434 @@ _ACEOF SIZEOF_LONG=$ac_cv_sizeof_long -echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 -echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6 + + { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 +$as_echo_n "checking whether byte ordering is bigendian... " >&6; } if test "${ac_cv_c_bigendian+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else - # See if sys/param.h defines the BYTE_ORDER macro. -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" + ac_cv_c_bigendian=unknown + # See if we're dealing with a universal compiler. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifndef __APPLE_CC__ + not a universal capable compiler + #endif + typedef int dummy; + +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + + # Check for potential -arch flags. It is not universal unless + # there are some -arch flags. Note that *ppc* also matches + # ppc64. This check is also rather less than ideal. + case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in #( + *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;; + esac +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test $ac_cv_c_bigendian = unknown; then + # See if sys/param.h defines the BYTE_ORDER macro. + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include -#include + #include int main () { -#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN - bogus endian macros -#endif +#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ + && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ + && LITTLE_ENDIAN) + bogus endian macros + #endif ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then # It does; now see whether it defined to BIG_ENDIAN or not. -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include -#include + #include int main () { #if BYTE_ORDER != BIG_ENDIAN - not big endian -#endif + not big endian + #endif ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_c_bigendian=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_c_bigendian=no + ac_cv_c_bigendian=no fi -rm -f conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -# It does not; compile a test program. -if test "$cross_compiling" = yes; then - # try to guess the endianness by grepping values into an object file - ac_cv_c_bigendian=unknown - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + if test $ac_cv_c_bigendian = unknown; then + # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; -short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; -void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } -short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; -short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; -void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; } +#include + int main () { - _ascii (); _ebcdic (); +#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) + bogus endian macros + #endif + ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + # It does; now see whether it defined to _BIG_ENDIAN or not. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +int +main () +{ +#ifndef _BIG_ENDIAN + not big endian + #endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_c_bigendian=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_c_bigendian=no fi -if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then - if test "$ac_cv_c_bigendian" = unknown; then - ac_cv_c_bigendian=no - else - # finding both strings is unlikely to happen, but who knows? - ac_cv_c_bigendian=unknown - fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + if test $ac_cv_c_bigendian = unknown; then + # Compile a test program. + if test "$cross_compiling" = yes; then + # Try to guess by grepping values from an object file. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +short int ascii_mm[] = + { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; + short int ascii_ii[] = + { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; + int use_ascii (int i) { + return ascii_mm[i] + ascii_ii[i]; + } + short int ebcdic_ii[] = + { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; + short int ebcdic_mm[] = + { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; + int use_ebcdic (int i) { + return ebcdic_mm[i] + ebcdic_ii[i]; + } + extern int foo; + +int +main () +{ +return use_ascii (foo) == use_ebcdic (foo); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then + ac_cv_c_bigendian=yes + fi + if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then + if test "$ac_cv_c_bigendian" = unknown; then + ac_cv_c_bigendian=no + else + # finding both strings is unlikely to happen, but who knows? + ac_cv_c_bigendian=unknown + fi + fi else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +$ac_includes_default int main () { - /* Are we little or big endian? From Harbison&Steele. */ - union - { - long l; - char c[sizeof (long)]; - } u; - u.l = 1; - exit (u.c[sizeof (long) - 1] == 1); + + /* Are we little or big endian? From Harbison&Steele. */ + union + { + long int l; + char c[sizeof (long int)]; + } u; + u.l = 1; + return u.c[sizeof (long int) - 1] == 1; + + ; + return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_bigendian=no else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_c_bigendian=yes fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + + fi fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 -echo "${ECHO_T}$ac_cv_c_bigendian" >&6 -case $ac_cv_c_bigendian in - yes) +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 +$as_echo "$ac_cv_c_bigendian" >&6; } + case $ac_cv_c_bigendian in #( + yes) + cat >>confdefs.h <<\_ACEOF +#define WORDS_BIGENDIAN 1 +_ACEOF +;; #( + no) + ;; #( + universal) cat >>confdefs.h <<\_ACEOF -#define WORDS_BIGENDIAN 1 +#define AC_APPLE_UNIVERSAL_BUILD 1 _ACEOF - ;; - no) - ;; - *) - { { echo "$as_me:$LINENO: error: unknown endianness -presetting ac_cv_c_bigendian=no (or yes) will help" >&5 -echo "$as_me: error: unknown endianness -presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} + + ;; #( + *) + { { $as_echo "$as_me:$LINENO: error: unknown endianness + presetting ac_cv_c_bigendian=no (or yes) will help" >&5 +$as_echo "$as_me: error: unknown endianness + presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} { (exit 1); exit 1; }; } ;; -esac + esac WORDS_BIGENDIAN=$ac_cv_c_bigendian -# Check whether --enable-largefile or --disable-largefile was given. +# Check whether --enable-largefile was given. if test "${enable_largefile+set}" = set; then - enableval="$enable_largefile" + enableval=$enable_largefile; +fi -fi; if test "$enable_largefile" != no; then - echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5 -echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 + { $as_echo "$as_me:$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 test "${ac_cv_sys_largefile_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_cv_sys_largefile_CC=no if test "$GCC" != yes; then ac_save_CC=$CC while :; do - # IRIX 6.2 and later do not support large files by default, - # so use the C compiler's -n32 option if that helps. - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7597,66 +9174,80 @@ main () return 0; } _ACEOF - rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then break else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.$ac_objext - CC="$CC -n32" - rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + +rm -f core conftest.err conftest.$ac_objext + CC="$CC -n32" + rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_sys_largefile_CC=' -n32'; break else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.$ac_objext - break + +rm -f core conftest.err conftest.$ac_objext + break done CC=$ac_save_CC rm -f conftest.$ac_ext fi fi -echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5 -echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5 +$as_echo "$ac_cv_sys_largefile_CC" >&6; } if test "$ac_cv_sys_largefile_CC" != no; then CC=$CC$ac_cv_sys_largefile_CC fi - echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 -echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 + { $as_echo "$as_me:$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 test "${ac_cv_sys_file_offset_bits+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else while :; do - ac_cv_sys_file_offset_bits=no cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7680,26 +9271,33 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break -else - echo "$as_me: failed program was:" >&5 + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_sys_file_offset_bits=no; break +else + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7724,46 +9322,55 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_sys_file_offset_bits=64; break else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_sys_file_offset_bits=unknown break done fi -echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5 -echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 -if test "$ac_cv_sys_file_offset_bits" != no; then - +{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5 +$as_echo "$ac_cv_sys_file_offset_bits" >&6; } +case $ac_cv_sys_file_offset_bits in #( + no | unknown) ;; + *) cat >>confdefs.h <<_ACEOF #define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits _ACEOF - -fi -rm -f conftest* - echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5 -echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 +;; +esac +rm -rf conftest* + if test $ac_cv_sys_file_offset_bits = unknown; then + { $as_echo "$as_me:$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 test "${ac_cv_sys_large_files+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else while :; do - ac_cv_sys_large_files=no cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7787,26 +9394,33 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break -else - echo "$as_me: failed program was:" >&5 + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_sys_large_files=no; break +else + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7831,37 +9445,48 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_sys_large_files=1; break else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_sys_large_files=unknown break done fi -echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5 -echo "${ECHO_T}$ac_cv_sys_large_files" >&6 -if test "$ac_cv_sys_large_files" != no; then - +{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5 +$as_echo "$ac_cv_sys_large_files" >&6; } +case $ac_cv_sys_large_files in #( + no | unknown) ;; + *) cat >>confdefs.h <<_ACEOF #define _LARGE_FILES $ac_cv_sys_large_files _ACEOF - -fi -rm -f conftest* +;; +esac +rm -rf conftest* + fi fi if test -n "$ac_cv_sys_file_offset_bits"; then @@ -7872,44 +9497,44 @@ if test -n "$ac_cv_sys_large_files" && test "$ac_cv_sys_large_files" != "no"; th fi -echo "$as_me:$LINENO: checking whether to disable vba feature" >&5 -echo $ECHO_N "checking whether to disable vba feature... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to disable vba feature" >&5 +$as_echo_n "checking whether to disable vba feature... " >&6; } if test -n "$enable_vba" && test "$enable_vba" = "no"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } ENABLE_VBA=NO else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } ENABLE_VBA=YES fi if test "$ENABLE_VBA" = "YES"; then - echo "$as_me:$LINENO: checking how to package the vba compatibility api" >&5 -echo $ECHO_N "checking how to package the vba compatibility api... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking how to package the vba compatibility api" >&5 +$as_echo_n "checking how to package the vba compatibility api... " >&6; } if test -n "$with_vba_package_format"; then if test "$with_vba_package_format" = "extn"; then VBA_EXTENSION=YES - echo "$as_me:$LINENO: result: uno extension" >&5 -echo "${ECHO_T}uno extension" >&6 - { echo "$as_me:$LINENO: WARNING: --with-vba-package-format=extn can cause problems" >&5 -echo "$as_me: WARNING: --with-vba-package-format=extn can cause problems" >&2;} + { $as_echo "$as_me:$LINENO: result: uno extension" >&5 +$as_echo "uno extension" >&6; } + { $as_echo "$as_me:$LINENO: WARNING: --with-vba-package-format=extn can cause problems" >&5 +$as_echo "$as_me: WARNING: --with-vba-package-format=extn can cause problems" >&2;} else if test "$with_vba_package_format" = "builtin"; then VBA_EXTENSION=NO - echo "$as_me:$LINENO: result: build into installset" >&5 -echo "${ECHO_T}build into installset" >&6 + { $as_echo "$as_me:$LINENO: result: build into installset" >&5 +$as_echo "build into installset" >&6; } else - { { echo "$as_me:$LINENO: error: unknown packaging method" >&5 -echo "$as_me: error: unknown packaging method" >&2;} + { { $as_echo "$as_me:$LINENO: error: unknown packaging method" >&5 +$as_echo "$as_me: error: unknown packaging method" >&2;} { (exit 1); exit 1; }; } fi fi else VBA_EXTENSION=NO - echo "$as_me:$LINENO: result: defaulting to build into installset" >&5 -echo "${ECHO_T}defaulting to build into installset" >&6 + { $as_echo "$as_me:$LINENO: result: defaulting to build into installset" >&5 +$as_echo "defaulting to build into installset" >&6; } fi else VBA_EXTENSION=NO @@ -7920,19 +9545,18 @@ fi if test "$test_cups" = "yes" -a "$ENABLE_CUPS" = "TRUE" ; then if test "${ac_cv_header_cups_cups_h+set}" = set; then - echo "$as_me:$LINENO: checking for cups/cups.h" >&5 -echo $ECHO_N "checking for cups/cups.h... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for cups/cups.h" >&5 +$as_echo_n "checking for cups/cups.h... " >&6; } if test "${ac_cv_header_cups_cups_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5 -echo "${ECHO_T}$ac_cv_header_cups_cups_h" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5 +$as_echo "$ac_cv_header_cups_cups_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking cups/cups.h usability" >&5 -echo $ECHO_N "checking cups/cups.h usability... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking cups/cups.h usability" >&5 +$as_echo_n "checking cups/cups.h usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7942,33 +9566,39 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking cups/cups.h presence" >&5 -echo $ECHO_N "checking cups/cups.h presence... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking cups/cups.h presence" >&5 +$as_echo_n "checking cups/cups.h presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7976,83 +9606,76 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) - { echo "$as_me:$LINENO: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: cups/cups.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) - { echo "$as_me:$LINENO: WARNING: cups/cups.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: cups/cups.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: cups/cups.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: cups/cups.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: cups/cups.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: cups/cups.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: cups/cups.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: cups/cups.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&2;} + ;; esac -echo "$as_me:$LINENO: checking for cups/cups.h" >&5 -echo $ECHO_N "checking for cups/cups.h... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for cups/cups.h" >&5 +$as_echo_n "checking for cups/cups.h... " >&6; } if test "${ac_cv_header_cups_cups_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_cv_header_cups_cups_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5 -echo "${ECHO_T}$ac_cv_header_cups_cups_h" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5 +$as_echo "$ac_cv_header_cups_cups_h" >&6; } fi -if test $ac_cv_header_cups_cups_h = yes; then +if test "x$ac_cv_header_cups_cups_h" = x""yes; then : else - { { echo "$as_me:$LINENO: error: cups/cups.h could not be found. libcupsys2-dev or cups???-devel missing?" >&5 -echo "$as_me: error: cups/cups.h could not be found. libcupsys2-dev or cups???-devel missing?" >&2;} + { { $as_echo "$as_me:$LINENO: error: cups/cups.h could not be found. libcupsys2-dev or cups???-devel missing?" >&5 +$as_echo "$as_me: error: cups/cups.h could not be found. libcupsys2-dev or cups???-devel missing?" >&2;} { (exit 1); exit 1; }; } fi @@ -8060,26 +9683,25 @@ fi fi if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "GNU"; then - echo "$as_me:$LINENO: checking whether to enable pam support" >&5 -echo $ECHO_N "checking whether to enable pam support... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking whether to enable pam support" >&5 +$as_echo_n "checking whether to enable pam support... " >&6; } if test -z "$enable_pam" || test "$enable_pam" != "no"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } PAM=YES if test "${ac_cv_header_security_pam_appl_h+set}" = set; then - echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5 -echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5 +$as_echo_n "checking for security/pam_appl.h... " >&6; } if test "${ac_cv_header_security_pam_appl_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5 -echo "${ECHO_T}$ac_cv_header_security_pam_appl_h" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5 +$as_echo "$ac_cv_header_security_pam_appl_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking security/pam_appl.h usability" >&5 -echo $ECHO_N "checking security/pam_appl.h usability... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking security/pam_appl.h usability" >&5 +$as_echo_n "checking security/pam_appl.h usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8089,33 +9711,39 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking security/pam_appl.h presence" >&5 -echo $ECHO_N "checking security/pam_appl.h presence... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking security/pam_appl.h presence" >&5 +$as_echo_n "checking security/pam_appl.h presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8123,149 +9751,153 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) - { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: security/pam_appl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: security/pam_appl.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: security/pam_appl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: security/pam_appl.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: security/pam_appl.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) - { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: security/pam_appl.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: security/pam_appl.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: security/pam_appl.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: security/pam_appl.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: security/pam_appl.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: security/pam_appl.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: security/pam_appl.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: security/pam_appl.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: security/pam_appl.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: security/pam_appl.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: security/pam_appl.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: security/pam_appl.h: in the future, the compiler will take precedence" >&2;} + ;; esac -echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5 -echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5 +$as_echo_n "checking for security/pam_appl.h... " >&6; } if test "${ac_cv_header_security_pam_appl_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_cv_header_security_pam_appl_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5 -echo "${ECHO_T}$ac_cv_header_security_pam_appl_h" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5 +$as_echo "$ac_cv_header_security_pam_appl_h" >&6; } fi -if test $ac_cv_header_security_pam_appl_h = yes; then +if test "x$ac_cv_header_security_pam_appl_h" = x""yes; then : else - { { echo "$as_me:$LINENO: error: pam_appl.h could not be found. libpam-dev or pam-devel missing?" >&5 -echo "$as_me: error: pam_appl.h could not be found. libpam-dev or pam-devel missing?" >&2;} + { { $as_echo "$as_me:$LINENO: error: pam_appl.h could not be found. libpam-dev or pam-devel missing?" >&5 +$as_echo "$as_me: error: pam_appl.h could not be found. libpam-dev or pam-devel missing?" >&2;} { (exit 1); exit 1; }; } fi - echo "$as_me:$LINENO: checking whether to link to libpam" >&5 -echo $ECHO_N "checking whether to link to libpam... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking whether to link to libpam" >&5 +$as_echo_n "checking whether to link to libpam... " >&6; } if test -n "$enable_pam_link" -a "$enable_pam_link" != "no"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } PAM_LINK=YES -echo "$as_me:$LINENO: checking for pam_start in -lpam" >&5 -echo $ECHO_N "checking for pam_start in -lpam... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for pam_start in -lpam" >&5 +$as_echo_n "checking for pam_start in -lpam... " >&6; } if test "${ac_cv_lib_pam_pam_start+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lpam $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char pam_start (); int main () { -pam_start (); +return pam_start (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_pam_pam_start=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_pam_pam_start=no + ac_cv_lib_pam_pam_start=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_pam_pam_start" >&5 -echo "${ECHO_T}$ac_cv_lib_pam_pam_start" >&6 -if test $ac_cv_lib_pam_pam_start = yes; then +{ $as_echo "$as_me:$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" = x""yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBPAM 1 _ACEOF @@ -8273,19 +9905,19 @@ _ACEOF LIBS="-lpam $LIBS" else - { { echo "$as_me:$LINENO: error: libpam not found or functional" >&5 -echo "$as_me: error: libpam not found or functional" >&2;} + { { $as_echo "$as_me:$LINENO: error: libpam not found or functional" >&5 +$as_echo "$as_me: error: libpam not found or functional" >&2;} { (exit 1); exit 1; }; } fi else - echo "$as_me:$LINENO: result: no, dynamically open it" >&5 -echo "${ECHO_T}no, dynamically open it" >&6 + { $as_echo "$as_me:$LINENO: result: no, dynamically open it" >&5 +$as_echo "no, dynamically open it" >&6; } PAM_LINK=NO fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } PAM=NO PAM_LINK=NO @@ -8296,11 +9928,11 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - echo "$as_me:$LINENO: checking how many arguments getspnam_r() takes" >&5 -echo $ECHO_N "checking how many arguments getspnam_r() takes... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking how many arguments getspnam_r() takes" >&5 +$as_echo_n "checking how many arguments getspnam_r() takes... " >&6; } if test "${ac_cv_func_which_getspnam_r+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else @@ -8318,7 +9950,6 @@ ac_cv_func_which_getspnam_r=unknown # assuming an implicit prototype. In which case, we're out of luck. # cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8340,24 +9971,32 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_func_which_getspnam_r=no else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # # FIVE ARGUMENTS @@ -8366,7 +10005,6 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "$ac_cv_func_which_getspnam_r" = "unknown"; then cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8390,24 +10028,32 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_func_which_getspnam_r=five else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -8418,7 +10064,6 @@ fi if test "$ac_cv_func_which_getspnam_r" = "unknown"; then cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8442,24 +10087,32 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_func_which_getspnam_r=four else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -8470,29 +10123,29 @@ fi case "$ac_cv_func_which_getspnam_r" in five) - echo "$as_me:$LINENO: result: five" >&5 -echo "${ECHO_T}five" >&6 + { $as_echo "$as_me:$LINENO: result: five" >&5 +$as_echo "five" >&6; } NEW_SHADOW_API=YES ;; four) - echo "$as_me:$LINENO: result: four" >&5 -echo "${ECHO_T}four" >&6 + { $as_echo "$as_me:$LINENO: result: four" >&5 +$as_echo "four" >&6; } ;; no) - echo "$as_me:$LINENO: result: cannot find function declaration in shadow.h" >&5 -echo "${ECHO_T}cannot find function declaration in shadow.h" >&6 + { $as_echo "$as_me:$LINENO: result: cannot find function declaration in shadow.h" >&5 +$as_echo "cannot find function declaration in shadow.h" >&6; } ;; unknown) - echo "$as_me:$LINENO: result: can't tell" >&5 -echo "${ECHO_T}can't tell" >&6 + { $as_echo "$as_me:$LINENO: result: can't tell" >&5 +$as_echo "can't tell" >&6; } ;; *) - { { echo "$as_me:$LINENO: error: internal error" >&5 -echo "$as_me: error: internal error" >&2;} + { { $as_echo "$as_me:$LINENO: error: internal error" >&5 +$as_echo "$as_me: error: internal error" >&2;} { (exit 1); exit 1; }; } ;; esac @@ -8512,68 +10165,79 @@ fi if test "$_os" = "Linux"; then - echo "$as_me:$LINENO: checking whether to link to libcrypt" >&5 -echo $ECHO_N "checking whether to link to libcrypt... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking whether to link to libcrypt" >&5 +$as_echo_n "checking whether to link to libcrypt... " >&6; } if test -n "$enable_crypt_link" -a "$enable_crypt_link" != "no"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } CRYPT_LINK=YES -echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5 -echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5 +$as_echo_n "checking for crypt in -lcrypt... " >&6; } if test "${ac_cv_lib_crypt_crypt+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lcrypt $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char crypt (); int main () { -crypt (); +return crypt (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_crypt_crypt=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_crypt_crypt=no + ac_cv_lib_crypt_crypt=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5 -echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6 -if test $ac_cv_lib_crypt_crypt = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5 +$as_echo "$ac_cv_lib_crypt_crypt" >&6; } +if test "x$ac_cv_lib_crypt_crypt" = x""yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBCRYPT 1 _ACEOF @@ -8581,14 +10245,14 @@ _ACEOF LIBS="-lcrypt $LIBS" else - { { echo "$as_me:$LINENO: error: libcrypt not found or functional" >&5 -echo "$as_me: error: libcrypt not found or functional" >&2;} + { { $as_echo "$as_me:$LINENO: error: libcrypt not found or functional" >&5 +$as_echo "$as_me: error: libcrypt not found or functional" >&2;} { (exit 1); exit 1; }; } fi else - echo "$as_me:$LINENO: result: no, dynamically open it" >&5 -echo "${ECHO_T}no, dynamically open it" >&6 + { $as_echo "$as_me:$LINENO: result: no, dynamically open it" >&5 +$as_echo "no, dynamically open it" >&6; } CRYPT_LINK=NO fi fi @@ -8607,20 +10271,24 @@ if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then fi if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -n "$ac_tool_prefix"; then - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC +if test -z "$CXX"; then + if test -n "$CCC"; then + CXX=$CCC + else + if test -n "$ac_tool_prefix"; then + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$CXX"; then ac_cv_prog_CXX="$CXX" # Let the user override the test. @@ -8631,38 +10299,40 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - echo "$as_me:$LINENO: result: $CXX" >&5 -echo "${ECHO_T}$CXX" >&6 + { $as_echo "$as_me:$LINENO: result: $CXX" >&5 +$as_echo "$CXX" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + test -n "$CXX" && break done fi if test -z "$CXX"; then ac_ct_CXX=$CXX - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CXX"; then ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. @@ -8673,60 +10343,89 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + 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_CXX="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_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_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -echo "${ECHO_T}$ac_ct_CXX" >&6 + { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +$as_echo "$ac_ct_CXX" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + test -n "$ac_ct_CXX" && break done -test -n "$ac_ct_CXX" || ac_ct_CXX="g++" - CXX=$ac_ct_CXX + if test "x$ac_ct_CXX" = x; then + CXX="g++" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CXX=$ac_ct_CXX + fi fi - + fi +fi # Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C++ compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 +$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 +{ $as_echo "$as_me:$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 test "${ac_cv_cxx_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8745,41 +10444,54 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_compiler_gnu=no + ac_compiler_gnu=no fi -rm -f conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 -GXX=`test $ac_compiler_gnu = yes && echo yes` +{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GXX=yes +else + GXX= +fi ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS -CXXFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +$as_echo_n "checking whether $CXX accepts -g... " >&6; } if test "${ac_cv_prog_cxx_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" + ac_save_cxx_werror_flag=$ac_cxx_werror_flag + ac_cxx_werror_flag=yes + ac_cv_prog_cxx_g=no + CXXFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8795,132 +10507,136 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cxx_g=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_prog_cxx_g=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi -fi -for ac_declaration in \ - ''\ - '#include ' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" + CXXFLAGS="" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -$ac_declaration + int main () { -exit (42); + ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -continue -fi -rm -f conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" + ac_cxx_werror_flag=$ac_save_cxx_werror_flag + CXXFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_declaration + int main () { -exit (42); + ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cxx_g=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.$ac_objext conftest.$ac_ext -done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cxx_werror_flag=$ac_save_cxx_werror_flag +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +$as_echo "$ac_cv_prog_cxx_g" >&6; } +if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS=$ac_save_CXXFLAGS +elif test $ac_cv_prog_cxx_g = yes; then + if test "$GXX" = yes; then + CXXFLAGS="-g -O2" + else + CXXFLAGS="-g" + fi +else + if test "$GXX" = yes; then + CXXFLAGS="-O2" + else + CXXFLAGS= + fi +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -8930,29 +10646,30 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi if test "$GXX" = "yes"; then - echo "$as_me:$LINENO: checking the GNU C++ compiler version" >&5 -echo $ECHO_N "checking the GNU C++ compiler version... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking the GNU C++ compiler version" >&5 +$as_echo_n "checking the GNU C++ compiler version... " >&6; } _gpp_version=`$CXX -dumpversion` _gpp_major=`echo $_gpp_version | $AWK -F. '{ print \$1 }'` _gpp_minor=`echo $_gpp_version | $AWK -F. '{ print \$2 }'` - echo "$as_me:$LINENO: result: checked (g++ $_gpp_version)" >&5 -echo "${ECHO_T}checked (g++ $_gpp_version)" >&6 + { $as_echo "$as_me:$LINENO: result: checked (g++ $_gpp_version)" >&5 +$as_echo "checked (g++ $_gpp_version)" >&6; } if test "$_gpp_major" = "3"; then if test "$_gpp_minor" = "4"; then - echo "$as_me:$LINENO: checking whether $CXX has the enum bug" >&5 -echo $ECHO_N "checking whether $CXX has the enum bug... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking whether $CXX has the enum bug" >&5 +$as_echo_n "checking whether $CXX has the enum bug... " >&6; } if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run test program while cross compiling +$as_echo "$as_me: error: cannot run test program while cross compiling See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8982,30 +10699,44 @@ main (void) _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - { { echo "$as_me:$LINENO: error: your version of the GNU C++ compile has a bug which prevents OpenOffice.org from being compiled correctly - please check http://gcc.gnu.org/ml/gcc-patches/2004-07/msg00968.html for details." >&5 -echo "$as_me: error: your version of the GNU C++ compile has a bug which prevents OpenOffice.org from being compiled correctly - please check http://gcc.gnu.org/ml/gcc-patches/2004-07/msg00968.html for details." >&2;} + { { $as_echo "$as_me:$LINENO: error: your version of the GNU C++ compile has a bug which prevents OpenOffice.org from being compiled correctly - please check http://gcc.gnu.org/ml/gcc-patches/2004-07/msg00968.html for details." >&5 +$as_echo "$as_me: error: your version of the GNU C++ compile has a bug which prevents OpenOffice.org from being compiled correctly - please check http://gcc.gnu.org/ml/gcc-patches/2004-07/msg00968.html for details." >&2;} { (exit 1); exit 1; }; } else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 +{ $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + fi fi fi @@ -9013,8 +10744,8 @@ fi # Removed the special FreeBSD treatment. The problem was that with_gxx_include_path # often contains an i386 which is expanded as a macro. Solved in stlport. if test "$GXX" = "yes"; then - echo "$as_me:$LINENO: checking for g++ include path" >&5 -echo $ECHO_N "checking for g++ include path... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for g++ include path" >&5 +$as_echo_n "checking for g++ include path... " >&6; } if test -z "$with_gxx_include_path"; then with_gxx_include_path=`echo "#include " | $CXX -E -xc++ - | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1` if test "$with_gxx_include_path" = "/usr/libexec/(null)/include"; then @@ -9032,18 +10763,18 @@ echo $ECHO_N "checking for g++ include path... $ECHO_C" >&6 fi if test -z "$with_gxx_include_path"; then with_gxx_include_path="NO_GXX_INCLUDE" - echo "$as_me:$LINENO: result: no g++ includes" >&5 -echo "${ECHO_T}no g++ includes" >&6 + { $as_echo "$as_me:$LINENO: result: no g++ includes" >&5 +$as_echo "no g++ includes" >&6; } else - echo "$as_me:$LINENO: result: $with_gxx_include_path" >&5 -echo "${ECHO_T}$with_gxx_include_path" >&6 + { $as_echo "$as_me:$LINENO: result: $with_gxx_include_path" >&5 +$as_echo "$with_gxx_include_path" >&6; } fi GXX_INCLUDE_PATH="$with_gxx_include_path" if test "$WITH_MINGWIN" = "yes"; then - echo "$as_me:$LINENO: checking for mingwin runtime include path" >&5 -echo $ECHO_N "checking for mingwin runtime include path... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for mingwin runtime include path" >&5 +$as_echo_n "checking for mingwin runtime include path... " >&6; } cat >conftest.$ac_ext <<_ACEOF #include #include @@ -9061,11 +10792,11 @@ _ACEOF fi if test -z "$_mingw_lib_include_path"; then _mingw_lib_include_path="NO_LIB_INCLUDE" - echo "$as_me:$LINENO: result: no mingwin runtime includes" >&5 -echo "${ECHO_T}no mingwin runtime includes" >&6 + { $as_echo "$as_me:$LINENO: result: no mingwin runtime includes" >&5 +$as_echo "no mingwin runtime includes" >&6; } else - echo "$as_me:$LINENO: result: $_mingw_lib_include_path" >&5 -echo "${ECHO_T}$_mingw_lib_include_path" >&6 + { $as_echo "$as_me:$LINENO: result: $_mingw_lib_include_path" >&5 +$as_echo "$_mingw_lib_include_path" >&6; } fi MINGW_LIB_INCLUDE_PATH="$_mingw_lib_include_path" @@ -9073,66 +10804,66 @@ fi if test "$_os" = "SunOS"; then if test "$CC" = "cc"; then - echo "$as_me:$LINENO: checking SunStudio C++ Compiler" >&5 -echo $ECHO_N "checking SunStudio C++ Compiler... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking SunStudio C++ Compiler" >&5 +$as_echo_n "checking SunStudio C++ Compiler... " >&6; } if test "$CXX" != "CC"; then - { echo "$as_me:$LINENO: WARNING: SunStudio C++ was not found" >&5 -echo "$as_me: WARNING: SunStudio C++ was not found" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: SunStudio C++ was not found" >&5 +$as_echo "$as_me: WARNING: SunStudio C++ was not found" >&2;} echo "SunStudio C++ was not found" >> warn else - echo "$as_me:$LINENO: result: checked" >&5 -echo "${ECHO_T}checked" >&6 + { $as_echo "$as_me:$LINENO: result: checked" >&5 +$as_echo "checked" >&6; } fi fi fi if test "$_os" = "Darwin"; then if test "$CC" = "cc"; then - echo "$as_me:$LINENO: checking Macosx c++ Compiler" >&5 -echo $ECHO_N "checking Macosx c++ Compiler... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking Macosx c++ Compiler" >&5 +$as_echo_n "checking Macosx c++ Compiler... " >&6; } if test "$CXX" != "c++"; then - { echo "$as_me:$LINENO: WARNING: Macosx C++ was not found" >&5 -echo "$as_me: WARNING: Macosx C++ was not found" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: Macosx C++ was not found" >&5 +$as_echo "$as_me: WARNING: Macosx C++ was not found" >&2;} echo "Macosx C++ was not found" >> warn else - echo "$as_me:$LINENO: result: checked" >&5 -echo "${ECHO_T}checked" >&6 + { $as_echo "$as_me:$LINENO: result: checked" >&5 +$as_echo "checked" >&6; } fi fi fi if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then if test "$CC" = "cc"; then - echo "$as_me:$LINENO: checking SGI MIPSpro C++ Compiler" >&5 -echo $ECHO_N "checking SGI MIPSpro C++ Compiler... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking SGI MIPSpro C++ Compiler" >&5 +$as_echo_n "checking SGI MIPSpro C++ Compiler... " >&6; } if test "$CXX" != "CC"; then - { echo "$as_me:$LINENO: WARNING: SGI MIPSpro C++ was not found" >&5 -echo "$as_me: WARNING: SGI MIPSpro C++ was not found" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: SGI MIPSpro C++ was not found" >&5 +$as_echo "$as_me: WARNING: SGI MIPSpro C++ was not found" >&2;} echo "SGI MIPSpro C++ was not found" >> warn else - echo "$as_me:$LINENO: result: checked" >&5 -echo "${ECHO_T}checked" >&6 + { $as_echo "$as_me:$LINENO: result: checked" >&5 +$as_echo "checked" >&6; } fi fi fi if test "$_os" = "OSF1"; then - echo "$as_me:$LINENO: checking Compaq C++ compiler version" >&5 -echo $ECHO_N "checking Compaq C++ compiler version... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking Compaq C++ compiler version" >&5 +$as_echo_n "checking Compaq C++ compiler version... " >&6; } _compaqcxx_version=`$CXX -V 2>&1 | $AWK '{ print $3 }'` _compaqcxx_major=`echo $_compaqcxx_version | $AWK -F. '{ print $1 }'` if test "$_compaqcxx_major" != "V6"; then - { echo "$as_me:$LINENO: WARNING: found version \"$_compaqc_version\", use version 6 of the Compaq C++ compiler" >&5 -echo "$as_me: WARNING: found version \"$_compaqc_version\", use version 6 of the Compaq C++ compiler" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: found version \"$_compaqc_version\", use version 6 of the Compaq C++ compiler" >&5 +$as_echo "$as_me: WARNING: found version \"$_compaqc_version\", use version 6 of the Compaq C++ compiler" >&2;} echo "found version $_compaqc_version, use version 6 of the Compaq C++ compiler" >> warn else - echo "$as_me:$LINENO: result: checked" >&5 -echo "${ECHO_T}checked" >&6 + { $as_echo "$as_me:$LINENO: result: checked" >&5 +$as_echo "checked" >&6; } fi fi if test "$_os" = "SunOS"; then _temp=`showrev -p | $AWK -F" " '{ print $2 }'` if test "$_os_release" = "7"; then - echo "$as_me:$LINENO: checking for patch 106327-06 or greater" >&5 -echo $ECHO_N "checking for patch 106327-06 or greater... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for patch 106327-06 or greater" >&5 +$as_echo_n "checking for patch 106327-06 or greater... " >&6; } _patch=`echo $_temp | $AWK '/106327-06/ { print "found" }'` _patch="false" for i in $_temp @@ -9146,15 +10877,15 @@ echo $ECHO_N "checking for patch 106327-06 or greater... $ECHO_C" >&6 fi done if test "$_patch" = "found"; then - echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6 + { $as_echo "$as_me:$LINENO: result: found" >&5 +$as_echo "found" >&6; } else - { echo "$as_me:$LINENO: WARNING: patch 106327-06 not found, please install compiler patch 106327-06 or greater" >&5 -echo "$as_me: WARNING: patch 106327-06 not found, please install compiler patch 106327-06 or greater" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: patch 106327-06 not found, please install compiler patch 106327-06 or greater" >&5 +$as_echo "$as_me: WARNING: patch 106327-06 not found, please install compiler patch 106327-06 or greater" >&2;} echo "patch 106327-06 not found, please install compiler patch 106327-06 or greater" >> warn fi - echo "$as_me:$LINENO: checking for patch 106950-11 or greater" >&5 -echo $ECHO_N "checking for patch 106950-11 or greater... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for patch 106950-11 or greater" >&5 +$as_echo_n "checking for patch 106950-11 or greater... " >&6; } _patch=`echo $_temp | $AWK '/106950-11/ { print "found" }'` _patch="false" for i in $_temp @@ -9168,17 +10899,17 @@ echo $ECHO_N "checking for patch 106950-11 or greater... $ECHO_C" >&6 fi done if test "$_patch" = "found"; then - echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6 + { $as_echo "$as_me:$LINENO: result: found" >&5 +$as_echo "found" >&6; } else - { echo "$as_me:$LINENO: WARNING: patch 106950-11 not found, please install linker patch 106950-11 or greater" >&5 -echo "$as_me: WARNING: patch 106950-11 not found, please install linker patch 106950-11 or greater" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: patch 106950-11 not found, please install linker patch 106950-11 or greater" >&5 +$as_echo "$as_me: WARNING: patch 106950-11 not found, please install linker patch 106950-11 or greater" >&2;} echo "patch 106950-11 not found, please install linker patch 106950-11 or greater" >> warn fi else if test "$_os_release" = "6"; then - echo "$as_me:$LINENO: checking for patch 105591-09 or greater" >&5 -echo $ECHO_N "checking for patch 105591-09 or greater... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for patch 105591-09 or greater" >&5 +$as_echo_n "checking for patch 105591-09 or greater... " >&6; } _patch=`echo $_temp | $AWK '/105591-09/ { print "found" }'` _patch="false" for i in $_temp @@ -9192,15 +10923,15 @@ echo $ECHO_N "checking for patch 105591-09 or greater... $ECHO_C" >&6 fi done if test "$_patch" = "found"; then - echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6 + { $as_echo "$as_me:$LINENO: result: found" >&5 +$as_echo "found" >&6; } else - { echo "$as_me:$LINENO: WARNING: patch 105591-09 not found, please install compiler patch 105591-09 or greater" >&5 -echo "$as_me: WARNING: patch 105591-09 not found, please install compiler patch 105591-09 or greater" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: patch 105591-09 not found, please install compiler patch 105591-09 or greater" >&5 +$as_echo "$as_me: WARNING: patch 105591-09 not found, please install compiler patch 105591-09 or greater" >&2;} echo "patch 105591-09 not found, please install compiler patch 105591-09 or greater" >> warn fi - echo "$as_me:$LINENO: checking for patch 107733-08 or greater" >&5 -echo $ECHO_N "checking for patch 107733-08 or greater... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for patch 107733-08 or greater" >&5 +$as_echo_n "checking for patch 107733-08 or greater... " >&6; } _patch=`echo $_temp | $AWK '/107733-08/ { print "found" }'` _patch="false" for i in $_temp @@ -9214,11 +10945,11 @@ echo $ECHO_N "checking for patch 107733-08 or greater... $ECHO_C" >&6 fi done if test "$_patch" = "found"; then - echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6 + { $as_echo "$as_me:$LINENO: result: found" >&5 +$as_echo "found" >&6; } else - { echo "$as_me:$LINENO: WARNING: patch 107733-06 not found, please install linker patch 107733-08 or greater" >&5 -echo "$as_me: WARNING: patch 107733-06 not found, please install linker patch 107733-08 or greater" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: patch 107733-06 not found, please install linker patch 107733-08 or greater" >&5 +$as_echo "$as_me: WARNING: patch 107733-06 not found, please install linker patch 107733-08 or greater" >&2;} echo "patch 107733-06 not found, please install linker patch 107733-08 or greater" >> warn fi fi @@ -9227,25 +10958,25 @@ fi if test -n "$enable_sgistl" && "$enable_sgistl" != "no"; then if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then - echo "$as_me:$LINENO: checking for SGI STL" >&5 -echo $ECHO_N "checking for SGI STL... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for SGI STL" >&5 +$as_echo_n "checking for SGI STL... " >&6; } if test -d /usr/include/CC ; then - echo "$as_me:$LINENO: result: yes." >&5 -echo "${ECHO_T}yes." >&6 + { $as_echo "$as_me:$LINENO: result: yes." >&5 +$as_echo "yes." >&6; } else - echo "$as_me:$LINENO: result: not found." >&5 -echo "${ECHO_T}not found." >&6 + { $as_echo "$as_me:$LINENO: result: not found." >&5 +$as_echo "not found." >&6; } fi else - { { echo "$as_me:$LINENO: error: Option --enable-sgistl is only valid for IRIX" >&5 -echo "$as_me: error: Option --enable-sgistl is only valid for IRIX" >&2;} + { { $as_echo "$as_me:$LINENO: error: Option --enable-sgistl is only valid for IRIX" >&5 +$as_echo "$as_me: error: Option --enable-sgistl is only valid for IRIX" >&2;} { (exit 1); exit 1; }; } fi else - echo "$as_me:$LINENO: checking what the default STL should be" >&5 -echo $ECHO_N "checking what the default STL should be... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking what the default STL should be" >&5 +$as_echo_n "checking what the default STL should be... " >&6; } DEFAULT_TO_STLPORT="no" if test "$_os" = "Linux"; then case "$build_cpu" in @@ -9266,42 +10997,41 @@ echo $ECHO_N "checking what the default STL should be... $ECHO_C" >&6 DEFAULT_TO_STLPORT="yes" fi if test "$DEFAULT_TO_STLPORT" = "yes"; then - echo "$as_me:$LINENO: result: stlport" >&5 -echo "${ECHO_T}stlport" >&6 + { $as_echo "$as_me:$LINENO: result: stlport" >&5 +$as_echo "stlport" >&6; } else - echo "$as_me:$LINENO: result: system" >&5 -echo "${ECHO_T}system" >&6 + { $as_echo "$as_me:$LINENO: result: system" >&5 +$as_echo "system" >&6; } fi if test "$WITH_STLPORT" = "auto"; then WITH_STLPORT=$DEFAULT_TO_STLPORT fi - echo "$as_me:$LINENO: checking for STL providing headers" >&5 -echo $ECHO_N "checking for STL providing headers... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for STL providing headers" >&5 +$as_echo_n "checking for STL providing headers... " >&6; } STLPORT4="" USE_SYSTEM_STL="" if test "$WITH_STLPORT" = "yes"; then - echo "$as_me:$LINENO: result: using internal stlport." >&5 -echo "${ECHO_T}using internal stlport." >&6 + { $as_echo "$as_me:$LINENO: result: using internal stlport." >&5 +$as_echo "using internal stlport." >&6; } if test "$DEFAULT_TO_STLPORT" != "yes"; then - { echo "$as_me:$LINENO: WARNING: using stlport. Warning, breaks your ABI compatability!" >&5 -echo "$as_me: WARNING: using stlport. Warning, breaks your ABI compatability!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: using stlport. Warning, breaks your ABI compatability!" >&5 +$as_echo "$as_me: WARNING: using stlport. Warning, breaks your ABI compatability!" >&2;} echo "using stlport. Warning, breaks your ABI compatability!" >>warn fi elif test "$WITH_STLPORT" = "no"; then - echo "$as_me:$LINENO: result: using system STL" >&5 -echo "${ECHO_T}using system STL" >&6 + { $as_echo "$as_me:$LINENO: result: using system STL" >&5 +$as_echo "using system STL" >&6; } USE_SYSTEM_STL="YES" if test "$DEFAULT_TO_STLPORT" != "no"; then - { echo "$as_me:$LINENO: WARNING: using system STL. Warning, breaks your ABI compatability!" >&5 -echo "$as_me: WARNING: using system STL. Warning, breaks your ABI compatability!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: using system STL. Warning, breaks your ABI compatability!" >&5 +$as_echo "$as_me: WARNING: using system STL. Warning, breaks your ABI compatability!" >&2;} echo "using system STL. Warning, breaks your ABI compatability!" >>warn fi else STLPORT4=$WITH_STLPORT if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -9309,109 +11039,110 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $STLPORT4/stlport/hash_map _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - echo "$as_me:$LINENO: result: checked." >&5 -echo "${ECHO_T}checked." >&6 -else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + { $as_echo "$as_me:$LINENO: result: checked." >&5 +$as_echo "checked." >&6; } +else + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { { echo "$as_me:$LINENO: error: STLport headers not found." >&5 -echo "$as_me: error: STLport headers not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: STLport headers not found." >&5 +$as_echo "$as_me: error: STLport headers not found." >&2;} { (exit 1); exit 1; }; } fi + rm -f conftest.err conftest.$ac_ext else if test -f "$STLPORT4/stlport/hash_map"; then - echo "$as_me:$LINENO: result: checked." >&5 -echo "${ECHO_T}checked." >&6 + { $as_echo "$as_me:$LINENO: result: checked." >&5 +$as_echo "checked." >&6; } else - { { echo "$as_me:$LINENO: error: STLport headers not found." >&5 -echo "$as_me: error: STLport headers not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: STLport headers not found." >&5 +$as_echo "$as_me: error: STLport headers not found." >&2;} { (exit 1); exit 1; }; } fi fi if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then - echo "$as_me:$LINENO: checking for STLport libraries" >&5 -echo $ECHO_N "checking for STLport libraries... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for STLport libraries" >&5 +$as_echo_n "checking for STLport libraries... " >&6; } if test "$_os" = "SunOS"; then if test -f "$STLPORT4/lib/libstlport_sunpro.so"; then - echo "$as_me:$LINENO: result: checked" >&5 -echo "${ECHO_T}checked" >&6 + { $as_echo "$as_me:$LINENO: result: checked" >&5 +$as_echo "checked" >&6; } elif test -f "$STLPORT4/lib/libstlport.so"; then - echo "$as_me:$LINENO: result: checked" >&5 -echo "${ECHO_T}checked" >&6 + { $as_echo "$as_me:$LINENO: result: checked" >&5 +$as_echo "checked" >&6; } STLPORT_VER=500 else - { { echo "$as_me:$LINENO: error: STLport libraries not found" >&5 -echo "$as_me: error: STLport libraries not found" >&2;} + { { $as_echo "$as_me:$LINENO: error: STLport libraries not found" >&5 +$as_echo "$as_me: error: STLport libraries not found" >&2;} { (exit 1); exit 1; }; } fi elif test "$_os" = "Darwin"; then if test -f "$STLPORT4/lib/libstlport_gcc.dylib"; then - echo "$as_me:$LINENO: result: checked" >&5 -echo "${ECHO_T}checked" >&6 + { $as_echo "$as_me:$LINENO: result: checked" >&5 +$as_echo "checked" >&6; } elif test -f "$STLPORT4/lib/libstlport.dylib"; then - echo "$as_me:$LINENO: result: checked" >&5 -echo "${ECHO_T}checked" >&6 + { $as_echo "$as_me:$LINENO: result: checked" >&5 +$as_echo "checked" >&6; } STLPORT_VER=500 else - { { echo "$as_me:$LINENO: error: STLport libraries not found" >&5 -echo "$as_me: error: STLport libraries not found" >&2;} + { { $as_echo "$as_me:$LINENO: error: STLport libraries not found" >&5 +$as_echo "$as_me: error: STLport libraries not found" >&2;} { (exit 1); exit 1; }; } fi elif test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then if test -f "$STLPORT4/lib/libstlport_mipspro_41.so"; then - echo "$as_me:$LINENO: result: checked" >&5 -echo "${ECHO_T}checked" >&6 + { $as_echo "$as_me:$LINENO: result: checked" >&5 +$as_echo "checked" >&6; } else if test -f "$STLPORT4/lib/libstlport_gcc.so"; then - echo "$as_me:$LINENO: result: checked" >&5 -echo "${ECHO_T}checked" >&6 + { $as_echo "$as_me:$LINENO: result: checked" >&5 +$as_echo "checked" >&6; } elif test -f "$STLPORT4/lib/libstlport.so"; then - echo "$as_me:$LINENO: result: checked" >&5 -echo "${ECHO_T}checked" >&6 + { $as_echo "$as_me:$LINENO: result: checked" >&5 +$as_echo "checked" >&6; } STLPORT_VER=500 else - { { echo "$as_me:$LINENO: error: STLport libraries not found" >&5 -echo "$as_me: error: STLport libraries not found" >&2;} + { { $as_echo "$as_me:$LINENO: error: STLport libraries not found" >&5 +$as_echo "$as_me: error: STLport libraries not found" >&2;} { (exit 1); exit 1; }; } fi fi else if test -f "$STLPORT4/lib/libstlport_gcc.so"; then - echo "$as_me:$LINENO: result: checked" >&5 -echo "${ECHO_T}checked" >&6 + { $as_echo "$as_me:$LINENO: result: checked" >&5 +$as_echo "checked" >&6; } elif test -f "$STLPORT4/lib/libstlport.so"; then - echo "$as_me:$LINENO: result: checked" >&5 -echo "${ECHO_T}checked" >&6 + { $as_echo "$as_me:$LINENO: result: checked" >&5 +$as_echo "checked" >&6; } STLPORT_VER=500 else - { { echo "$as_me:$LINENO: error: STLport libraries not found" >&5 -echo "$as_me: error: STLport libraries not found" >&2;} + { { $as_echo "$as_me:$LINENO: error: STLport libraries not found" >&5 +$as_echo "$as_me: error: STLport libraries not found" >&2;} { (exit 1); exit 1; }; } fi fi fi if test "$DEFAULT_TO_STLPORT" != "yes"; then - { echo "$as_me:$LINENO: WARNING: using stlport. Warning, breaks your ABI compatability!" >&5 -echo "$as_me: WARNING: using stlport. Warning, breaks your ABI compatability!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: using stlport. Warning, breaks your ABI compatability!" >&5 +$as_echo "$as_me: WARNING: using stlport. Warning, breaks your ABI compatability!" >&2;} echo "using stlport. Warning, breaks your ABI compatability!" >>warn fi fi @@ -9428,12 +11159,11 @@ fi if test "$GCC" = "yes"; then - echo "$as_me:$LINENO: checking whether $CC supports -fvisibility=hidden" >&5 -echo $ECHO_N "checking whether $CC supports -fvisibility=hidden... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking whether $CC supports -fvisibility=hidden" >&5 +$as_echo_n "checking whether $CC supports -fvisibility=hidden... " >&6; } save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -fvisibility=hidden" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -9449,38 +11179,51 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then HAVE_GCC_VISIBILITY_FEATURE=TRUE else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext CFLAGS=$save_CFLAGS if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi fi if test "$USE_SYSTEM_STL" = "YES"; then - echo "$as_me:$LINENO: checking if hash_map will be in __gnu_cxx namespace" >&5 -echo $ECHO_N "checking if hash_map will be in __gnu_cxx namespace... $ECHO_C" >&6 - ac_ext=cc + { $as_echo "$as_me:$LINENO: checking if hash_map will be in __gnu_cxx namespace" >&5 +$as_echo_n "checking if hash_map will be in __gnu_cxx namespace... " >&6; } + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -9489,7 +11232,6 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -9507,41 +11249,47 @@ hash_map t; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_cxx_have_ext_hash_map=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_cxx_have_ext_hash_map=no + ac_cv_cxx_have_ext_hash_map=no fi -rm -f conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test "$ac_cv_cxx_have_ext_hash_map" = "no"; then - { { echo "$as_me:$LINENO: error: Can't find hash_map. Try with --with-stlport" >&5 -echo "$as_me: error: Can't find hash_map. Try with --with-stlport" >&2;} + { { $as_echo "$as_me:$LINENO: error: Can't find hash_map. Try with --with-stlport" >&5 +$as_echo "$as_me: error: Can't find hash_map. Try with --with-stlport" >&2;} { (exit 1); exit 1; }; } else - echo "$as_me:$LINENO: result: $ac_cv_cxx_have_ext_hash_map" >&5 -echo "${ECHO_T}$ac_cv_cxx_have_ext_hash_map" >&6 + { $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_have_ext_hash_map" >&5 +$as_echo "$ac_cv_cxx_have_ext_hash_map" >&6; } fi if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then - echo "$as_me:$LINENO: checking if STL headers are visibility safe" >&5 -echo $ECHO_N "checking if STL headers are visibility safe... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking if STL headers are visibility safe" >&5 +$as_echo_n "checking if STL headers are visibility safe... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -9558,11 +11306,11 @@ else fi rm -f conftest* - echo "$as_me:$LINENO: result: $stlvisok" >&5 -echo "${ECHO_T}$stlvisok" >&6 + { $as_echo "$as_me:$LINENO: result: $stlvisok" >&5 +$as_echo "$stlvisok" >&6; } if test "$stlvisok" = "no"; then - { echo "$as_me:$LINENO: WARNING: Your gcc STL headers are not visibility safe. Disabling visibility" >&5 -echo "$as_me: WARNING: Your gcc STL headers are not visibility safe. Disabling visibility" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: Your gcc STL headers are not visibility safe. Disabling visibility" >&5 +$as_echo "$as_me: WARNING: Your gcc STL headers are not visibility safe. Disabling visibility" >&2;} echo "Your gcc STL headers are not visibility safe. Disabling visibility" >> warn unset HAVE_GCC_VISIBILITY_FEATURE fi @@ -9572,10 +11320,9 @@ echo "$as_me: WARNING: Your gcc STL headers are not visibility safe. Disabling v sharedlink_ldflags_save=$LDFLAGS LDFLAGS="$LDFLAGS -fvisibility-inlines-hidden -fpic -shared" - echo "$as_me:$LINENO: checking if gcc is -fvisibility-inlines-hidden safe with STL headers" >&5 -echo $ECHO_N "checking if gcc is -fvisibility-inlines-hidden safe with STL headers... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking if gcc is -fvisibility-inlines-hidden safe with STL headers" >&5 +$as_echo_n "checking if gcc is -fvisibility-inlines-hidden safe with STL headers... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -9593,31 +11340,43 @@ istringstream strm( "test" ); return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then $EGREP -q unresolvable conftest.err; if test $? -eq 0; then gccvisok=no; else gccvisok=yes; fi else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -gccvisok=no + gccvisok=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:$LINENO: result: $gccvisok" >&5 -echo "${ECHO_T}$gccvisok" >&6 + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:$LINENO: result: $gccvisok" >&5 +$as_echo "$gccvisok" >&6; } if test "$gccvisok" = "no"; then - { echo "$as_me:$LINENO: WARNING: Your gcc is not -fvisibility-inlines-hidden safe. Disabling visibility" >&5 -echo "$as_me: WARNING: Your gcc is not -fvisibility-inlines-hidden safe. Disabling visibility" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: Your gcc is not -fvisibility-inlines-hidden safe. Disabling visibility" >&5 +$as_echo "$as_me: WARNING: Your gcc is not -fvisibility-inlines-hidden safe. Disabling visibility" >&2;} echo "Your gcc is not -fvisibility-inlines-hidden safe. Disabling visibility" >> warn unset HAVE_GCC_VISIBILITY_FEATURE fi @@ -9626,8 +11385,8 @@ echo "$as_me: WARNING: Your gcc is not -fvisibility-inlines-hidden safe. Disabli fi if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then - echo "$as_me:$LINENO: checking if gcc has a visibility bug with class-level attributes (GCC bug 26905)" >&5 -echo $ECHO_N "checking if gcc has a visibility bug with class-level attributes (GCC bug 26905)... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking if gcc has a visibility bug with class-level attributes (GCC bug 26905)" >&5 +$as_echo_n "checking if gcc has a visibility bug with class-level attributes (GCC bug 26905)... " >&6; } cat >visibility.cxx <<_ACEOF #pragma GCC visibility push(hidden) struct __attribute__ ((visibility ("default"))) TestStruct { @@ -9648,11 +11407,11 @@ _ACEOF fi rm -f visibility.s - echo "$as_me:$LINENO: result: $gccvisbroken" >&5 -echo "${ECHO_T}$gccvisbroken" >&6 + { $as_echo "$as_me:$LINENO: result: $gccvisbroken" >&5 +$as_echo "$gccvisbroken" >&6; } if test "$gccvisbroken" = "yes"; then - { echo "$as_me:$LINENO: WARNING: Your gcc is not -fvisibility=hidden safe. Disabling visibility" >&5 -echo "$as_me: WARNING: Your gcc is not -fvisibility=hidden safe. Disabling visibility" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: Your gcc is not -fvisibility=hidden safe. Disabling visibility" >&5 +$as_echo "$as_me: WARNING: Your gcc is not -fvisibility=hidden safe. Disabling visibility" >&2;} echo "Your gcc is not -fvisibility=hidden safe. Disabling visibility" >> warn unset HAVE_GCC_VISIBILITY_FEATURE fi @@ -9668,11 +11427,11 @@ fi -echo "$as_me:$LINENO: checking which memory allocator to use" >&5 -echo $ECHO_N "checking which memory allocator to use... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking which memory allocator to use" >&5 +$as_echo_n "checking which memory allocator to use... " >&6; } if test "$with_alloc" = "system"; then - echo "$as_me:$LINENO: result: system" >&5 -echo "${ECHO_T}system" >&6 + { $as_echo "$as_me:$LINENO: result: system" >&5 +$as_echo "system" >&6; } ALLOC="SYS_ALLOC"; @@ -9680,82 +11439,99 @@ echo "${ECHO_T}system" >&6 for ac_func in malloc realloc calloc free do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ + #ifdef __STDC__ # include #else # include #endif -/* Override any gcc2 internal prototype to avoid an error. */ + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then eval "$as_ac_var=yes" else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then +ac_res=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF fi @@ -9763,69 +11539,80 @@ done fi if test "$with_alloc" = "tcmalloc"; then - echo "$as_me:$LINENO: result: tcmalloc" >&5 -echo "${ECHO_T}tcmalloc" >&6 + { $as_echo "$as_me:$LINENO: result: tcmalloc" >&5 +$as_echo "tcmalloc" >&6; } if ! echo $build_cpu | grep -E 'i[3456]86' 2>/dev/null >/dev/null; then - { { echo "$as_me:$LINENO: error: tcmalloc only available/usable on ix86" >&5 -echo "$as_me: error: tcmalloc only available/usable on ix86" >&2;} + { { $as_echo "$as_me:$LINENO: error: tcmalloc only available/usable on ix86" >&5 +$as_echo "$as_me: error: tcmalloc only available/usable on ix86" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:$LINENO: checking for malloc in -ltcmalloc" >&5 -echo $ECHO_N "checking for malloc in -ltcmalloc... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for malloc in -ltcmalloc" >&5 +$as_echo_n "checking for malloc in -ltcmalloc... " >&6; } if test "${ac_cv_lib_tcmalloc_malloc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ltcmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char malloc (); int main () { -malloc (); +return malloc (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_tcmalloc_malloc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_tcmalloc_malloc=no + ac_cv_lib_tcmalloc_malloc=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_tcmalloc_malloc" >&5 -echo "${ECHO_T}$ac_cv_lib_tcmalloc_malloc" >&6 -if test $ac_cv_lib_tcmalloc_malloc = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_tcmalloc_malloc" >&5 +$as_echo "$ac_cv_lib_tcmalloc_malloc" >&6; } +if test "x$ac_cv_lib_tcmalloc_malloc" = x""yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBTCMALLOC 1 _ACEOF @@ -9833,46 +11620,46 @@ _ACEOF LIBS="-ltcmalloc $LIBS" else - { { echo "$as_me:$LINENO: error: tcmalloc not found or functional. Install the Google Profiling Tools" >&5 -echo "$as_me: error: tcmalloc not found or functional. Install the Google Profiling Tools" >&2;} + { { $as_echo "$as_me:$LINENO: error: tcmalloc not found or functional. Install the Google Profiling Tools" >&5 +$as_echo "$as_me: error: tcmalloc not found or functional. Install the Google Profiling Tools" >&2;} { (exit 1); exit 1; }; } fi ALLOC="TCMALLOC"; fi if test "$with_alloc" = "internal" -o -z "$with_alloc"; then - echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6 + { $as_echo "$as_me:$LINENO: result: internal" >&5 +$as_echo "internal" >&6; } fi -echo "$as_me:$LINENO: checking whether to add custom build version" >&5 -echo $ECHO_N "checking whether to add custom build version... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to add custom build version" >&5 +$as_echo_n "checking whether to add custom build version... " >&6; } if test "z$with_build_version" != "z"; then BUILD_VER_STRING=$with_build_version - echo "$as_me:$LINENO: result: yes, $BUILD_VER_STRING" >&5 -echo "${ECHO_T}yes, $BUILD_VER_STRING" >&6 + { $as_echo "$as_me:$LINENO: result: yes, $BUILD_VER_STRING" >&5 +$as_echo "yes, $BUILD_VER_STRING" >&6; } else BUILD_VER_STRING= - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi -echo "$as_me:$LINENO: checking whether to build with Java support" >&5 -echo $ECHO_N "checking whether to build with Java support... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to build with Java support" >&5 +$as_echo_n "checking whether to build with Java support... " >&6; } if test "$WITH_JAVA" != "no"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } SOLAR_JAVA="TRUE" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } SOLAR_JAVA="" - { echo "$as_me:$LINENO: WARNING: building without java will mean some features will not be available" >&5 -echo "$as_me: WARNING: building without java will mean some features will not be available" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: building without java will mean some features will not be available" >&5 +$as_echo "$as_me: WARNING: building without java will mean some features will not be available" >&2;} echo "building without java will mean some features will not be available" >>warn fi @@ -9899,10 +11686,10 @@ if test "$SOLAR_JAVA" != ""; then if test -z "$with_jdk_home"; then # Extract the first word of "$WITH_JAVA", so it can be a program name with args. set dummy $WITH_JAVA; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_JAVAINTERPRETER+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $JAVAINTERPRETER in [\\/]* | ?:[\\/]*) @@ -9915,34 +11702,35 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_JAVAINTERPRETER="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi JAVAINTERPRETER=$ac_cv_path_JAVAINTERPRETER - if test -n "$JAVAINTERPRETER"; then - echo "$as_me:$LINENO: result: $JAVAINTERPRETER" >&5 -echo "${ECHO_T}$JAVAINTERPRETER" >&6 + { $as_echo "$as_me:$LINENO: result: $JAVAINTERPRETER" >&5 +$as_echo "$JAVAINTERPRETER" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + else _java_path="$with_jdk_home/bin/$WITH_JAVA" if test -x "$_java_path"; then JAVAINTERPRETER=$_java_path else - { { echo "$as_me:$LINENO: error: $_java_path not found set with_jdk_home" >&5 -echo "$as_me: error: $_java_path not found set with_jdk_home" >&2;} + { { $as_echo "$as_me:$LINENO: error: $_java_path not found set with_jdk_home" >&5 +$as_echo "$as_me: error: $_java_path not found set with_jdk_home" >&2;} { (exit 1); exit 1; }; } fi fi @@ -9957,12 +11745,12 @@ fi if test "$SOLAR_JAVA" != ""; then _gij_longver=0 - echo "$as_me:$LINENO: checking the installed JDK" >&5 -echo $ECHO_N "checking the installed JDK... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking the installed JDK" >&5 +$as_echo_n "checking the installed JDK... " >&6; } if test -n "$JAVAINTERPRETER"; then if test `$JAVAINTERPRETER -version 2>&1 | grep -c "Kaffe"` -gt 0; then - { { echo "$as_me:$LINENO: error: No valid check available. Please check the block for your desired java in configure.in" >&5 -echo "$as_me: error: No valid check available. Please check the block for your desired java in configure.in" >&2;} + { { $as_echo "$as_me:$LINENO: error: No valid check available. Please check the block for your desired java in configure.in" >&5 +$as_echo "$as_me: error: No valid check available. Please check the block for your desired java in configure.in" >&2;} { (exit 1); exit 1; }; } # dnl Kaffe specific tests # KAFFE_VER=`$JAVAINTERPRETER -version 2>&1 | $EGREP " Version:" | $SED -r "s/.* Version: ([[0-9\.]]*).*/\1/"` @@ -9983,14 +11771,14 @@ echo "$as_me: error: No valid check available. Please check the block for your d # JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*java,,p"` elif test `$JAVAINTERPRETER --version 2>&1 | grep -c "GNU libgcj"` -gt 0; then JDK=gcj - echo "$as_me:$LINENO: result: checked (gcj)" >&5 -echo "${ECHO_T}checked (gcj)" >&6 + { $as_echo "$as_me:$LINENO: result: checked (gcj)" >&5 +$as_echo "checked (gcj)" >&6; } _gij_version=`$JAVAINTERPRETER --version | grep GNU | $SED -e 's@^[^0-9]*@@' -e 's@ .*@@' -e 's@,.*@@'`; _gij_longver=`echo $_gij_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'` elif test `$JAVAINTERPRETER -version 2>&1 | awk '{ print }' | grep -c "BEA"` -gt 0; then - { { echo "$as_me:$LINENO: error: No valid check available. Please check the block for your desired java in configure.in" >&5 -echo "$as_me: error: No valid check available. Please check the block for your desired java in configure.in" >&2;} + { { $as_echo "$as_me:$LINENO: error: No valid check available. Please check the block for your desired java in configure.in" >&5 +$as_echo "$as_me: error: No valid check available. Please check the block for your desired java in configure.in" >&2;} { (exit 1); exit 1; }; } # JDK=bea # @@ -10021,18 +11809,18 @@ echo "$as_me: error: No valid check available. Please check the block for your d _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'` if test "$_jdk_ver" -lt 10600; then - { { echo "$as_me:$LINENO: error: IBM JDK is too old, you need at least 1.6" >&5 -echo "$as_me: error: IBM JDK is too old, you need at least 1.6" >&2;} + { { $as_echo "$as_me:$LINENO: error: IBM JDK is too old, you need at least 1.6" >&5 +$as_echo "$as_me: error: IBM JDK is too old, you need at least 1.6" >&2;} { (exit 1); exit 1; }; } fi - echo "$as_me:$LINENO: result: checked (IBM JDK $_jdk)" >&5 -echo "${ECHO_T}checked (IBM JDK $_jdk)" >&6 + { $as_echo "$as_me:$LINENO: result: checked (IBM JDK $_jdk)" >&5 +$as_echo "checked (IBM JDK $_jdk)" >&6; } if test "$with_jdk_home" = ""; then - { { echo "$as_me:$LINENO: error: In order to successfully build OpenOffice.org using the IBM JDK, + { { $as_echo "$as_me:$LINENO: error: In order to successfully build OpenOffice.org using the IBM JDK, you must use the \"--with-jdk-home\" configure option explicitly" >&5 -echo "$as_me: error: In order to successfully build OpenOffice.org using the IBM JDK, +$as_echo "$as_me: error: In order to successfully build OpenOffice.org using the IBM JDK, you must use the \"--with-jdk-home\" configure option explicitly" >&2;} { (exit 1); exit 1; }; } fi @@ -10046,12 +11834,12 @@ you must use the \"--with-jdk-home\" configure option explicitly" >&2;} _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'` if test "$_jdk_ver" -lt 10500; then - { { echo "$as_me:$LINENO: error: JDK is too old, you need at least 1.5" >&5 -echo "$as_me: error: JDK is too old, you need at least 1.5" >&2;} + { { $as_echo "$as_me:$LINENO: error: JDK is too old, you need at least 1.5" >&5 +$as_echo "$as_me: error: JDK is too old, you need at least 1.5" >&2;} { (exit 1); exit 1; }; } fi - echo "$as_me:$LINENO: result: checked (JDK $_jdk)" >&5 -echo "${ECHO_T}checked (JDK $_jdk)" >&6 + { $as_echo "$as_me:$LINENO: result: checked (JDK $_jdk)" >&5 +$as_echo "checked (JDK $_jdk)" >&6; } JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*java,,p"` if test "$_os" = "WINNT"; then JAVA_HOME=`echo $JAVA_HOME | $SED "s,\.[eE][xX][eE]$,,"` @@ -10061,8 +11849,8 @@ echo "${ECHO_T}checked (JDK $_jdk)" >&6 fi fi else - { { echo "$as_me:$LINENO: error: JAVA not found. You need at least jdk-1.5, or gcj-4" >&5 -echo "$as_me: error: JAVA not found. You need at least jdk-1.5, or gcj-4" >&2;} + { { $as_echo "$as_me:$LINENO: error: JAVA not found. You need at least jdk-1.5, or gcj-4" >&5 +$as_echo "$as_me: error: JAVA not found. You need at least jdk-1.5, or gcj-4" >&2;} { (exit 1); exit 1; }; } fi else @@ -10083,10 +11871,10 @@ if test "$SOLAR_JAVA" != ""; then if test -z "$with_jdk_home"; then # Extract the first word of "$javacompiler", so it can be a program name with args. set dummy $javacompiler; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_JAVACOMPILER+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $JAVACOMPILER in [\\/]* | ?:[\\/]*) @@ -10099,27 +11887,28 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_JAVACOMPILER="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi JAVACOMPILER=$ac_cv_path_JAVACOMPILER - if test -n "$JAVACOMPILER"; then - echo "$as_me:$LINENO: result: $JAVACOMPILER" >&5 -echo "${ECHO_T}$JAVACOMPILER" >&6 + { $as_echo "$as_me:$LINENO: result: $JAVACOMPILER" >&5 +$as_echo "$JAVACOMPILER" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + else _javac_path="$with_jdk_home/bin/$javacompiler" if test -x "$_javac_path"; then @@ -10127,8 +11916,8 @@ fi fi fi if test -z "$JAVACOMPILER"; then - { { echo "$as_me:$LINENO: error: $javacompiler not found set with_jdk_home" >&5 -echo "$as_me: error: $javacompiler not found set with_jdk_home" >&2;} + { { $as_echo "$as_me:$LINENO: error: $javacompiler not found set with_jdk_home" >&5 +$as_echo "$as_me: error: $javacompiler not found set with_jdk_home" >&2;} { (exit 1); exit 1; }; } fi if test "$_os" = "WINNT"; then @@ -10145,11 +11934,11 @@ echo "$as_me: error: $javacompiler not found set with_jdk_home" >&2;} fi if test `$JAVACOMPILER -version 2>&1 | grep -c "Eclipse Java Compiler"` -gt 0; then - echo "$as_me:$LINENO: checking re-checking JDK" >&5 -echo $ECHO_N "checking re-checking JDK... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking re-checking JDK" >&5 +$as_echo_n "checking re-checking JDK... " >&6; } JDK=gcj - echo "$as_me:$LINENO: result: checked (ecj)" >&5 -echo "${ECHO_T}checked (ecj)" >&6 + { $as_echo "$as_me:$LINENO: result: checked (ecj)" >&5 +$as_echo "checked (ecj)" >&6; } #TODO: what's to do here? some switch to do 1.5 compiling? JAVAFLAGS="-source 1.5 -target 1.5" _gij_longver="50000" @@ -10168,10 +11957,10 @@ if test "$SOLAR_JAVA" != ""; then if test -z "$with_jdk_home"; then # Extract the first word of "javadoc", so it can be a program name with args. set dummy javadoc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_JAVADOC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $JAVADOC in [\\/]* | ?:[\\/]*) @@ -10184,27 +11973,28 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_JAVADOC="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi JAVADOC=$ac_cv_path_JAVADOC - if test -n "$JAVADOC"; then - echo "$as_me:$LINENO: result: $JAVADOC" >&5 -echo "${ECHO_T}$JAVADOC" >&6 + { $as_echo "$as_me:$LINENO: result: $JAVADOC" >&5 +$as_echo "$JAVADOC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + else _javadoc_path="$with_jdk_home/bin/javadoc" if test "$_os" = "OS2"; then @@ -10217,10 +12007,10 @@ fi else # Extract the first word of "javadoc", so it can be a program name with args. set dummy javadoc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_JAVADOC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $JAVADOC in [\\/]* | ?:[\\/]*) @@ -10233,32 +12023,33 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_JAVADOC="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi JAVADOC=$ac_cv_path_JAVADOC - if test -n "$JAVADOC"; then - echo "$as_me:$LINENO: result: $JAVADOC" >&5 -echo "${ECHO_T}$JAVADOC" >&6 + { $as_echo "$as_me:$LINENO: result: $JAVADOC" >&5 +$as_echo "$JAVADOC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + fi fi if test -z "$JAVADOC"; then - { { echo "$as_me:$LINENO: error: $_javadoc_path not found set with_jdk_home" >&5 -echo "$as_me: error: $_javadoc_path not found set with_jdk_home" >&2;} + { { $as_echo "$as_me:$LINENO: error: $_javadoc_path not found set with_jdk_home" >&5 +$as_echo "$as_me: error: $_javadoc_path not found set with_jdk_home" >&2;} { (exit 1); exit 1; }; } fi if test "$_os" = "WINNT"; then @@ -10291,36 +12082,36 @@ class findhome } } _ACEOF - echo "$as_me:$LINENO: checking if javac works" >&5 -echo $ECHO_N "checking if javac works... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking if javac works" >&5 +$as_echo_n "checking if javac works... " >&6; } javac_cmd="$JAVACOMPILER findhome.java 1>&2" { (eval echo "$as_me:$LINENO: \"$javac_cmd\"") >&5 (eval $javac_cmd) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } if test $? = 0 && test -f ./findhome.class ; then - echo "$as_me:$LINENO: result: javac works" >&5 -echo "${ECHO_T}javac works" >&6 + { $as_echo "$as_me:$LINENO: result: javac works" >&5 +$as_echo "javac works" >&6; } else echo "configure: javac test failed" >&5 cat findhome.java >&5 - { { echo "$as_me:$LINENO: error: javac does not work - java projects will not build!" >&5 -echo "$as_me: error: javac does not work - java projects will not build!" >&2;} + { { $as_echo "$as_me:$LINENO: error: javac does not work - java projects will not build!" >&5 +$as_echo "$as_me: error: javac does not work - java projects will not build!" >&2;} { (exit 1); exit 1; }; } fi - echo "$as_me:$LINENO: checking if gij knows its java.home" >&5 -echo $ECHO_N "checking if gij knows its java.home... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking if gij knows its java.home" >&5 +$as_echo_n "checking if gij knows its java.home... " >&6; } JAVA_HOME=`$JAVAINTERPRETER findhome` if test $? = 0 && test "$JAVA_HOME" != "" ; then - echo "$as_me:$LINENO: result: $JAVA_HOME" >&5 -echo "${ECHO_T}$JAVA_HOME" >&6 + { $as_echo "$as_me:$LINENO: result: $JAVA_HOME" >&5 +$as_echo "$JAVA_HOME" >&6; } else echo "configure: java test failed" >&5 cat findhome.java >&5 - { { echo "$as_me:$LINENO: error: gij does not know its java.home - use --with-jdk-home" >&5 -echo "$as_me: error: gij does not know its java.home - use --with-jdk-home" >&2;} + { { $as_echo "$as_me:$LINENO: error: gij does not know its java.home - use --with-jdk-home" >&5 +$as_echo "$as_me: error: gij does not know its java.home - use --with-jdk-home" >&2;} { (exit 1); exit 1; }; } fi else @@ -10343,10 +12134,10 @@ echo "$as_me: error: gij does not know its java.home - use --with-jdk-home" >&2; JAVA_HOME=$(readlink $JAVACOMPILER) else # else warn - { echo "$as_me:$LINENO: WARNING: JAVA_HOME is set to /usr - this is very likely to be incorrect" >&5 -echo "$as_me: WARNING: JAVA_HOME is set to /usr - this is very likely to be incorrect" >&2;} - { echo "$as_me:$LINENO: WARNING: if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" >&5 -echo "$as_me: WARNING: if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: JAVA_HOME is set to /usr - this is very likely to be incorrect" >&5 +$as_echo "$as_me: WARNING: JAVA_HOME is set to /usr - this is very likely to be incorrect" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" >&5 +$as_echo "$as_me: WARNING: if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" >&2;} echo "JAVA_HOME is set to /usr - this is very likely to be incorrect" >> warn echo "if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" >> warn fi @@ -10368,12 +12159,12 @@ echo "$as_me: WARNING: if this is the case, please inform the correct JAVA_HOME JAVA_HOME_OK="NO" fi if test "$JAVA_HOME_OK" = "NO"; then - { echo "$as_me:$LINENO: WARNING: JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >&5 -echo "$as_me: WARNING: JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >&2;} - { echo "$as_me:$LINENO: WARNING: attempted to find JAVA_HOME automatically, but apparently it failed" >&5 -echo "$as_me: WARNING: attempted to find JAVA_HOME automatically, but apparently it failed" >&2;} - { echo "$as_me:$LINENO: WARNING: in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >&5 -echo "$as_me: WARNING: in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >&5 +$as_echo "$as_me: WARNING: JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: attempted to find JAVA_HOME automatically, but apparently it failed" >&5 +$as_echo "$as_me: WARNING: attempted to find JAVA_HOME automatically, but apparently it failed" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >&5 +$as_echo "$as_me: WARNING: in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >&2;} echo "JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >> warn echo "attempted to find JAVA_HOME automatically, but apparently it failed" >> warn echo "in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >> warn @@ -10386,8 +12177,8 @@ fi AWTLIB= if test "$SOLAR_JAVA" != ""; then - echo "$as_me:$LINENO: checking for jawt lib name" >&5 -echo $ECHO_N "checking for jawt lib name... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for jawt lib name" >&5 +$as_echo_n "checking for jawt lib name... " >&6; } if test "$JDK" = "gcj"; then save_CFLAGS=$CFLAGS save_LDFLAGS=$LDFLAGS @@ -10395,19 +12186,18 @@ echo $ECHO_N "checking for jawt lib name... $ECHO_C" >&6 LDFLAGS="$LDFLAGS -L$JAVA_HOME/lib -lgcj" exec 6>/dev/null # no output if test "${ac_cv_header_jni_h+set}" = set; then - echo "$as_me:$LINENO: checking for jni.h" >&5 -echo $ECHO_N "checking for jni.h... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for jni.h" >&5 +$as_echo_n "checking for jni.h... " >&6; } if test "${ac_cv_header_jni_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5 -echo "${ECHO_T}$ac_cv_header_jni_h" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5 +$as_echo "$ac_cv_header_jni_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking jni.h usability" >&5 -echo $ECHO_N "checking jni.h usability... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking jni.h usability" >&5 +$as_echo_n "checking jni.h usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -10417,33 +12207,39 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking jni.h presence" >&5 -echo $ECHO_N "checking jni.h presence... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking jni.h presence" >&5 +$as_echo_n "checking jni.h presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -10451,142 +12247,146 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) - { echo "$as_me:$LINENO: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: jni.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: jni.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) - { echo "$as_me:$LINENO: WARNING: jni.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: jni.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: jni.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: jni.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: jni.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: jni.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: jni.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: jni.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: jni.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: jni.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: jni.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: jni.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: jni.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: jni.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: jni.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: jni.h: in the future, the compiler will take precedence" >&2;} + ;; esac -echo "$as_me:$LINENO: checking for jni.h" >&5 -echo $ECHO_N "checking for jni.h... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for jni.h" >&5 +$as_echo_n "checking for jni.h... " >&6; } if test "${ac_cv_header_jni_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_cv_header_jni_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5 -echo "${ECHO_T}$ac_cv_header_jni_h" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5 +$as_echo "$ac_cv_header_jni_h" >&6; } fi -if test $ac_cv_header_jni_h = yes; then +if test "x$ac_cv_header_jni_h" = x""yes; then : else - { { echo "$as_me:$LINENO: error: jni.h could not be found. Mismatch between gcc and libgcj or libgcj-devel missing?" >&5 -echo "$as_me: error: jni.h could not be found. Mismatch between gcc and libgcj or libgcj-devel missing?" >&2;} + { { $as_echo "$as_me:$LINENO: error: jni.h could not be found. Mismatch between gcc and libgcj or libgcj-devel missing?" >&5 +$as_echo "$as_me: error: jni.h could not be found. Mismatch between gcc and libgcj or libgcj-devel missing?" >&2;} { (exit 1); exit 1; }; } fi - echo "$as_me:$LINENO: checking for JAWT_GetAWT in -lgcjawt" >&5 -echo $ECHO_N "checking for JAWT_GetAWT in -lgcjawt... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for JAWT_GetAWT in -lgcjawt" >&5 +$as_echo_n "checking for JAWT_GetAWT in -lgcjawt... " >&6; } if test "${ac_cv_lib_gcjawt_JAWT_GetAWT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lgcjawt $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char JAWT_GetAWT (); int main () { -JAWT_GetAWT (); +return JAWT_GetAWT (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_gcjawt_JAWT_GetAWT=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_gcjawt_JAWT_GetAWT=no + ac_cv_lib_gcjawt_JAWT_GetAWT=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_gcjawt_JAWT_GetAWT" >&5 -echo "${ECHO_T}$ac_cv_lib_gcjawt_JAWT_GetAWT" >&6 -if test $ac_cv_lib_gcjawt_JAWT_GetAWT = yes; then +{ $as_echo "$as_me:$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" = x""yes; then AWTLIB="-lgcjawt -lgcj" fi @@ -10606,19 +12406,18 @@ fi export LD_LIBRARY_PATH exec 6>/dev/null # no output if test "${ac_cv_header_jni_h+set}" = set; then - echo "$as_me:$LINENO: checking for jni.h" >&5 -echo $ECHO_N "checking for jni.h... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for jni.h" >&5 +$as_echo_n "checking for jni.h... " >&6; } if test "${ac_cv_header_jni_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5 -echo "${ECHO_T}$ac_cv_header_jni_h" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5 +$as_echo "$ac_cv_header_jni_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking jni.h usability" >&5 -echo $ECHO_N "checking jni.h usability... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking jni.h usability" >&5 +$as_echo_n "checking jni.h usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -10628,33 +12427,39 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking jni.h presence" >&5 -echo $ECHO_N "checking jni.h presence... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking jni.h presence" >&5 +$as_echo_n "checking jni.h presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -10662,202 +12467,217 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) - { echo "$as_me:$LINENO: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: jni.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: jni.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) - { echo "$as_me:$LINENO: WARNING: jni.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: jni.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: jni.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: jni.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: jni.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: jni.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: jni.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: jni.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: jni.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: jni.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: jni.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: jni.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: jni.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: jni.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: jni.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: jni.h: in the future, the compiler will take precedence" >&2;} + ;; esac -echo "$as_me:$LINENO: checking for jni.h" >&5 -echo $ECHO_N "checking for jni.h... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for jni.h" >&5 +$as_echo_n "checking for jni.h... " >&6; } if test "${ac_cv_header_jni_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_cv_header_jni_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5 -echo "${ECHO_T}$ac_cv_header_jni_h" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5 +$as_echo "$ac_cv_header_jni_h" >&6; } fi -if test $ac_cv_header_jni_h = yes; then +if test "x$ac_cv_header_jni_h" = x""yes; then : else - { { echo "$as_me:$LINENO: error: jni.h could not be found." >&5 -echo "$as_me: error: jni.h could not be found." >&2;} + { { $as_echo "$as_me:$LINENO: error: jni.h could not be found." >&5 +$as_echo "$as_me: error: jni.h could not be found." >&2;} { (exit 1); exit 1; }; } fi - echo "$as_me:$LINENO: checking for JAWT_GetAWT in -ljawt" >&5 -echo $ECHO_N "checking for JAWT_GetAWT in -ljawt... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for JAWT_GetAWT in -ljawt" >&5 +$as_echo_n "checking for JAWT_GetAWT in -ljawt... " >&6; } if test "${ac_cv_lib_jawt_JAWT_GetAWT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ljawt $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char JAWT_GetAWT (); int main () { -JAWT_GetAWT (); +return JAWT_GetAWT (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_jawt_JAWT_GetAWT=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_jawt_JAWT_GetAWT=no + ac_cv_lib_jawt_JAWT_GetAWT=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_jawt_JAWT_GetAWT" >&5 -echo "${ECHO_T}$ac_cv_lib_jawt_JAWT_GetAWT" >&6 -if test $ac_cv_lib_jawt_JAWT_GetAWT = yes; then +{ $as_echo "$as_me:$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" = x""yes; then AWTLIB="-ljawt" fi if test -z "$AWTLIB"; then LDFLAGS="$LDFLAGS -L$JAVA_HOME/jre/bin/xawt -ljawt" - echo "$as_me:$LINENO: checking for JAWT_GetAWT in -lmawt" >&5 -echo $ECHO_N "checking for JAWT_GetAWT in -lmawt... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for JAWT_GetAWT in -lmawt" >&5 +$as_echo_n "checking for JAWT_GetAWT in -lmawt... " >&6; } if test "${ac_cv_lib_mawt_JAWT_GetAWT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lmawt $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char JAWT_GetAWT (); int main () { -JAWT_GetAWT (); +return JAWT_GetAWT (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_mawt_JAWT_GetAWT=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_mawt_JAWT_GetAWT=no + ac_cv_lib_mawt_JAWT_GetAWT=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_mawt_JAWT_GetAWT" >&5 -echo "${ECHO_T}$ac_cv_lib_mawt_JAWT_GetAWT" >&6 -if test $ac_cv_lib_mawt_JAWT_GetAWT = yes; then +{ $as_echo "$as_me:$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" = x""yes; then AWTLIB="-L$JAVA_HOME/jre/bin/xawt -ljawt -lmawt" fi @@ -10870,24 +12690,24 @@ fi if test -z "$AWTLIB"; then AWTLIB=-ljawt fi - echo "$as_me:$LINENO: result: $AWTLIB" >&5 -echo "${ECHO_T}$AWTLIB" >&6 + { $as_echo "$as_me:$LINENO: result: $AWTLIB" >&5 +$as_echo "$AWTLIB" >&6; } fi if test "$SOLAR_JAVA" != ""; then - echo "$as_me:$LINENO: checking whether to enable gcj aot compilation" >&5 -echo $ECHO_N "checking whether to enable gcj aot compilation... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking whether to enable gcj aot compilation" >&5 +$as_echo_n "checking whether to enable gcj aot compilation... " >&6; } if test -n "$enable_gcjaot" && test "$enable_gcjaot" != "no"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } if test `echo $WITH_JAVA | grep -c "gij"` -eq 0; then gcjaot="gcj" else gcjaot=`echo $WITH_JAVA | $SED -e "s/gij/gcj/g"` fi - echo "$as_me:$LINENO: result: $gcjaot" >&5 -echo "${ECHO_T}$gcjaot" >&6 + { $as_echo "$as_me:$LINENO: result: $gcjaot" >&5 +$as_echo "$gcjaot" >&6; } if test -n "$with_jdk_home"; then _javac_path="$with_jdk_home/bin/$gcjaot" if test -x "$_javac_path"; then @@ -10897,10 +12717,10 @@ echo "${ECHO_T}$gcjaot" >&6 if test -z "$JAVAAOTCOMPILER"; then # Extract the first word of "$gcjaot", so it can be a program name with args. set dummy $gcjaot; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_JAVAAOTCOMPILER+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $JAVAAOTCOMPILER in [\\/]* | ?:[\\/]*) @@ -10913,35 +12733,36 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_JAVAAOTCOMPILER="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi JAVAAOTCOMPILER=$ac_cv_path_JAVAAOTCOMPILER - if test -n "$JAVAAOTCOMPILER"; then - echo "$as_me:$LINENO: result: $JAVAAOTCOMPILER" >&5 -echo "${ECHO_T}$JAVAAOTCOMPILER" >&6 + { $as_echo "$as_me:$LINENO: result: $JAVAAOTCOMPILER" >&5 +$as_echo "$JAVAAOTCOMPILER" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test -z "$JAVAAOTCOMPILER"; then - { echo "$as_me:$LINENO: WARNING: $gcjaot not found, set with_jdk_home" >&5 -echo "$as_me: WARNING: $gcjaot not found, set with_jdk_home" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $gcjaot not found, set with_jdk_home" >&5 +$as_echo "$as_me: WARNING: $gcjaot not found, set with_jdk_home" >&2;} fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi fi @@ -10957,10 +12778,10 @@ fi # Extract the first word of "dmake", so it can be a program name with args. set dummy dmake; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_DMAKE+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $DMAKE in [\\/]* | ?:[\\/]*) @@ -10973,34 +12794,35 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_DMAKE="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_DMAKE" && ac_cv_path_DMAKE="no" ;; esac fi DMAKE=$ac_cv_path_DMAKE - if test -n "$DMAKE"; then - echo "$as_me:$LINENO: result: $DMAKE" >&5 -echo "${ECHO_T}$DMAKE" >&6 + { $as_echo "$as_me:$LINENO: result: $DMAKE" >&5 +$as_echo "$DMAKE" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + if test "$DMAKE" = "no"; then BUILD_DMAKE=YES echo "dmake will be built on ./bootstrap" else - echo "$as_me:$LINENO: checking whether the found dmake is the right dmake" >&5 -echo $ECHO_N "checking whether the found dmake is the right dmake... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking whether the found dmake is the right dmake" >&5 +$as_echo_n "checking whether the found dmake is the right dmake... " >&6; } # we need to find out whether that dmake we found is "our" dmake # or the dmake from Sun's SunStudio Compiler which is something # different @@ -11009,48 +12831,48 @@ echo $ECHO_N "checking whether the found dmake is the right dmake... $ECHO_C" >& $DMAKE -V 2>/dev/null | grep 'dmake .* Version .*' >/dev/null if test $? -eq 0; then BUILD_DMAKE=NO - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - echo "$as_me:$LINENO: checking the dmake version" >&5 -echo $ECHO_N "checking the dmake version... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + { $as_echo "$as_me:$LINENO: checking the dmake version" >&5 +$as_echo_n "checking the dmake version... " >&6; } DMAKE_VERSION=`$DMAKE -V | $AWK '$3 == "Version" {print $4}'` if test "`echo $DMAKE_VERSION | cut -d'.' -f1`" -gt "4"; then - echo "$as_me:$LINENO: result: OK, >= 4.11" >&5 -echo "${ECHO_T}OK, >= 4.11" >&6 + { $as_echo "$as_me:$LINENO: result: OK, >= 4.11" >&5 +$as_echo "OK, >= 4.11" >&6; } elif test "`echo $DMAKE_VERSION | cut -d'.' -f1`" = "4" && \ test "`echo $DMAKE_VERSION | cut -d'.' -f2`" -ge "11"; then - echo "$as_me:$LINENO: result: OK, >= 4.11" >&5 -echo "${ECHO_T}OK, >= 4.11" >&6 + { $as_echo "$as_me:$LINENO: result: OK, >= 4.11" >&5 +$as_echo "OK, >= 4.11" >&6; } else - echo "$as_me:$LINENO: result: too old. >= 4.11 is needed" >&5 -echo "${ECHO_T}too old. >= 4.11 is needed" >&6 + { $as_echo "$as_me:$LINENO: result: too old. >= 4.11 is needed" >&5 +$as_echo "too old. >= 4.11 is needed" >&6; } echo "A newer dmake will be built on ./bootstrap" BUILD_DMAKE=YES fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } echo "dmake will be built on ./bootstrap" BUILD_DMAKE=YES fi fi -echo "$as_me:$LINENO: checking whether to enable EPM for packing" >&5 -echo $ECHO_N "checking whether to enable EPM for packing... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to enable EPM for packing" >&5 +$as_echo_n "checking whether to enable EPM for packing... " >&6; } if test "$_os" != "WINNT" -a \( "z$enable_epm" = "z" -o "$enable_epm" != "no" \) ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } if test "$_os" != "WINNT"; then if test -n "$with_epm"; then EPM=$with_epm else # Extract the first word of "epm", so it can be a program name with args. set dummy epm; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_EPM+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $EPM in [\\/]* | ?:[\\/]*) @@ -11063,28 +12885,29 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_EPM="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_EPM" && ac_cv_path_EPM="no" ;; esac fi EPM=$ac_cv_path_EPM - if test -n "$EPM"; then - echo "$as_me:$LINENO: result: $EPM" >&5 -echo "${ECHO_T}$EPM" >&6 + { $as_echo "$as_me:$LINENO: result: $EPM" >&5 +$as_echo "$EPM" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test "$EPM" = "no" || test "$EPM" = "internal"; then echo "EPM will be built." @@ -11092,44 +12915,44 @@ fi BUILD_TYPE="$BUILD_TYPE EPM" else # Gentoo has some epm which is something different... - echo "$as_me:$LINENO: checking whether the found epm is the right epm" >&5 -echo $ECHO_N "checking whether the found epm is the right epm... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking whether the found epm is the right epm" >&5 +$as_echo_n "checking whether the found epm is the right epm... " >&6; } if $EPM | grep "ESP Package Manager" >/dev/null 2>/dev/null; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else - { { echo "$as_me:$LINENO: error: no. Install ESP Package Manager (www.easysw.com/epm) and/or specify the path to the right epm" >&5 -echo "$as_me: error: no. Install ESP Package Manager (www.easysw.com/epm) and/or specify the path to the right epm" >&2;} + { { $as_echo "$as_me:$LINENO: error: no. Install ESP Package Manager (www.easysw.com/epm) and/or specify the path to the right epm" >&5 +$as_echo "$as_me: error: no. Install ESP Package Manager (www.easysw.com/epm) and/or specify the path to the right epm" >&2;} { (exit 1); exit 1; }; } fi - echo "$as_me:$LINENO: checking epm version" >&5 -echo $ECHO_N "checking epm version... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking epm version" >&5 +$as_echo_n "checking epm version... " >&6; } EPM_VERSION=`$EPM | grep 'ESP Package Manager' | cut -d' ' -f4 | $SED -e s/v//` if test "`echo $EPM_VERSION | cut -d'.' -f1`" -gt "3" || \ test "`echo $EPM_VERSION | cut -d'.' -f1`" -eq "3" -a "`echo $EPM_VERSION | cut -d'.' -f2`" -ge "7"; then - echo "$as_me:$LINENO: result: OK, >= 3.7" >&5 -echo "${ECHO_T}OK, >= 3.7" >&6 + { $as_echo "$as_me:$LINENO: result: OK, >= 3.7" >&5 +$as_echo "OK, >= 3.7" >&6; } BUILD_EPM=NO if test "$_os" = "Darwin"; then - echo "$as_me:$LINENO: checking which PackageMaker EPM thinks to use" >&5 -echo $ECHO_N "checking which PackageMaker EPM thinks to use... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking which PackageMaker EPM thinks to use" >&5 +$as_echo_n "checking which PackageMaker EPM thinks to use... " >&6; } _pm=`strings $EPM | grep PackageMaker | cut -d" " -f1` if test "$_pm" = "/Developer/Applications/PackageMaker.app/Contents/MacOS/PackageMaker"; then - { { echo "$as_me:$LINENO: error: $_pm; PackageMaker expected in wrong path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" >&5 -echo "$as_me: error: $_pm; PackageMaker expected in wrong path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" >&2;} + { { $as_echo "$as_me:$LINENO: error: $_pm; PackageMaker expected in wrong path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" >&5 +$as_echo "$as_me: error: $_pm; PackageMaker expected in wrong path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" >&2;} { (exit 1); exit 1; }; } elif test "$_pm" = "/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker"; then - echo "$as_me:$LINENO: result: $_pm, ok" >&5 -echo "${ECHO_T}$_pm, ok" >&6 + { $as_echo "$as_me:$LINENO: result: $_pm, ok" >&5 +$as_echo "$_pm, ok" >&6; } else # we never should get here, but go safe - { { echo "$as_me:$LINENO: error: $_pm; PackageMaker expected in unknown path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" >&5 -echo "$as_me: error: $_pm; PackageMaker expected in unknown path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" >&2;} + { { $as_echo "$as_me:$LINENO: error: $_pm; PackageMaker expected in unknown path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" >&5 +$as_echo "$as_me: error: $_pm; PackageMaker expected in unknown path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" >&2;} { (exit 1); exit 1; }; } fi fi else - echo "$as_me:$LINENO: result: too old. epm >= 3.7 is required." >&5 -echo "${ECHO_T}too old. epm >= 3.7 is required." >&6 + { $as_echo "$as_me:$LINENO: result: too old. epm >= 3.7 is required." >&5 +$as_echo "too old. epm >= 3.7 is required." >&6; } echo "EPM will be built." BUILD_EPM=YES BUILD_TYPE="$BUILD_TYPE EPM" @@ -11138,8 +12961,8 @@ echo "${ECHO_T}too old. epm >= 3.7 is required." >&6 fi # test which package format to use - echo "$as_me:$LINENO: checking which package format to use" >&5 -echo $ECHO_N "checking which package format to use... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking which package format to use" >&5 +$as_echo_n "checking which package format to use... " >&6; } # epm supports the following formats: # aix - AIX software distribution # bsd - FreeBSD, NetBSD, or OpenBSD software distribution @@ -11187,8 +13010,8 @@ echo $ECHO_N "checking which package format to use... $ECHO_C" >&6 # we never should get here since we check the arciecture/os at the beginning, # but go sure... *) - { { echo "$as_me:$LINENO: error: unknown system" >&5 -echo "$as_me: error: unknown system" >&2;} + { { $as_echo "$as_me:$LINENO: error: unknown system" >&5 +$as_echo "$as_me: error: unknown system" >&2;} { (exit 1); exit 1; }; } esac if test -n "$with_package_format"; then @@ -11197,7 +13020,7 @@ echo "$as_me: error: unknown system" >&2;} aix | bsd | deb | inst | tardist | osx | pkg | rpm | setld | native | portable) ;; *) - { { echo "$as_me:$LINENO: error: unsupported format $i. Supported by EPM are: + { { $as_echo "$as_me:$LINENO: error: unsupported format $i. Supported by EPM are: aix - AIX software distribution bsd - FreeBSD, NetBSD, or OpenBSD software distribution depot or swinstall - HP-UX software distribution @@ -11210,7 +13033,7 @@ setld - Tru64 (setld) software distribution native - \"Native\" software distribution for the platform portable - Portable software distribution " >&5 -echo "$as_me: error: unsupported format $i. Supported by EPM are: +$as_echo "$as_me: error: unsupported format $i. Supported by EPM are: aix - AIX software distribution bsd - FreeBSD, NetBSD, or OpenBSD software distribution depot or swinstall - HP-UX software distribution @@ -11229,11 +13052,11 @@ portable - Portable software distribution done PKGFORMAT="$with_package_format" fi - echo "$as_me:$LINENO: result: $PKGFORMAT" >&5 -echo "${ECHO_T}$PKGFORMAT" >&6 + { $as_echo "$as_me:$LINENO: result: $PKGFORMAT" >&5 +$as_echo "$PKGFORMAT" >&6; } if echo "$PKGFORMAT" | $EGREP rpm 2>&1 >/dev/null; then - echo "$as_me:$LINENO: checking for rpm" >&5 -echo $ECHO_N "checking for rpm... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for rpm" >&5 +$as_echo_n "checking for rpm... " >&6; } for a in "$RPM" rpmbuild rpm; do $a --usage >/dev/null 2> /dev/null if test $? -eq 0; then @@ -11248,22 +13071,22 @@ echo $ECHO_N "checking for rpm... $ECHO_C" >&6 fi done if test -z "$RPM" ; then - { { echo "$as_me:$LINENO: error: not found" >&5 -echo "$as_me: error: not found" >&2;} + { { $as_echo "$as_me:$LINENO: error: not found" >&5 +$as_echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } else RPM_PATH=`which $RPM` - echo "$as_me:$LINENO: result: $RPM_PATH" >&5 -echo "${ECHO_T}$RPM_PATH" >&6 + { $as_echo "$as_me:$LINENO: result: $RPM_PATH" >&5 +$as_echo "$RPM_PATH" >&6; } fi fi if echo "$PKGFORMAT" | $EGREP deb 2>&1 >/dev/null; then # Extract the first word of "dpkg", so it can be a program name with args. set dummy dpkg; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_DPKG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $DPKG in [\\/]* | ?:[\\/]*) @@ -11276,49 +13099,50 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_DPKG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_DPKG" && ac_cv_path_DPKG="no" ;; esac fi DPKG=$ac_cv_path_DPKG - if test -n "$DPKG"; then - echo "$as_me:$LINENO: result: $DPKG" >&5 -echo "${ECHO_T}$DPKG" >&6 + { $as_echo "$as_me:$LINENO: result: $DPKG" >&5 +$as_echo "$DPKG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + if test "$DPKG" = "no"; then - { { echo "$as_me:$LINENO: error: dpkg needed for deb creation. Install dpkg." >&5 -echo "$as_me: error: dpkg needed for deb creation. Install dpkg." >&2;} + { { $as_echo "$as_me:$LINENO: error: dpkg needed for deb creation. Install dpkg." >&5 +$as_echo "$as_me: error: dpkg needed for deb creation. Install dpkg." >&2;} { (exit 1); exit 1; }; } fi fi if echo "PKGFORMAT" | $EGREP osx 2>&1 >/dev/null; then if test "$_os" = "Darwin"; then - echo "$as_me:$LINENO: checking for PackageMaker availability" >&5 -echo $ECHO_N "checking for PackageMaker availability... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for PackageMaker availability" >&5 +$as_echo_n "checking for PackageMaker availability... " >&6; } if ! test -x /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker; then - { { echo "$as_me:$LINENO: error: not installed. Please install Apples Dev Tools" >&5 -echo "$as_me: error: not installed. Please install Apples Dev Tools" >&2;} + { { $as_echo "$as_me:$LINENO: error: not installed. Please install Apples Dev Tools" >&5 +$as_echo "$as_me: error: not installed. Please install Apples Dev Tools" >&2;} { (exit 1); exit 1; }; } else - echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6 + { $as_echo "$as_me:$LINENO: result: ok" >&5 +$as_echo "ok" >&6; } fi else - { { echo "$as_me:$LINENO: error: PackageMaker needed to build OSX packages and you are not on OSX..." >&5 -echo "$as_me: error: PackageMaker needed to build OSX packages and you are not on OSX..." >&2;} + { { $as_echo "$as_me:$LINENO: error: PackageMaker needed to build OSX packages and you are not on OSX..." >&5 +$as_echo "$as_me: error: PackageMaker needed to build OSX packages and you are not on OSX..." >&2;} { (exit 1); exit 1; }; } fi fi @@ -11326,30 +13150,30 @@ echo "$as_me: error: PackageMaker needed to build OSX packages and you are not o echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then if test "$EPM" != "no" && test "$EPM" != "internal"; then if test "`echo $EPM_VERSION | cut -d'.' -f1`" -lt "4"; then - echo "$as_me:$LINENO: checking whether epm is patched for OOos needs" >&5 -echo $ECHO_N "checking whether epm is patched for OOos needs... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking whether epm is patched for OOos needs" >&5 +$as_echo_n "checking whether epm is patched for OOos needs... " >&6; } if grep "Patched for OpenOffice.org" $EPM >/dev/null 2>/dev/null; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } if echo "$PKGFORMAT" | grep -q rpm; then _pt="rpm" - { echo "$as_me:$LINENO: WARNING: the rpms will need to be installed with --nodeps" >&5 -echo "$as_me: WARNING: the rpms will need to be installed with --nodeps" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: the rpms will need to be installed with --nodeps" >&5 +$as_echo "$as_me: WARNING: the rpms will need to be installed with --nodeps" >&2;} echo "the rpms will need to be installed with --nodeps" >> warn else _pt="pkg" fi - { echo "$as_me:$LINENO: WARNING: the ${_pt}s will not be relocateable" >&5 -echo "$as_me: WARNING: the ${_pt}s will not be relocateable" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: the ${_pt}s will not be relocateable" >&5 +$as_echo "$as_me: WARNING: the ${_pt}s will not be relocateable" >&2;} echo "the ${_pt}s will not be relocateable" >> warn - { echo "$as_me:$LINENO: WARNING: if you want to make sure installation without --nodeps and + { $as_echo "$as_me:$LINENO: WARNING: if you want to make sure installation without --nodeps and relocation will work, you need to patch your epm with the patch in epm/epm-3.7.patch or build with --with-epm=internal which will build a suitable epm" >&5 -echo "$as_me: WARNING: if you want to make sure installation without --nodeps and +$as_echo "$as_me: WARNING: if you want to make sure installation without --nodeps and relocation will work, you need to patch your epm with the patch in epm/epm-3.7.patch or build with --with-epm=internal which will build a suitable epm" >&2;} @@ -11360,10 +13184,10 @@ echo "$as_me: WARNING: if you want to make sure installation without --nodeps an if echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then # Extract the first word of "pkgmk", so it can be a program name with args. set dummy pkgmk; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_PKGMK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $PKGMK in [\\/]* | ?:[\\/]*) @@ -11376,31 +13200,32 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKGMK="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_PKGMK" && ac_cv_path_PKGMK="no" ;; esac fi PKGMK=$ac_cv_path_PKGMK - if test -n "$PKGMK"; then - echo "$as_me:$LINENO: result: $PKGMK" >&5 -echo "${ECHO_T}$PKGMK" >&6 + { $as_echo "$as_me:$LINENO: result: $PKGMK" >&5 +$as_echo "$PKGMK" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + if test "$PKGMK" = "no"; then - { { echo "$as_me:$LINENO: error: pkgmk needed for Solaris pkg creation. Install it." >&5 -echo "$as_me: error: pkgmk needed for Solaris pkg creation. Install it." >&2;} + { { $as_echo "$as_me:$LINENO: error: pkgmk needed for Solaris pkg creation. Install it." >&5 +$as_echo "$as_me: error: pkgmk needed for Solaris pkg creation. Install it." >&2;} { (exit 1); exit 1; }; } fi fi @@ -11410,18 +13235,18 @@ echo "$as_me: error: pkgmk needed for Solaris pkg creation. Install it." >&2;} else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } EPM=NO fi # Extract the first word of "gperf", so it can be a program name with args. set dummy gperf; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_GPERF+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $GPERF in [\\/]* | ?:[\\/]*) @@ -11434,77 +13259,78 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GPERF="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi GPERF=$ac_cv_path_GPERF - if test -n "$GPERF"; then - echo "$as_me:$LINENO: result: $GPERF" >&5 -echo "${ECHO_T}$GPERF" >&6 + { $as_echo "$as_me:$LINENO: result: $GPERF" >&5 +$as_echo "$GPERF" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + if test -z "$GPERF"; then - { { echo "$as_me:$LINENO: error: gperf not found but needed. Install it." >&5 -echo "$as_me: error: gperf not found but needed. Install it." >&2;} + { { $as_echo "$as_me:$LINENO: error: gperf not found but needed. Install it." >&5 +$as_echo "$as_me: error: gperf not found but needed. Install it." >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:$LINENO: checking gperf version" >&5 -echo $ECHO_N "checking gperf version... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking gperf version" >&5 +$as_echo_n "checking gperf version... " >&6; } if test "`$GPERF --version | $EGREP ^GNU\ gperf | $AWK '{ print $3 }' | cut -d. -f1`" -ge "3"; then - echo "$as_me:$LINENO: result: OK" >&5 -echo "${ECHO_T}OK" >&6 + { $as_echo "$as_me:$LINENO: result: OK" >&5 +$as_echo "OK" >&6; } else - { { echo "$as_me:$LINENO: error: too old, you need at least 3.0.0" >&5 -echo "$as_me: error: too old, you need at least 3.0.0" >&2;} + { { $as_echo "$as_me:$LINENO: error: too old, you need at least 3.0.0" >&5 +$as_echo "$as_me: error: too old, you need at least 3.0.0" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:$LINENO: checking whether to build the ODK" >&5 -echo $ECHO_N "checking whether to build the ODK... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to build the ODK" >&5 +$as_echo_n "checking whether to build the ODK... " >&6; } if test "z$enable_odk" = "z" -o "$enable_odk" != "no"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } if test "$WITH_JAVA" != "no"; then - echo "$as_me:$LINENO: checking for external/unowinreg/unowinreg.dll" >&5 -echo $ECHO_N "checking for external/unowinreg/unowinreg.dll... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for external/unowinreg/unowinreg.dll" >&5 +$as_echo_n "checking for external/unowinreg/unowinreg.dll... " >&6; } if ! test -f "./external/unowinreg/unowinreg.dll"; then HAVE_UNOWINREG_DLL=no else HAVE_UNOWINREG_DLL=yes fi if test "$HAVE_UNOWINREG_DLL" = "yes"; then - echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6 + { $as_echo "$as_me:$LINENO: result: found" >&5 +$as_echo "found" >&6; } BUILD_UNOWINREG=NO else if test "$_os" = "WINNT"; then - echo "$as_me:$LINENO: result: not found, will be built" >&5 -echo "${ECHO_T}not found, will be built" >&6 + { $as_echo "$as_me:$LINENO: result: not found, will be built" >&5 +$as_echo "not found, will be built" >&6; } else - { echo "$as_me:$LINENO: WARNING: not found, will be cross-built using mingw32" >&5 -echo "$as_me: WARNING: not found, will be cross-built using mingw32" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: not found, will be cross-built using mingw32" >&5 +$as_echo "$as_me: WARNING: not found, will be cross-built using mingw32" >&2;} fi BUILD_UNOWINREG=YES fi if test "$_os" != "WINNT" && test "$BUILD_UNOWINREG" = "YES"; then if test -z "$WITH_MINGWIN" || test "$WITH_MINGWIN" = "0"; then - { { echo "$as_me:$LINENO: error: for rebuilding unowinreg.dll you need the mingw32 C++ compiler. + { { $as_echo "$as_me:$LINENO: error: for rebuilding unowinreg.dll you need the mingw32 C++ compiler. Specify mingw32 g++ executable name with --with-mingwin. Or use prebuilt one from http://tools.openoffice.org/unowinreg_prebuild/680/ and put it into external/unowinreg" >&5 -echo "$as_me: error: for rebuilding unowinreg.dll you need the mingw32 C++ compiler. +$as_echo "$as_me: error: for rebuilding unowinreg.dll you need the mingw32 C++ compiler. Specify mingw32 g++ executable name with --with-mingwin. Or use prebuilt one from http://tools.openoffice.org/unowinreg_prebuild/680/ and put it into external/unowinreg" >&2;} @@ -11516,10 +13342,10 @@ echo "$as_me: error: for rebuilding unowinreg.dll you need the mingw32 C++ compi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}$WITH_MINGWIN", so it can be a program name with args. set dummy ${ac_tool_prefix}$WITH_MINGWIN; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_MINGWCXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$MINGWCXX"; then ac_cv_prog_MINGWCXX="$MINGWCXX" # Let the user override the test. @@ -11530,34 +13356,36 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_MINGWCXX="${ac_tool_prefix}$WITH_MINGWIN" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi MINGWCXX=$ac_cv_prog_MINGWCXX if test -n "$MINGWCXX"; then - echo "$as_me:$LINENO: result: $MINGWCXX" >&5 -echo "${ECHO_T}$MINGWCXX" >&6 + { $as_echo "$as_me:$LINENO: result: $MINGWCXX" >&5 +$as_echo "$MINGWCXX" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test -z "$ac_cv_prog_MINGWCXX"; then ac_ct_MINGWCXX=$MINGWCXX # Extract the first word of "$WITH_MINGWIN", so it can be a program name with args. set dummy $WITH_MINGWIN; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_ac_ct_MINGWCXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_MINGWCXX"; then ac_cv_prog_ac_ct_MINGWCXX="$ac_ct_MINGWCXX" # Let the user override the test. @@ -11568,46 +13396,56 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + 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_MINGWCXX="$WITH_MINGWIN" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_MINGWCXX" && ac_cv_prog_ac_ct_MINGWCXX="false" fi fi ac_ct_MINGWCXX=$ac_cv_prog_ac_ct_MINGWCXX if test -n "$ac_ct_MINGWCXX"; then - echo "$as_me:$LINENO: result: $ac_ct_MINGWCXX" >&5 -echo "${ECHO_T}$ac_ct_MINGWCXX" >&6 + { $as_echo "$as_me:$LINENO: result: $ac_ct_MINGWCXX" >&5 +$as_echo "$ac_ct_MINGWCXX" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi - MINGWCXX=$ac_ct_MINGWCXX + if test "x$ac_ct_MINGWCXX" = x; then + MINGWCXX="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + MINGWCXX=$ac_ct_MINGWCXX + fi else MINGWCXX="$ac_cv_prog_MINGWCXX" fi fi if test "$MINGWCXX" = "false"; then - { { echo "$as_me:$LINENO: error: specified MinGW32 C++ cross-compiler not found. Install it or correct name." >&5 -echo "$as_me: error: specified MinGW32 C++ cross-compiler not found. Install it or correct name." >&2;} + { { $as_echo "$as_me:$LINENO: error: specified MinGW32 C++ cross-compiler not found. Install it or correct name." >&5 +$as_echo "$as_me: error: specified MinGW32 C++ cross-compiler not found. Install it or correct name." >&2;} { (exit 1); exit 1; }; } fi - echo "$as_me:$LINENO: checking whether we are using the MinGW32 cross C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the MinGW32 cross C++ compiler... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking whether we are using the MinGW32 cross C++ compiler" >&5 +$as_echo_n "checking whether we are using the MinGW32 cross C++ compiler... " >&6; } if ! echo "`$MINGWCXX -dumpmachine`" | grep -q mingw32; then - { { echo "$as_me:$LINENO: error: no" >&5 -echo "$as_me: error: no" >&2;} + { { $as_echo "$as_me:$LINENO: error: no" >&5 +$as_echo "$as_me: error: no" >&2;} { (exit 1); exit 1; }; } else - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } fi if echo "$WITH_MINGWIN" | $EGREP -q "/"; then if ! test -x "`echo $WITH_MINGWIN | $SED -e s/g++/strip/`"; then MINGSTRIP=false; else MINGWSTRIP=$(basename $(echo $WITH_MINGWIN | $SED -e s/g++/strip/)); fi @@ -11615,10 +13453,10 @@ echo "${ECHO_T}yes" >&6 if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/`", so it can be a program name with args. set dummy ${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/`; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_MINGWSTRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$MINGWSTRIP"; then ac_cv_prog_MINGWSTRIP="$MINGWSTRIP" # Let the user override the test. @@ -11629,34 +13467,36 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_MINGWSTRIP="${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/`" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi MINGWSTRIP=$ac_cv_prog_MINGWSTRIP if test -n "$MINGWSTRIP"; then - echo "$as_me:$LINENO: result: $MINGWSTRIP" >&5 -echo "${ECHO_T}$MINGWSTRIP" >&6 + { $as_echo "$as_me:$LINENO: result: $MINGWSTRIP" >&5 +$as_echo "$MINGWSTRIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test -z "$ac_cv_prog_MINGWSTRIP"; then ac_ct_MINGWSTRIP=$MINGWSTRIP # Extract the first word of "`echo $WITH_MINGWIN | $SED -e s/g++/strip/`", so it can be a program name with args. set dummy `echo $WITH_MINGWIN | $SED -e s/g++/strip/`; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_ac_ct_MINGWSTRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_MINGWSTRIP"; then ac_cv_prog_ac_ct_MINGWSTRIP="$ac_ct_MINGWSTRIP" # Let the user override the test. @@ -11667,38 +13507,48 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + 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_MINGWSTRIP="`echo $WITH_MINGWIN | $SED -e s/g++/strip/`" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_MINGWSTRIP" && ac_cv_prog_ac_ct_MINGWSTRIP="false" fi fi ac_ct_MINGWSTRIP=$ac_cv_prog_ac_ct_MINGWSTRIP if test -n "$ac_ct_MINGWSTRIP"; then - echo "$as_me:$LINENO: result: $ac_ct_MINGWSTRIP" >&5 -echo "${ECHO_T}$ac_ct_MINGWSTRIP" >&6 + { $as_echo "$as_me:$LINENO: result: $ac_ct_MINGWSTRIP" >&5 +$as_echo "$ac_ct_MINGWSTRIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi - MINGWSTRIP=$ac_ct_MINGWSTRIP + if test "x$ac_ct_MINGWSTRIP" = x; then + MINGWSTRIP="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + MINGWSTRIP=$ac_ct_MINGWSTRIP + fi else MINGWSTRIP="$ac_cv_prog_MINGWSTRIP" fi fi if test "$MINGWSTRIP" = "false"; then - { { echo "$as_me:$LINENO: error: MinGW32 binutils needed. Install them." >&5 -echo "$as_me: error: MinGW32 binutils needed. Install them." >&2;} + { { $as_echo "$as_me:$LINENO: error: MinGW32 binutils needed. Install them." >&5 +$as_echo "$as_me: error: MinGW32 binutils needed. Install them." >&2;} { (exit 1); exit 1; }; } fi - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -11717,15 +13567,14 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu save_LIBS=$LIBS LIBS="" -echo "$as_me:$LINENO: checking for main in -lkernel32" >&5 -echo $ECHO_N "checking for main in -lkernel32... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for main in -lkernel32" >&5 +$as_echo_n "checking for main in -lkernel32... " >&6; } if test "${ac_cv_lib_kernel32_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lkernel32 $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -11736,36 +13585,48 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -main (); +return main (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_kernel32_main=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_kernel32_main=no + ac_cv_lib_kernel32_main=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_kernel32_main" >&5 -echo "${ECHO_T}$ac_cv_lib_kernel32_main" >&6 -if test $ac_cv_lib_kernel32_main = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_kernel32_main" >&5 +$as_echo "$ac_cv_lib_kernel32_main" >&6; } +if test "x$ac_cv_lib_kernel32_main" = x""yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBKERNEL32 1 _ACEOF @@ -11776,15 +13637,14 @@ fi ac_cv_lib_kernel32=ac_cv_lib_kernel32_main -echo "$as_me:$LINENO: checking for main in -ladvapi32" >&5 -echo $ECHO_N "checking for main in -ladvapi32... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for main in -ladvapi32" >&5 +$as_echo_n "checking for main in -ladvapi32... " >&6; } if test "${ac_cv_lib_advapi32_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ladvapi32 $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -11795,36 +13655,48 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -main (); +return main (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_advapi32_main=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_advapi32_main=no + ac_cv_lib_advapi32_main=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_advapi32_main" >&5 -echo "${ECHO_T}$ac_cv_lib_advapi32_main" >&6 -if test $ac_cv_lib_advapi32_main = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_advapi32_main" >&5 +$as_echo "$ac_cv_lib_advapi32_main" >&6; } +if test "x$ac_cv_lib_advapi32_main" = x""yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBADVAPI32 1 _ACEOF @@ -11835,19 +13707,18 @@ fi ac_cv_lib_advapi32=ac_cv_lib_advapi32_main if test "${ac_cv_header_windows_h+set}" = set; then - echo "$as_me:$LINENO: checking for windows.h" >&5 -echo $ECHO_N "checking for windows.h... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for windows.h" >&5 +$as_echo_n "checking for windows.h... " >&6; } if test "${ac_cv_header_windows_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_windows_h" >&5 -echo "${ECHO_T}$ac_cv_header_windows_h" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_windows_h" >&5 +$as_echo "$ac_cv_header_windows_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking windows.h usability" >&5 -echo $ECHO_N "checking windows.h usability... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking windows.h usability" >&5 +$as_echo_n "checking windows.h usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -11857,33 +13728,39 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking windows.h presence" >&5 -echo $ECHO_N "checking windows.h presence... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking windows.h presence" >&5 +$as_echo_n "checking windows.h presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -11891,83 +13768,76 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) - { echo "$as_me:$LINENO: WARNING: windows.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: windows.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: windows.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: windows.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: windows.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: windows.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: windows.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: windows.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) - { echo "$as_me:$LINENO: WARNING: windows.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: windows.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: windows.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: windows.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: windows.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: windows.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: windows.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: windows.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: windows.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: windows.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: windows.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: windows.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: windows.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: windows.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: windows.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: windows.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: windows.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: windows.h: in the future, the compiler will take precedence" >&2;} + ;; esac -echo "$as_me:$LINENO: checking for windows.h" >&5 -echo $ECHO_N "checking for windows.h... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for windows.h" >&5 +$as_echo_n "checking for windows.h... " >&6; } if test "${ac_cv_header_windows_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_cv_header_windows_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_windows_h" >&5 -echo "${ECHO_T}$ac_cv_header_windows_h" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_windows_h" >&5 +$as_echo "$ac_cv_header_windows_h" >&6; } fi -if test $ac_cv_header_windows_h = yes; then +if test "x$ac_cv_header_windows_h" = x""yes; then : else - { { echo "$as_me:$LINENO: error: windows.h missing" >&5 -echo "$as_me: error: windows.h missing" >&2;} + { { $as_echo "$as_me:$LINENO: error: windows.h missing" >&5 +$as_echo "$as_me: error: windows.h missing" >&2;} { (exit 1); exit 1; }; } fi @@ -11987,47 +13857,47 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi BUILD_TYPE="$BUILD_TYPE ODK" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } BUILD_UNOWINREG=NO fi -echo "$as_me:$LINENO: checking whether to build qadevOOo" >&5 -echo $ECHO_N "checking whether to build qadevOOo... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to build qadevOOo" >&5 +$as_echo_n "checking whether to build qadevOOo... " >&6; } if test "z$enable_qadevooo" = "z" -o "$enable_qadevooo" != "no"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } BUILD_QADEVOOO="YES" BUILD_TYPE="$BUILD_TYPE QADEVOOO" else BUILD_QADEVOOO="NO" - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi if test -z "$with_system_stdlibs" -a -z "$with_system_libs"; then if test -n "$checkforprelink" -a -f /etc/rpm/macros.prelink; then with_system_stdlibs=yes - { echo "$as_me:$LINENO: WARNING: prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >&5 -echo "$as_me: WARNING: prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >&5 +$as_echo "$as_me: WARNING: prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >&2;} echo "prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >> warn fi fi -echo "$as_me:$LINENO: checking whether to provide libstdc++/libgcc_s in the installset" >&5 -echo $ECHO_N "checking whether to provide libstdc++/libgcc_s in the installset... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to provide libstdc++/libgcc_s in the installset" >&5 +$as_echo_n "checking whether to provide libstdc++/libgcc_s in the installset... " >&6; } if test -n "$with_system_stdlibs" -o -n "$with_system_libs" && \ test "$with_system_stdlibs" != "no"; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } SYSTEM_STDLIBS=YES else - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } SYSTEM_STDLIBS=NO fi @@ -12035,27 +13905,26 @@ fi if test "$_os" = "Darwin" && test "$with_system_zlib" != "no"; then with_system_zlib=yes fi -echo "$as_me:$LINENO: checking which zlib to use" >&5 -echo $ECHO_N "checking which zlib to use... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking which zlib to use" >&5 +$as_echo_n "checking which zlib to use... " >&6; } if test -n "$with_system_zlib" -o -n "$with_system_libs" && \ test "$with_system_zlib" != "no"; then - echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6 + { $as_echo "$as_me:$LINENO: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_ZLIB=YES if test "${ac_cv_header_zlib_h+set}" = set; then - echo "$as_me:$LINENO: checking for zlib.h" >&5 -echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for zlib.h" >&5 +$as_echo_n "checking for zlib.h... " >&6; } if test "${ac_cv_header_zlib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 -echo "${ECHO_T}$ac_cv_header_zlib_h" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 +$as_echo "$ac_cv_header_zlib_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking zlib.h usability" >&5 -echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking zlib.h usability" >&5 +$as_echo_n "checking zlib.h usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -12065,33 +13934,39 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking zlib.h presence" >&5 -echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking zlib.h presence" >&5 +$as_echo_n "checking zlib.h presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -12099,178 +13974,181 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) - { echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) - { echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;} + ;; esac -echo "$as_me:$LINENO: checking for zlib.h" >&5 -echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for zlib.h" >&5 +$as_echo_n "checking for zlib.h... " >&6; } if test "${ac_cv_header_zlib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_cv_header_zlib_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 -echo "${ECHO_T}$ac_cv_header_zlib_h" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 +$as_echo "$ac_cv_header_zlib_h" >&6; } fi -if test $ac_cv_header_zlib_h = yes; then +if test "x$ac_cv_header_zlib_h" = x""yes; then : else - { { echo "$as_me:$LINENO: error: zlib.h not found. install zlib" >&5 -echo "$as_me: error: zlib.h not found. install zlib" >&2;} + { { $as_echo "$as_me:$LINENO: error: zlib.h not found. install zlib" >&5 +$as_echo "$as_me: error: zlib.h not found. install zlib" >&2;} { (exit 1); exit 1; }; } fi - echo "$as_me:$LINENO: checking for deflate in -lz" >&5 -echo $ECHO_N "checking for deflate in -lz... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for deflate in -lz" >&5 +$as_echo_n "checking for deflate in -lz... " >&6; } if test "${ac_cv_lib_z_deflate+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lz $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char deflate (); int main () { -deflate (); +return deflate (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_z_deflate=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_z_deflate=no + ac_cv_lib_z_deflate=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_z_deflate" >&5 -echo "${ECHO_T}$ac_cv_lib_z_deflate" >&6 -if test $ac_cv_lib_z_deflate = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_deflate" >&5 +$as_echo "$ac_cv_lib_z_deflate" >&6; } +if test "x$ac_cv_lib_z_deflate" = x""yes; then ZLIB=-lz else - { { echo "$as_me:$LINENO: error: zlib not found or functional" >&5 -echo "$as_me: error: zlib not found or functional" >&2;} + { { $as_echo "$as_me:$LINENO: error: zlib not found or functional" >&5 +$as_echo "$as_me: error: zlib not found or functional" >&2;} { (exit 1); exit 1; }; } fi else - echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6 + { $as_echo "$as_me:$LINENO: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_ZLIB=NO BUILD_TYPE="$BUILD_TYPE ZLIB" fi -echo "$as_me:$LINENO: checking which jpeg to use" >&5 -echo $ECHO_N "checking which jpeg to use... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking which jpeg to use" >&5 +$as_echo_n "checking which jpeg to use... " >&6; } if test -n "$with_system_jpeg" -o -n "$with_system_libs" && \ test "$with_system_jpeg" != "no"; then - echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6 + { $as_echo "$as_me:$LINENO: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_JPEG=YES if test "${ac_cv_header_jpeglib_h+set}" = set; then - echo "$as_me:$LINENO: checking for jpeglib.h" >&5 -echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for jpeglib.h" >&5 +$as_echo_n "checking for jpeglib.h... " >&6; } if test "${ac_cv_header_jpeglib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5 -echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5 +$as_echo "$ac_cv_header_jpeglib_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking jpeglib.h usability" >&5 -echo $ECHO_N "checking jpeglib.h usability... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking jpeglib.h usability" >&5 +$as_echo_n "checking jpeglib.h usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -12280,33 +14158,39 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking jpeglib.h presence" >&5 -echo $ECHO_N "checking jpeglib.h presence... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking jpeglib.h presence" >&5 +$as_echo_n "checking jpeglib.h presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -12314,177 +14198,180 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) - { echo "$as_me:$LINENO: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: jpeglib.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) - { echo "$as_me:$LINENO: WARNING: jpeglib.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: jpeglib.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: jpeglib.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: jpeglib.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: jpeglib.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: jpeglib.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: jpeglib.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&2;} + ;; esac -echo "$as_me:$LINENO: checking for jpeglib.h" >&5 -echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for jpeglib.h" >&5 +$as_echo_n "checking for jpeglib.h... " >&6; } if test "${ac_cv_header_jpeglib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_cv_header_jpeglib_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5 -echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5 +$as_echo "$ac_cv_header_jpeglib_h" >&6; } fi -if test $ac_cv_header_jpeglib_h = yes; then +if test "x$ac_cv_header_jpeglib_h" = x""yes; then : else - { { echo "$as_me:$LINENO: error: jpeg.h not found. install libjpeg" >&5 -echo "$as_me: error: jpeg.h not found. install libjpeg" >&2;} + { { $as_echo "$as_me:$LINENO: error: jpeg.h not found. install libjpeg" >&5 +$as_echo "$as_me: error: jpeg.h not found. install libjpeg" >&2;} { (exit 1); exit 1; }; } fi - echo "$as_me:$LINENO: checking for jpeg_resync_to_restart in -ljpeg" >&5 -echo $ECHO_N "checking for jpeg_resync_to_restart in -ljpeg... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for jpeg_resync_to_restart in -ljpeg" >&5 +$as_echo_n "checking for jpeg_resync_to_restart in -ljpeg... " >&6; } if test "${ac_cv_lib_jpeg_jpeg_resync_to_restart+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ljpeg $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char jpeg_resync_to_restart (); int main () { -jpeg_resync_to_restart (); +return jpeg_resync_to_restart (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_jpeg_jpeg_resync_to_restart=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_jpeg_jpeg_resync_to_restart=no + ac_cv_lib_jpeg_jpeg_resync_to_restart=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_resync_to_restart" >&5 -echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_resync_to_restart" >&6 -if test $ac_cv_lib_jpeg_jpeg_resync_to_restart = yes; then +{ $as_echo "$as_me:$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" = x""yes; then JPEG3RDLIB=-ljpeg else - echo "$as_me:$LINENO: checking jpeg library not found or fuctional" >&5 -echo $ECHO_N "checking jpeg library not found or fuctional... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking jpeg library not found or fuctional" >&5 +$as_echo_n "checking jpeg library not found or fuctional... " >&6; } fi else - echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6 + { $as_echo "$as_me:$LINENO: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_JPEG=NO BUILD_TYPE="$BUILD_TYPE JPEG" fi -echo "$as_me:$LINENO: checking which expat to use" >&5 -echo $ECHO_N "checking which expat to use... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking which expat to use" >&5 +$as_echo_n "checking which expat to use... " >&6; } if test -n "$with_system_expat" -o -n "$with_system_libs" && \ test "$with_system_expat" != "no"; then - echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6 + { $as_echo "$as_me:$LINENO: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_EXPAT=YES if test "${ac_cv_header_expat_h+set}" = set; then - echo "$as_me:$LINENO: checking for expat.h" >&5 -echo $ECHO_N "checking for expat.h... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for expat.h" >&5 +$as_echo_n "checking for expat.h... " >&6; } if test "${ac_cv_header_expat_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5 -echo "${ECHO_T}$ac_cv_header_expat_h" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5 +$as_echo "$ac_cv_header_expat_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking expat.h usability" >&5 -echo $ECHO_N "checking expat.h usability... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking expat.h usability" >&5 +$as_echo_n "checking expat.h usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -12494,33 +14381,39 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking expat.h presence" >&5 -echo $ECHO_N "checking expat.h presence... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking expat.h presence" >&5 +$as_echo_n "checking expat.h presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -12528,143 +14421,147 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) - { echo "$as_me:$LINENO: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: expat.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: expat.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) - { echo "$as_me:$LINENO: WARNING: expat.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: expat.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: expat.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: expat.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: expat.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: expat.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: expat.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: expat.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: expat.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: expat.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: expat.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: expat.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: expat.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: expat.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: expat.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: expat.h: in the future, the compiler will take precedence" >&2;} + ;; esac -echo "$as_me:$LINENO: checking for expat.h" >&5 -echo $ECHO_N "checking for expat.h... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for expat.h" >&5 +$as_echo_n "checking for expat.h... " >&6; } if test "${ac_cv_header_expat_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_cv_header_expat_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5 -echo "${ECHO_T}$ac_cv_header_expat_h" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5 +$as_echo "$ac_cv_header_expat_h" >&6; } fi -if test $ac_cv_header_expat_h = yes; then +if test "x$ac_cv_header_expat_h" = x""yes; then : else - { { echo "$as_me:$LINENO: error: expat.h not found. install expat" >&5 -echo "$as_me: error: expat.h not found. install expat" >&2;} + { { $as_echo "$as_me:$LINENO: error: expat.h not found. install expat" >&5 +$as_echo "$as_me: error: expat.h not found. install expat" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:$LINENO: checking for XML_ParserCreate in -lexpat" >&5 -echo $ECHO_N "checking for XML_ParserCreate in -lexpat... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for XML_ParserCreate in -lexpat" >&5 +$as_echo_n "checking for XML_ParserCreate in -lexpat... " >&6; } if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lexpat $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char XML_ParserCreate (); int main () { -XML_ParserCreate (); +return XML_ParserCreate (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_expat_XML_ParserCreate=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_expat_XML_ParserCreate=no + ac_cv_lib_expat_XML_ParserCreate=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_expat_XML_ParserCreate" >&5 -echo "${ECHO_T}$ac_cv_lib_expat_XML_ParserCreate" >&6 -if test $ac_cv_lib_expat_XML_ParserCreate = yes; then +{ $as_echo "$as_me:$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" = x""yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBEXPAT 1 _ACEOF @@ -12672,24 +14569,24 @@ _ACEOF LIBS="-lexpat $LIBS" else - echo "$as_me:$LINENO: result: expat library not found or functional." >&5 -echo "${ECHO_T}expat library not found or functional." >&6 + { $as_echo "$as_me:$LINENO: result: expat library not found or functional." >&5 +$as_echo "expat library not found or functional." >&6; } fi else - echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6 + { $as_echo "$as_me:$LINENO: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_EXPAT=NO BUILD_TYPE="$BUILD_TYPE EXPAT" fi -echo "$as_me:$LINENO: checking which libwpd to use" >&5 -echo $ECHO_N "checking which libwpd to use... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking which libwpd to use" >&5 +$as_echo_n "checking which libwpd to use... " >&6; } if test -n "$with_system_libwpd" -o -n "$with_system_libs" && \ test "$with_system_libwpd" != "no"; then - echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6 + { $as_echo "$as_me:$LINENO: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_LIBWPD=YES succeeded=no @@ -12697,10 +14594,10 @@ echo "${ECHO_T}external" >&6 if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -12713,28 +14610,29 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test "$PKG_CONFIG" = "no" ; then @@ -12745,25 +14643,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for libwpd-0.8 " >&5 -echo $ECHO_N "checking for libwpd-0.8 ... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for libwpd-0.8 " >&5 +$as_echo_n "checking for libwpd-0.8 ... " >&6; } if $PKG_CONFIG --exists "libwpd-0.8 " ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } succeeded=yes - echo "$as_me:$LINENO: checking LIBWPD_CFLAGS" >&5 -echo $ECHO_N "checking LIBWPD_CFLAGS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking LIBWPD_CFLAGS" >&5 +$as_echo_n "checking LIBWPD_CFLAGS... " >&6; } LIBWPD_CFLAGS=`$PKG_CONFIG --cflags "libwpd-0.8 "` - echo "$as_me:$LINENO: result: $LIBWPD_CFLAGS" >&5 -echo "${ECHO_T}$LIBWPD_CFLAGS" >&6 + { $as_echo "$as_me:$LINENO: result: $LIBWPD_CFLAGS" >&5 +$as_echo "$LIBWPD_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking LIBWPD_LIBS" >&5 -echo $ECHO_N "checking LIBWPD_LIBS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking LIBWPD_LIBS" >&5 +$as_echo_n "checking LIBWPD_LIBS... " >&6; } LIBWPD_LIBS=`$PKG_CONFIG --libs "libwpd-0.8 "` - echo "$as_me:$LINENO: result: $LIBWPD_LIBS" >&5 -echo "${ECHO_T}$LIBWPD_LIBS" >&6 + { $as_echo "$as_me:$LINENO: result: $LIBWPD_LIBS" >&5 +$as_echo "$LIBWPD_LIBS" >&6; } else LIBWPD_CFLAGS="" LIBWPD_LIBS="" @@ -12784,14 +14682,14 @@ echo "${ECHO_T}$LIBWPD_LIBS" >&6 if test $succeeded = yes; then : else - { { echo "$as_me:$LINENO: error: Library requirements (libwpd-0.8 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -echo "$as_me: error: Library requirements (libwpd-0.8 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { { $as_echo "$as_me:$LINENO: error: Library requirements (libwpd-0.8 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +$as_echo "$as_me: error: Library requirements (libwpd-0.8 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi else - echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6 + { $as_echo "$as_me:$LINENO: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_LIBWPD=NO BUILD_TYPE="$BUILD_TYPE LIBWPD" fi @@ -12800,18 +14698,18 @@ fi if test "$test_freetype" = "yes"; then - echo "$as_me:$LINENO: checking whether freetype is available" >&5 -echo $ECHO_N "checking whether freetype is available... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking whether freetype is available" >&5 +$as_echo_n "checking whether freetype is available... " >&6; } succeeded=no if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -12824,28 +14722,29 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test "$PKG_CONFIG" = "no" ; then @@ -12856,25 +14755,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for freetype2 >= 2.0 " >&5 -echo $ECHO_N "checking for freetype2 >= 2.0 ... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for freetype2 >= 2.0 " >&5 +$as_echo_n "checking for freetype2 >= 2.0 ... " >&6; } if $PKG_CONFIG --exists "freetype2 >= 2.0 " ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } succeeded=yes - echo "$as_me:$LINENO: checking FREETYPE_CFLAGS" >&5 -echo $ECHO_N "checking FREETYPE_CFLAGS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking FREETYPE_CFLAGS" >&5 +$as_echo_n "checking FREETYPE_CFLAGS... " >&6; } FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2 >= 2.0 "` - echo "$as_me:$LINENO: result: $FREETYPE_CFLAGS" >&5 -echo "${ECHO_T}$FREETYPE_CFLAGS" >&6 + { $as_echo "$as_me:$LINENO: result: $FREETYPE_CFLAGS" >&5 +$as_echo "$FREETYPE_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking FREETYPE_LIBS" >&5 -echo $ECHO_N "checking FREETYPE_LIBS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking FREETYPE_LIBS" >&5 +$as_echo_n "checking FREETYPE_LIBS... " >&6; } FREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2 >= 2.0 "` - echo "$as_me:$LINENO: result: $FREETYPE_LIBS" >&5 -echo "${ECHO_T}$FREETYPE_LIBS" >&6 + { $as_echo "$as_me:$LINENO: result: $FREETYPE_LIBS" >&5 +$as_echo "$FREETYPE_LIBS" >&6; } else FREETYPE_CFLAGS="" FREETYPE_LIBS="" @@ -12895,8 +14794,8 @@ echo "${ECHO_T}$FREETYPE_LIBS" >&6 if test $succeeded = yes; then : else - { { echo "$as_me:$LINENO: error: Library requirements (freetype2 >= 2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -echo "$as_me: error: Library requirements (freetype2 >= 2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { { $as_echo "$as_me:$LINENO: error: Library requirements (freetype2 >= 2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +$as_echo "$as_me: error: Library requirements (freetype2 >= 2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi @@ -12910,61 +14809,72 @@ if test "$test_freetype" = "yes"; then save_LIBS="$LIBS" CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS" LDFLAGS="$LDFLAGS $FREETYPE_LIBS" - echo "$as_me:$LINENO: checking for FT_GlyphSlot_Embolden in -lfreetype" >&5 -echo $ECHO_N "checking for FT_GlyphSlot_Embolden in -lfreetype... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for FT_GlyphSlot_Embolden in -lfreetype" >&5 +$as_echo_n "checking for FT_GlyphSlot_Embolden in -lfreetype... " >&6; } if test "${ac_cv_lib_freetype_FT_GlyphSlot_Embolden+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lfreetype $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char FT_GlyphSlot_Embolden (); int main () { -FT_GlyphSlot_Embolden (); +return FT_GlyphSlot_Embolden (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_freetype_FT_GlyphSlot_Embolden=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_freetype_FT_GlyphSlot_Embolden=no + ac_cv_lib_freetype_FT_GlyphSlot_Embolden=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_freetype_FT_GlyphSlot_Embolden" >&5 -echo "${ECHO_T}$ac_cv_lib_freetype_FT_GlyphSlot_Embolden" >&6 -if test $ac_cv_lib_freetype_FT_GlyphSlot_Embolden = yes; then +{ $as_echo "$as_me:$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" = x""yes; then USE_FT_EMBOLDEN="YES" else USE_FT_EMBOLDEN="NO" @@ -12997,26 +14907,26 @@ if test -n "$with_system_libxml" -o -n "$with_system_libs" && \ fi fi -echo "$as_me:$LINENO: checking which libxslt to use" >&5 -echo $ECHO_N "checking which libxslt to use... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking which libxslt to use" >&5 +$as_echo_n "checking which libxslt to use... " >&6; } if test -n "$with_system_libxslt" -o -n "$with_system_libs" -o \ "$_os" = "Darwin" && \ test "$with_system_libxslt" != "no"; then - echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6 + { $as_echo "$as_me:$LINENO: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_LIBXSLT=YES if test "$_os" = "Darwin"; then - echo "$as_me:$LINENO: checking LIBXSLT_CFLAGS" >&5 -echo $ECHO_N "checking LIBXSLT_CFLAGS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking LIBXSLT_CFLAGS" >&5 +$as_echo_n "checking LIBXSLT_CFLAGS... " >&6; } LIBXSLT_CFLAGS=`xslt-config --cflags` - echo "$as_me:$LINENO: result: $LIBXSLT_CFLAGS" >&5 -echo "${ECHO_T}$LIBXSLT_CFLAGS" >&6 - echo "$as_me:$LINENO: checking LIBXSLT_LIBS" >&5 -echo $ECHO_N "checking LIBXSLT_LIBS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: result: $LIBXSLT_CFLAGS" >&5 +$as_echo "$LIBXSLT_CFLAGS" >&6; } + { $as_echo "$as_me:$LINENO: checking LIBXSLT_LIBS" >&5 +$as_echo_n "checking LIBXSLT_LIBS... " >&6; } LIBXSLT_LIBS=`xslt-config --libs` - echo "$as_me:$LINENO: result: $LIBXSLT_LIBS" >&5 -echo "${ECHO_T}$LIBXSLT_LIBS" >&6 + { $as_echo "$as_me:$LINENO: result: $LIBXSLT_LIBS" >&5 +$as_echo "$LIBXSLT_LIBS" >&6; } else @@ -13026,10 +14936,10 @@ echo "${ECHO_T}$LIBXSLT_LIBS" >&6 if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -13042,28 +14952,29 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test "$PKG_CONFIG" = "no" ; then @@ -13074,25 +14985,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for libxslt" >&5 -echo $ECHO_N "checking for libxslt... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for libxslt" >&5 +$as_echo_n "checking for libxslt... " >&6; } if $PKG_CONFIG --exists "libxslt" ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } succeeded=yes - echo "$as_me:$LINENO: checking LIBXSLT_CFLAGS" >&5 -echo $ECHO_N "checking LIBXSLT_CFLAGS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking LIBXSLT_CFLAGS" >&5 +$as_echo_n "checking LIBXSLT_CFLAGS... " >&6; } LIBXSLT_CFLAGS=`$PKG_CONFIG --cflags "libxslt"` - echo "$as_me:$LINENO: result: $LIBXSLT_CFLAGS" >&5 -echo "${ECHO_T}$LIBXSLT_CFLAGS" >&6 + { $as_echo "$as_me:$LINENO: result: $LIBXSLT_CFLAGS" >&5 +$as_echo "$LIBXSLT_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking LIBXSLT_LIBS" >&5 -echo $ECHO_N "checking LIBXSLT_LIBS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking LIBXSLT_LIBS" >&5 +$as_echo_n "checking LIBXSLT_LIBS... " >&6; } LIBXSLT_LIBS=`$PKG_CONFIG --libs "libxslt"` - echo "$as_me:$LINENO: result: $LIBXSLT_LIBS" >&5 -echo "${ECHO_T}$LIBXSLT_LIBS" >&6 + { $as_echo "$as_me:$LINENO: result: $LIBXSLT_LIBS" >&5 +$as_echo "$LIBXSLT_LIBS" >&6; } else LIBXSLT_CFLAGS="" LIBXSLT_LIBS="" @@ -13113,8 +15024,8 @@ echo "${ECHO_T}$LIBXSLT_LIBS" >&6 if test $succeeded = yes; then : else - { { echo "$as_me:$LINENO: error: Library requirements (libxslt) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -echo "$as_me: error: Library requirements (libxslt) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { { $as_echo "$as_me:$LINENO: error: Library requirements (libxslt) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +$as_echo "$as_me: error: Library requirements (libxslt) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi @@ -13123,10 +15034,10 @@ echo "$as_me: error: Library requirements (libxslt) not met; consider adjusting # Extract the first word of "xsltproc", so it can be a program name with args. set dummy xsltproc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_XSLTPROC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $XSLTPROC in [\\/]* | ?:[\\/]*) @@ -13139,36 +15050,37 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_XSLTPROC" && ac_cv_path_XSLTPROC="no" ;; esac fi XSLTPROC=$ac_cv_path_XSLTPROC - if test -n "$XSLTPROC"; then - echo "$as_me:$LINENO: result: $XSLTPROC" >&5 -echo "${ECHO_T}$XSLTPROC" >&6 + { $as_echo "$as_me:$LINENO: result: $XSLTPROC" >&5 +$as_echo "$XSLTPROC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + if test "$XSLTPROC" = "no"; then - { { echo "$as_me:$LINENO: error: xsltproc is required" >&5 -echo "$as_me: error: xsltproc is required" >&2;} + { { $as_echo "$as_me:$LINENO: error: xsltproc is required" >&5 +$as_echo "$as_me: error: xsltproc is required" >&2;} { (exit 1); exit 1; }; } fi else - echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6 + { $as_echo "$as_me:$LINENO: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_LIBXSLT=NO BUILD_TYPE="$BUILD_TYPE LIBXSLT" fi @@ -13177,25 +15089,25 @@ fi -echo "$as_me:$LINENO: checking which libxml to use" >&5 -echo $ECHO_N "checking which libxml to use... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking which libxml to use" >&5 +$as_echo_n "checking which libxml to use... " >&6; } if test -n "$with_system_libxml" -o -n "$with_system_libs" -o \ "$_os" = "Darwin" && \ test "$with_system_libxml" != "no"; then - echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6 + { $as_echo "$as_me:$LINENO: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_LIBXML=YES if test "$_os" = "Darwin"; then - echo "$as_me:$LINENO: checking LIBXML_CFLAGS" >&5 -echo $ECHO_N "checking LIBXML_CFLAGS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking LIBXML_CFLAGS" >&5 +$as_echo_n "checking LIBXML_CFLAGS... " >&6; } LIBXML_CFLAGS=`xml2-config --cflags` - echo "$as_me:$LINENO: result: $LIBXML_CFLAGS" >&5 -echo "${ECHO_T}$LIBXML_CFLAGS" >&6 - echo "$as_me:$LINENO: checking LIBXML_LIBS" >&5 -echo $ECHO_N "checking LIBXML_LIBS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: result: $LIBXML_CFLAGS" >&5 +$as_echo "$LIBXML_CFLAGS" >&6; } + { $as_echo "$as_me:$LINENO: checking LIBXML_LIBS" >&5 +$as_echo_n "checking LIBXML_LIBS... " >&6; } LIBXML_LIBS=`xml2-config --libs` - echo "$as_me:$LINENO: result: $LIBXML_LIBS" >&5 -echo "${ECHO_T}$LIBXML_LIBS" >&6 + { $as_echo "$as_me:$LINENO: result: $LIBXML_LIBS" >&5 +$as_echo "$LIBXML_LIBS" >&6; } else @@ -13205,10 +15117,10 @@ echo "${ECHO_T}$LIBXML_LIBS" >&6 if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -13221,28 +15133,29 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test "$PKG_CONFIG" = "no" ; then @@ -13253,25 +15166,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for libxml-2.0 >= 2.0" >&5 -echo $ECHO_N "checking for libxml-2.0 >= 2.0... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for libxml-2.0 >= 2.0" >&5 +$as_echo_n "checking for libxml-2.0 >= 2.0... " >&6; } if $PKG_CONFIG --exists "libxml-2.0 >= 2.0" ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } succeeded=yes - echo "$as_me:$LINENO: checking LIBXML_CFLAGS" >&5 -echo $ECHO_N "checking LIBXML_CFLAGS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking LIBXML_CFLAGS" >&5 +$as_echo_n "checking LIBXML_CFLAGS... " >&6; } LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.0"` - echo "$as_me:$LINENO: result: $LIBXML_CFLAGS" >&5 -echo "${ECHO_T}$LIBXML_CFLAGS" >&6 + { $as_echo "$as_me:$LINENO: result: $LIBXML_CFLAGS" >&5 +$as_echo "$LIBXML_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking LIBXML_LIBS" >&5 -echo $ECHO_N "checking LIBXML_LIBS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking LIBXML_LIBS" >&5 +$as_echo_n "checking LIBXML_LIBS... " >&6; } LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.0"` - echo "$as_me:$LINENO: result: $LIBXML_LIBS" >&5 -echo "${ECHO_T}$LIBXML_LIBS" >&6 + { $as_echo "$as_me:$LINENO: result: $LIBXML_LIBS" >&5 +$as_echo "$LIBXML_LIBS" >&6; } else LIBXML_CFLAGS="" LIBXML_LIBS="" @@ -13292,8 +15205,8 @@ echo "${ECHO_T}$LIBXML_LIBS" >&6 if test $succeeded = yes; then : else - { { echo "$as_me:$LINENO: error: Library requirements (libxml-2.0 >= 2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -echo "$as_me: error: Library requirements (libxml-2.0 >= 2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { { $as_echo "$as_me:$LINENO: error: Library requirements (libxml-2.0 >= 2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +$as_echo "$as_me: error: Library requirements (libxml-2.0 >= 2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi @@ -13301,8 +15214,8 @@ echo "$as_me: error: Library requirements (libxml-2.0 >= 2.0) not met; consider BUILD_TYPE="$BUILD_TYPE LIBXMLSEC" else - echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6 + { $as_echo "$as_me:$LINENO: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_LIBXML=NO BUILD_TYPE="$BUILD_TYPE LIBXML2 LIBXMLSEC" fi @@ -13313,21 +15226,21 @@ fi if test "$_os" = "Darwin" && test "$with_system_python" != "no"; then with_system_python=yes fi -echo "$as_me:$LINENO: checking which python to use" >&5 -echo $ECHO_N "checking which python to use... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking which python to use" >&5 +$as_echo_n "checking which python to use... " >&6; } if test -n "$with_system_python" -o -n "$with_system_libs" && \ test "$with_system_python" != "no"; then SYSTEM_PYTHON=YES - echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6 + { $as_echo "$as_me:$LINENO: result: external" >&5 +$as_echo "external" >&6; } if test -n "$PYTHON"; then # If the user set $PYTHON, use it and don't search something else. - echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.2" >&5 -echo $ECHO_N "checking whether $PYTHON version >= 2.2... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.2" >&5 +$as_echo_n "checking whether $PYTHON version >= 2.2... " >&6; } prog="import sys, string # split strings by '.' and convert to numeric. Append some zeros # because we need at least 4 digits for the hex conversion. @@ -13340,11 +15253,11 @@ sys.exit(sys.hexversion < minverhex)" ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else - { { echo "$as_me:$LINENO: error: too old" >&5 -echo "$as_me: error: too old" >&2;} + { { $as_echo "$as_me:$LINENO: error: too old" >&5 +$as_echo "$as_me: error: too old" >&2;} { (exit 1); exit 1; }; } fi @@ -13352,10 +15265,10 @@ fi else # Otherwise, try each interpreter until we find one that satisfies # VERSION. - echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.2" >&5 -echo $ECHO_N "checking for a Python interpreter with version >= 2.2... $ECHO_C" >&6 + { $as_echo "$as_me:$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 test "${am_cv_pathless_PYTHON+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else for am_cv_pathless_PYTHON in python python2 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do @@ -13377,18 +15290,18 @@ fi done fi -echo "$as_me:$LINENO: result: $am_cv_pathless_PYTHON" >&5 -echo "${ECHO_T}$am_cv_pathless_PYTHON" >&6 +{ $as_echo "$as_me:$LINENO: result: $am_cv_pathless_PYTHON" >&5 +$as_echo "$am_cv_pathless_PYTHON" >&6; } # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. if test "$am_cv_pathless_PYTHON" = none; then PYTHON=: else # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args. set dummy $am_cv_pathless_PYTHON; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_PYTHON+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $PYTHON in [\\/]* | ?:[\\/]*) @@ -13401,48 +15314,49 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi PYTHON=$ac_cv_path_PYTHON - if test -n "$PYTHON"; then - echo "$as_me:$LINENO: result: $PYTHON" >&5 -echo "${ECHO_T}$PYTHON" >&6 + { $as_echo "$as_me:$LINENO: result: $PYTHON" >&5 +$as_echo "$PYTHON" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + fi am_display_PYTHON=$am_cv_pathless_PYTHON fi if test "$PYTHON" = :; then - { { echo "$as_me:$LINENO: error: no suitable Python interpreter found" >&5 -echo "$as_me: error: no suitable Python interpreter found" >&2;} + { { $as_echo "$as_me:$LINENO: error: no suitable Python interpreter found" >&5 +$as_echo "$as_me: error: no suitable Python interpreter found" >&2;} { (exit 1); exit 1; }; } else - echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5 -echo $ECHO_N "checking for $am_display_PYTHON version... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5 +$as_echo_n "checking for $am_display_PYTHON version... " >&6; } if test "${am_cv_python_version+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else am_cv_python_version=`$PYTHON -c "import sys; print sys.version[:3]"` fi -echo "$as_me:$LINENO: result: $am_cv_python_version" >&5 -echo "${ECHO_T}$am_cv_python_version" >&6 +{ $as_echo "$as_me:$LINENO: result: $am_cv_python_version" >&5 +$as_echo "$am_cv_python_version" >&6; } PYTHON_VERSION=$am_cv_python_version @@ -13453,30 +15367,30 @@ echo "${ECHO_T}$am_cv_python_version" >&6 - echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5 -echo $ECHO_N "checking for $am_display_PYTHON platform... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5 +$as_echo_n "checking for $am_display_PYTHON platform... " >&6; } if test "${am_cv_python_platform+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"` fi -echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5 -echo "${ECHO_T}$am_cv_python_platform" >&6 +{ $as_echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5 +$as_echo "$am_cv_python_platform" >&6; } PYTHON_PLATFORM=$am_cv_python_platform - echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5 -echo $ECHO_N "checking for $am_display_PYTHON script directory... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5 +$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; } if test "${am_cv_python_pythondir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null || echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` fi -echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5 -echo "${ECHO_T}$am_cv_python_pythondir" >&6 +{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5 +$as_echo "$am_cv_python_pythondir" >&6; } pythondir=$am_cv_python_pythondir @@ -13484,16 +15398,16 @@ echo "${ECHO_T}$am_cv_python_pythondir" >&6 pkgpythondir=\${pythondir}/$PACKAGE - echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5 -echo $ECHO_N "checking for $am_display_PYTHON extension module directory... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5 +$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; } if test "${am_cv_python_pyexecdir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null || echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"` fi -echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5 -echo "${ECHO_T}$am_cv_python_pyexecdir" >&6 +{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5 +$as_echo "$am_cv_python_pyexecdir" >&6; } pyexecdir=$am_cv_python_pyexecdir @@ -13519,19 +15433,18 @@ echo "${ECHO_T}$am_cv_python_pyexecdir" >&6 save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS" if test "${ac_cv_header_Python_h+set}" = set; then - echo "$as_me:$LINENO: checking for Python.h" >&5 -echo $ECHO_N "checking for Python.h... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for Python.h" >&5 +$as_echo_n "checking for Python.h... " >&6; } if test "${ac_cv_header_Python_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_Python_h" >&5 -echo "${ECHO_T}$ac_cv_header_Python_h" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_Python_h" >&5 +$as_echo "$ac_cv_header_Python_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking Python.h usability" >&5 -echo $ECHO_N "checking Python.h usability... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking Python.h usability" >&5 +$as_echo_n "checking Python.h usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -13541,33 +15454,39 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking Python.h presence" >&5 -echo $ECHO_N "checking Python.h presence... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking Python.h presence" >&5 +$as_echo_n "checking Python.h presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -13575,83 +15494,76 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) - { echo "$as_me:$LINENO: WARNING: Python.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: Python.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: Python.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: Python.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: Python.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: Python.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: Python.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: Python.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) - { echo "$as_me:$LINENO: WARNING: Python.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: Python.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: Python.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: Python.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: Python.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: Python.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: Python.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: Python.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: Python.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: Python.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: Python.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: Python.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: Python.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: Python.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: Python.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: Python.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: Python.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: Python.h: in the future, the compiler will take precedence" >&2;} + ;; esac -echo "$as_me:$LINENO: checking for Python.h" >&5 -echo $ECHO_N "checking for Python.h... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for Python.h" >&5 +$as_echo_n "checking for Python.h... " >&6; } if test "${ac_cv_header_Python_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_cv_header_Python_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_Python_h" >&5 -echo "${ECHO_T}$ac_cv_header_Python_h" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_Python_h" >&5 +$as_echo "$ac_cv_header_Python_h" >&6; } fi -if test $ac_cv_header_Python_h = yes; then +if test "x$ac_cv_header_Python_h" = x""yes; then : else - { { echo "$as_me:$LINENO: error: Python headers not found" >&5 -echo "$as_me: error: Python headers not found" >&2;} + { { $as_echo "$as_me:$LINENO: error: Python headers not found" >&5 +$as_echo "$as_me: error: Python headers not found" >&2;} { (exit 1); exit 1; }; } fi @@ -13660,8 +15572,8 @@ fi else SYSTEM_PYTHON=NO BUILD_TYPE="$BUILD_TYPE PYTHON" - echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6 + { $as_echo "$as_me:$LINENO: result: internal" >&5 +$as_echo "internal" >&6; } # Embedded python dies without Home set if test "z$HOME" = "z"; then export HOME=""; @@ -13670,10 +15582,10 @@ echo "${ECHO_T}internal" >&6 if test -z "$BZIP2"; then # Extract the first word of "bzip2", so it can be a program name with args. set dummy bzip2; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_BZIP2+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $BZIP2 in [\\/]* | ?:[\\/]*) @@ -13686,30 +15598,31 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_BZIP2="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi BZIP2=$ac_cv_path_BZIP2 - if test -n "$BZIP2"; then - echo "$as_me:$LINENO: result: $BZIP2" >&5 -echo "${ECHO_T}$BZIP2" >&6 + { $as_echo "$as_me:$LINENO: result: $BZIP2" >&5 +$as_echo "$BZIP2" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + if test -z "$BZIP2"; then - { { echo "$as_me:$LINENO: error: the internal Python module has a .tar.bz2. You need bzip2" >&5 -echo "$as_me: error: the internal Python module has a .tar.bz2. You need bzip2" >&2;} + { { $as_echo "$as_me:$LINENO: error: the internal Python module has a .tar.bz2. You need bzip2" >&5 +$as_echo "$as_me: error: the internal Python module has a .tar.bz2. You need bzip2" >&2;} { (exit 1); exit 1; }; } fi fi @@ -13720,20 +15633,19 @@ fi HOME=`echo $HOME | sed 's:\\\\:/:g'` -echo "$as_me:$LINENO: checking which db to use" >&5 -echo $ECHO_N "checking which db to use... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking which db to use" >&5 +$as_echo_n "checking which db to use... " >&6; } if test -n "$with_system_db" -o -n "$with_system_libs" && \ test "$with_system_db" != "no"; then SYSTEM_DB=YES - echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6 - echo "$as_me:$LINENO: checking for db.h" >&5 -echo $ECHO_N "checking for db.h... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: result: external" >&5 +$as_echo "external" >&6; } + { $as_echo "$as_me:$LINENO: checking for db.h" >&5 +$as_echo_n "checking for db.h... " >&6; } if test "${ac_cv_header_db_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -13745,40 +15657,46 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_header_db_h=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_db_h=no + ac_cv_header_db_h=no fi -rm -f conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5 -echo "${ECHO_T}$ac_cv_header_db_h" >&6 -if test $ac_cv_header_db_h = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5 +$as_echo "$ac_cv_header_db_h" >&6; } +if test "x$ac_cv_header_db_h" = x""yes; then DB_INCLUDES=/usr/include else CFLAGS=-I/usr/include/db4 - echo "$as_me:$LINENO: checking for db4/db.h" >&5 -echo $ECHO_N "checking for db4/db.h... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for db4/db.h" >&5 +$as_echo_n "checking for db4/db.h... " >&6; } if test "${ac_cv_header_db4_db_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -13789,33 +15707,40 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_header_db4_db_h=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_db4_db_h=no + ac_cv_header_db4_db_h=no fi -rm -f conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_header_db4_db_h" >&5 -echo "${ECHO_T}$ac_cv_header_db4_db_h" >&6 -if test $ac_cv_header_db4_db_h = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_db4_db_h" >&5 +$as_echo "$ac_cv_header_db4_db_h" >&6; } +if test "x$ac_cv_header_db4_db_h" = x""yes; then DB_INCLUDES=/usr/include/db4 else - { { echo "$as_me:$LINENO: error: no. install the db4 libraries" >&5 -echo "$as_me: error: no. install the db4 libraries" >&2;} + { { $as_echo "$as_me:$LINENO: error: no. install the db4 libraries" >&5 +$as_echo "$as_me: error: no. install the db4 libraries" >&2;} { (exit 1); exit 1; }; } fi @@ -13824,18 +15749,19 @@ fi fi - echo "$as_me:$LINENO: checking whether db is at least 4.1" >&5 -echo $ECHO_N "checking whether db is at least 4.1... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking whether db is at least 4.1" >&5 +$as_echo_n "checking whether db is at least 4.1... " >&6; } for v in `seq 1 7`; do if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run test program while cross compiling +$as_echo "$as_me: error: cannot run test program while cross compiling See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -13851,48 +15777,61 @@ int main(int argc, char **argv) { _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then DB_VERSION_MINOR=$v else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + done if test "$DB_VERSION_MINOR" -gt "1"; then - echo "$as_me:$LINENO: result: OK" >&5 -echo "${ECHO_T}OK" >&6 + { $as_echo "$as_me:$LINENO: result: OK" >&5 +$as_echo "OK" >&6; } DB_VERSION=4.$DB_VERSION_MINOR else - { { echo "$as_me:$LINENO: error: no. you need at least db 4.1" >&5 -echo "$as_me: error: no. you need at least db 4.1" >&2;} + { { $as_echo "$as_me:$LINENO: error: no. you need at least db 4.1" >&5 +$as_echo "$as_me: error: no. you need at least db 4.1" >&2;} { (exit 1); exit 1; }; } fi # does not work :/ #AC_CHECK_LIB(db, db_create, [], # [AC_MSG_ERROR([db library not installed or functional])], []) -echo "$as_me:$LINENO: checking for main in -ldb" >&5 -echo $ECHO_N "checking for main in -ldb... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for main in -ldb" >&5 +$as_echo_n "checking for main in -ldb... " >&6; } if test "${ac_cv_lib_db_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldb $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -13903,36 +15842,48 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -main (); +return main (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_db_main=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_db_main=no + ac_cv_lib_db_main=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_db_main" >&5 -echo "${ECHO_T}$ac_cv_lib_db_main" >&6 -if test $ac_cv_lib_db_main = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_db_main" >&5 +$as_echo "$ac_cv_lib_db_main" >&6; } +if test "x$ac_cv_lib_db_main" = x""yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBDB 1 _ACEOF @@ -13940,16 +15891,16 @@ _ACEOF LIBS="-ldb $LIBS" else - { { echo "$as_me:$LINENO: error: db not installed or functional" >&5 -echo "$as_me: error: db not installed or functional" >&2;} + { { $as_echo "$as_me:$LINENO: error: db not installed or functional" >&5 +$as_echo "$as_me: error: db not installed or functional" >&2;} { (exit 1); exit 1; }; } fi ac_cv_lib_db=ac_cv_lib_db_main SCPDEFS="$SCPDEFS -DSYSTEM_DB" else - echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6 + { $as_echo "$as_me:$LINENO: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_DB=NO BUILD_TYPE="$BUILD_TYPE BERKELEYDB" fi @@ -13958,22 +15909,22 @@ fi -echo "$as_me:$LINENO: checking which lucene to use" >&5 -echo $ECHO_N "checking which lucene to use... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking which lucene to use" >&5 +$as_echo_n "checking which lucene to use... " >&6; } if test -n "$with_system_lucene" -o -n "$with_system_libs" && \ test "$with_system_lucene" != "no" && test "$with_system_jars" != "no"; then - echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6 + { $as_echo "$as_me:$LINENO: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_LUCENE=YES if test -z $LUCENE_CORE_JAR; then - echo "$as_me:$LINENO: checking for /usr/share/java/lucene-core-2.3.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/lucene-core-2.3.jar... $ECHO_C" >&6 + { $as_echo "$as_me:$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 test "${ac_cv_file__usr_share_java_lucene_core_2_3_jar+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/lucene-core-2.3.jar"; then ac_cv_file__usr_share_java_lucene_core_2_3_jar=yes @@ -13981,20 +15932,20 @@ else ac_cv_file__usr_share_java_lucene_core_2_3_jar=no fi fi -echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_core_2_3_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_lucene_core_2_3_jar" >&6 -if test $ac_cv_file__usr_share_java_lucene_core_2_3_jar = yes; then +{ $as_echo "$as_me:$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" = x""yes; then LUCENE_CORE_JAR=/usr/share/java/lucene-core-2.3.jar else - echo "$as_me:$LINENO: checking for /usr/share/java/lucene.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/lucene.jar... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for /usr/share/java/lucene.jar" >&5 +$as_echo_n "checking for /usr/share/java/lucene.jar... " >&6; } if test "${ac_cv_file__usr_share_java_lucene_jar+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/lucene.jar"; then ac_cv_file__usr_share_java_lucene_jar=yes @@ -14002,13 +15953,13 @@ else ac_cv_file__usr_share_java_lucene_jar=no fi fi -echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_lucene_jar" >&6 -if test $ac_cv_file__usr_share_java_lucene_jar = yes; then +{ $as_echo "$as_me:$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" = x""yes; then LUCENE_CORE_JAR=/usr/share/java/lucene.jar else - { { echo "$as_me:$LINENO: error: lucene-core.jar replacement not found" >&5 -echo "$as_me: error: lucene-core.jar replacement not found" >&2;} + { { $as_echo "$as_me:$LINENO: error: lucene-core.jar replacement not found" >&5 +$as_echo "$as_me: error: lucene-core.jar replacement not found" >&2;} { (exit 1); exit 1; }; } fi @@ -14018,15 +15969,15 @@ fi fi else - as_ac_File=`echo "ac_cv_file_$LUCENE_CORE_JAR" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $LUCENE_CORE_JAR" >&5 -echo $ECHO_N "checking for $LUCENE_CORE_JAR... $ECHO_C" >&6 -if eval "test \"\${$as_ac_File+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_File=`$as_echo "ac_cv_file_$LUCENE_CORE_JAR" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $LUCENE_CORE_JAR" >&5 +$as_echo_n "checking for $LUCENE_CORE_JAR... " >&6; } +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$LUCENE_CORE_JAR"; then eval "$as_ac_File=yes" @@ -14034,27 +15985,31 @@ else eval "$as_ac_File=no" fi fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 -if test `eval echo '${'$as_ac_File'}'` = yes; then +ac_res=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then : else - { { echo "$as_me:$LINENO: error: lucene-core.jar not found." >&5 -echo "$as_me: error: lucene-core.jar not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: lucene-core.jar not found." >&5 +$as_echo "$as_me: error: lucene-core.jar not found." >&2;} { (exit 1); exit 1; }; } fi fi if test -z $LUCENE_ANALYZERS_JAR; then - echo "$as_me:$LINENO: checking for /usr/share/java/lucene-analyzers-2.3.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/lucene-analyzers-2.3.jar... $ECHO_C" >&6 + { $as_echo "$as_me:$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 test "${ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/lucene-analyzers-2.3.jar"; then ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar=yes @@ -14062,20 +16017,20 @@ else ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar=no fi fi -echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar" >&6 -if test $ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar = yes; then +{ $as_echo "$as_me:$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" = x""yes; then LUCENE_ANALYZERS_JAR=/usr/share/java/lucene-analyzers-2.3.jar else - echo "$as_me:$LINENO: checking for /usr/share/java/lucene-contrib/lucene-analyzers.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/lucene-contrib/lucene-analyzers.jar... $ECHO_C" >&6 + { $as_echo "$as_me:$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 test "${ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/lucene-contrib/lucene-analyzers.jar"; then ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar=yes @@ -14083,13 +16038,13 @@ else ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar=no fi fi -echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar" >&6 -if test $ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar = yes; then +{ $as_echo "$as_me:$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" = x""yes; then LUCENE_ANALYZERS_JAR=/usr/share/java/lucene-contrib/lucene-analyzers.jar else - { { echo "$as_me:$LINENO: error: lucene-analyzers.jar replacement not found." >&5 -echo "$as_me: error: lucene-analyzers.jar replacement not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: lucene-analyzers.jar replacement not found." >&5 +$as_echo "$as_me: error: lucene-analyzers.jar replacement not found." >&2;} { (exit 1); exit 1; }; } fi @@ -14099,15 +16054,15 @@ fi fi else - as_ac_File=`echo "ac_cv_file_$LUCENE_CORE_JAR" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $LUCENE_CORE_JAR" >&5 -echo $ECHO_N "checking for $LUCENE_CORE_JAR... $ECHO_C" >&6 -if eval "test \"\${$as_ac_File+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_File=`$as_echo "ac_cv_file_$LUCENE_CORE_JAR" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $LUCENE_CORE_JAR" >&5 +$as_echo_n "checking for $LUCENE_CORE_JAR... " >&6; } +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$LUCENE_CORE_JAR"; then eval "$as_ac_File=yes" @@ -14115,20 +16070,24 @@ else eval "$as_ac_File=no" fi fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 -if test `eval echo '${'$as_ac_File'}'` = yes; then +ac_res=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then : else - { { echo "$as_me:$LINENO: error: lucene-analyzers.jar not found." >&5 -echo "$as_me: error: lucene-analyzers.jar not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: lucene-analyzers.jar not found." >&5 +$as_echo "$as_me: error: lucene-analyzers.jar not found." >&2;} { (exit 1); exit 1; }; } fi fi else - echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6 + { $as_echo "$as_me:$LINENO: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_LUCENE=NO BUILD_TYPE="$BUILD_TYPE LUCENE" fi @@ -14136,25 +16095,25 @@ fi -echo "$as_me:$LINENO: checking which hsqldb to use" >&5 -echo $ECHO_N "checking which hsqldb to use... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking which hsqldb to use" >&5 +$as_echo_n "checking which hsqldb to use... " >&6; } if test -n "$with_system_hsqldb" -o -n "$with_system_libs" && \ test "$with_system_hsqldb" != "no" && test "$with_system_jars" != "no"; then - echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6 + { $as_echo "$as_me:$LINENO: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_HSQLDB=YES if test -z $HSQLDB_JAR; then HSQLDB_JAR=/usr/share/java/hsqldb.jar fi - as_ac_File=`echo "ac_cv_file_$HSQLDB_JAR" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $HSQLDB_JAR" >&5 -echo $ECHO_N "checking for $HSQLDB_JAR... $ECHO_C" >&6 -if eval "test \"\${$as_ac_File+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_File=`$as_echo "ac_cv_file_$HSQLDB_JAR" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $HSQLDB_JAR" >&5 +$as_echo_n "checking for $HSQLDB_JAR... " >&6; } +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$HSQLDB_JAR"; then eval "$as_ac_File=yes" @@ -14162,18 +16121,22 @@ else eval "$as_ac_File=no" fi fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 -if test `eval echo '${'$as_ac_File'}'` = yes; then +ac_res=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then : else - { { echo "$as_me:$LINENO: error: hsqldb.jar not found." >&5 -echo "$as_me: error: hsqldb.jar not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: hsqldb.jar not found." >&5 +$as_echo "$as_me: error: hsqldb.jar not found." >&2;} { (exit 1); exit 1; }; } fi - echo "$as_me:$LINENO: checking whether hsqldb is >= 1.8.0.9" >&5 -echo $ECHO_N "checking whether hsqldb is >= 1.8.0.9... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking whether hsqldb is >= 1.8.0.9" >&5 +$as_echo_n "checking whether hsqldb is >= 1.8.0.9... " >&6; } export HSQLDB_JAR if $PERL -e 'use Archive::Zip; my $file = "$ENV{'HSQLDB_JAR'}"; @@ -14196,41 +16159,41 @@ echo $ECHO_N "checking whether hsqldb is >= 1.8.0.9... $ECHO_C" >&6 } else { exit 1; }'; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else - { { echo "$as_me:$LINENO: error: no, hsqldb >= 1.8.0.9 is needed" >&5 -echo "$as_me: error: no, hsqldb >= 1.8.0.9 is needed" >&2;} + { { $as_echo "$as_me:$LINENO: error: no, hsqldb >= 1.8.0.9 is needed" >&5 +$as_echo "$as_me: error: no, hsqldb >= 1.8.0.9 is needed" >&2;} { (exit 1); exit 1; }; } fi else - echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6 + { $as_echo "$as_me:$LINENO: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_HSQLDB=NO BUILD_TYPE="$BUILD_TYPE HSQLDB" fi -echo "$as_me:$LINENO: checking which beanshell to use" >&5 -echo $ECHO_N "checking which beanshell to use... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking which beanshell to use" >&5 +$as_echo_n "checking which beanshell to use... " >&6; } if test -n "$with_system_beanshell" -o -n "$with_system_libs" && \ test "$with_system_beanshell" != "no" && test "$with_system_jars" != "no"; then - echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6 + { $as_echo "$as_me:$LINENO: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_BSH=YES if test -z $BSH_JAR; then BSH_JAR=/usr/share/java/bsh.jar fi - as_ac_File=`echo "ac_cv_file_$BSH_JAR" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $BSH_JAR" >&5 -echo $ECHO_N "checking for $BSH_JAR... $ECHO_C" >&6 -if eval "test \"\${$as_ac_File+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_File=`$as_echo "ac_cv_file_$BSH_JAR" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $BSH_JAR" >&5 +$as_echo_n "checking for $BSH_JAR... " >&6; } +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$BSH_JAR"; then eval "$as_ac_File=yes" @@ -14238,19 +16201,23 @@ else eval "$as_ac_File=no" fi fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 -if test `eval echo '${'$as_ac_File'}'` = yes; then +ac_res=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then : else - { { echo "$as_me:$LINENO: error: bsh.jar not found." >&5 -echo "$as_me: error: bsh.jar not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: bsh.jar not found." >&5 +$as_echo "$as_me: error: bsh.jar not found." >&2;} { (exit 1); exit 1; }; } fi else - echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6 + { $as_echo "$as_me:$LINENO: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_BSH=NO BUILD_TYPE="$BUILD_TYPE BSH" fi @@ -14258,22 +16225,22 @@ fi -echo "$as_me:$LINENO: checking which saxon to use" >&5 -echo $ECHO_N "checking which saxon to use... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking which saxon to use" >&5 +$as_echo_n "checking which saxon to use... " >&6; } if test -n "$with_system_saxon" -o -n "$with_system_libs" && \ test "$with_system_saxon" != "no" && test "$with_system_jars" != "no"; then - echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6 + { $as_echo "$as_me:$LINENO: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_SAXON=YES if test -z $SAXON_JAR; then - echo "$as_me:$LINENO: checking for /usr/share/java/saxon9.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/saxon9.jar... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for /usr/share/java/saxon9.jar" >&5 +$as_echo_n "checking for /usr/share/java/saxon9.jar... " >&6; } if test "${ac_cv_file__usr_share_java_saxon9_jar+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/saxon9.jar"; then ac_cv_file__usr_share_java_saxon9_jar=yes @@ -14281,20 +16248,20 @@ else ac_cv_file__usr_share_java_saxon9_jar=no fi fi -echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_saxon9_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_saxon9_jar" >&6 -if test $ac_cv_file__usr_share_java_saxon9_jar = yes; then +{ $as_echo "$as_me:$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" = x""yes; then SAXON_JAR=/usr/share/java/saxon9.jar else - echo "$as_me:$LINENO: checking for /usr/share/java/saxon.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/saxon.jar... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for /usr/share/java/saxon.jar" >&5 +$as_echo_n "checking for /usr/share/java/saxon.jar... " >&6; } if test "${ac_cv_file__usr_share_java_saxon_jar+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/saxon.jar"; then ac_cv_file__usr_share_java_saxon_jar=yes @@ -14302,19 +16269,19 @@ else ac_cv_file__usr_share_java_saxon_jar=no fi fi -echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_saxon_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_saxon_jar" >&6 -if test $ac_cv_file__usr_share_java_saxon_jar = yes; then +{ $as_echo "$as_me:$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" = x""yes; then SAXON_JAR=/usr/share/java/saxon.jar else - echo "$as_me:$LINENO: checking for /usr/share/java/saxon9.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/saxon9.jar... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for /usr/share/java/saxon9.jar" >&5 +$as_echo_n "checking for /usr/share/java/saxon9.jar... " >&6; } if test "${ac_cv_file__usr_share_java_saxon9_jar+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/saxon9.jar"; then ac_cv_file__usr_share_java_saxon9_jar=yes @@ -14322,13 +16289,13 @@ else ac_cv_file__usr_share_java_saxon9_jar=no fi fi -echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_saxon9_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_saxon9_jar" >&6 -if test $ac_cv_file__usr_share_java_saxon9_jar = yes; then +{ $as_echo "$as_me:$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" = x""yes; then SAXON_JAR=/usr/share/java/saxon9.jar else - { { echo "$as_me:$LINENO: error: saxon.jar replacement not found" >&5 -echo "$as_me: error: saxon.jar replacement not found" >&2;} + { { $as_echo "$as_me:$LINENO: error: saxon.jar replacement not found" >&5 +$as_echo "$as_me: error: saxon.jar replacement not found" >&2;} { (exit 1); exit 1; }; } fi @@ -14342,15 +16309,15 @@ fi fi else - as_ac_File=`echo "ac_cv_file_$SAXON_JAR" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $SAXON_JAR" >&5 -echo $ECHO_N "checking for $SAXON_JAR... $ECHO_C" >&6 -if eval "test \"\${$as_ac_File+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_File=`$as_echo "ac_cv_file_$SAXON_JAR" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $SAXON_JAR" >&5 +$as_echo_n "checking for $SAXON_JAR... " >&6; } +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$SAXON_JAR"; then eval "$as_ac_File=yes" @@ -14358,27 +16325,31 @@ else eval "$as_ac_File=no" fi fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 -if test `eval echo '${'$as_ac_File'}'` = yes; then +ac_res=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then : else - { { echo "$as_me:$LINENO: error: saxon.jar replacement not found." >&5 -echo "$as_me: error: saxon.jar replacement not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: saxon.jar replacement not found." >&5 +$as_echo "$as_me: error: saxon.jar replacement not found." >&2;} { (exit 1); exit 1; }; } fi fi if test -n "$SERIALIZER_JAR"; then - as_ac_File=`echo "ac_cv_file_$SERIALIZER_JAR" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $SERIALIZER_JAR" >&5 -echo $ECHO_N "checking for $SERIALIZER_JAR... $ECHO_C" >&6 -if eval "test \"\${$as_ac_File+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_File=`$as_echo "ac_cv_file_$SERIALIZER_JAR" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $SERIALIZER_JAR" >&5 +$as_echo_n "checking for $SERIALIZER_JAR... " >&6; } +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$SERIALIZER_JAR"; then eval "$as_ac_File=yes" @@ -14386,21 +16357,25 @@ else eval "$as_ac_File=no" fi fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 -if test `eval echo '${'$as_ac_File'}'` = yes; then +ac_res=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then : else - { { echo "$as_me:$LINENO: error: serializer.jar not found." >&5 -echo "$as_me: error: serializer.jar not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: serializer.jar not found." >&5 +$as_echo "$as_me: error: serializer.jar not found." >&2;} { (exit 1); exit 1; }; } fi fi else - echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6 + { $as_echo "$as_me:$LINENO: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_SAXON=NO NEED_SAXON=TRUE fi @@ -14414,20 +16389,20 @@ fi if test "$_os" = "Darwin" && test "$with_system_curl" != "no"; then with_system_curl=yes fi -echo "$as_me:$LINENO: checking which curl to use" >&5 -echo $ECHO_N "checking which curl to use... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking which curl to use" >&5 +$as_echo_n "checking which curl to use... " >&6; } if test -n "$with_system_curl" -o -n "$with_system_libs" && \ test "$with_system_curl" != "no"; then - echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6 + { $as_echo "$as_me:$LINENO: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_CURL=YES # Extract the first word of "curl-config", so it can be a program name with args. set dummy curl-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_CURLCONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $CURLCONFIG in [\\/]* | ?:[\\/]*) @@ -14440,51 +16415,52 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_CURLCONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi CURLCONFIG=$ac_cv_path_CURLCONFIG - if test -n "$CURLCONFIG"; then - echo "$as_me:$LINENO: result: $CURLCONFIG" >&5 -echo "${ECHO_T}$CURLCONFIG" >&6 + { $as_echo "$as_me:$LINENO: result: $CURLCONFIG" >&5 +$as_echo "$CURLCONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + if test -z "$CURLCONFIG"; then - { { echo "$as_me:$LINENO: error: install curl to run this script" >&5 -echo "$as_me: error: install curl to run this script" >&2;} + { { $as_echo "$as_me:$LINENO: error: install curl to run this script" >&5 +$as_echo "$as_me: error: install curl to run this script" >&2;} { (exit 1); exit 1; }; } fi # check curl version - echo "$as_me:$LINENO: checking whether curl is >= 7.9.8" >&5 -echo $ECHO_N "checking whether curl is >= 7.9.8... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking whether curl is >= 7.9.8" >&5 +$as_echo_n "checking whether curl is >= 7.9.8... " >&6; } if test "`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $1 }'`" -gt "7" -a \ "`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $2 }'`" -gt "9" -a \ "`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $3 }'`" -gt "8"; then - { { echo "$as_me:$LINENO: error: no, you need at least curl 7.9,8" >&5 -echo "$as_me: error: no, you need at least curl 7.9,8" >&2;} + { { $as_echo "$as_me:$LINENO: error: no, you need at least curl 7.9,8" >&5 +$as_echo "$as_me: error: no, you need at least curl 7.9,8" >&2;} { (exit 1); exit 1; }; } else - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } fi CURL_LIBS=`$CURLCONFIG --libs` CURL_CFLAGS=`$CURLCONFIG --cflags` else - echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6 + { $as_echo "$as_me:$LINENO: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_CURL=NO BUILD_TYPE="$BUILD_TYPE CURL" fi @@ -14492,33 +16468,32 @@ fi -echo "$as_me:$LINENO: checking which boost to use" >&5 -echo $ECHO_N "checking which boost to use... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking which boost to use" >&5 +$as_echo_n "checking which boost to use... " >&6; } if test -n "$with_system_boost" -o -n "$with_system_headers" && \ test "$with_system_boost" != "no"; then - echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6 + { $as_echo "$as_me:$LINENO: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_BOOST=YES - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu if test "${ac_cv_header_boost_shared_ptr_hpp+set}" = set; then - echo "$as_me:$LINENO: checking for boost/shared_ptr.hpp" >&5 -echo $ECHO_N "checking for boost/shared_ptr.hpp... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for boost/shared_ptr.hpp" >&5 +$as_echo_n "checking for boost/shared_ptr.hpp... " >&6; } if test "${ac_cv_header_boost_shared_ptr_hpp+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_boost_shared_ptr_hpp" >&5 -echo "${ECHO_T}$ac_cv_header_boost_shared_ptr_hpp" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_shared_ptr_hpp" >&5 +$as_echo "$ac_cv_header_boost_shared_ptr_hpp" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking boost/shared_ptr.hpp usability" >&5 -echo $ECHO_N "checking boost/shared_ptr.hpp usability... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking boost/shared_ptr.hpp usability" >&5 +$as_echo_n "checking boost/shared_ptr.hpp usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -14528,33 +16503,39 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking boost/shared_ptr.hpp presence" >&5 -echo $ECHO_N "checking boost/shared_ptr.hpp presence... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking boost/shared_ptr.hpp presence" >&5 +$as_echo_n "checking boost/shared_ptr.hpp presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -14562,101 +16543,93 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) - { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: boost/shared_ptr.hpp: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: boost/shared_ptr.hpp: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) - { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: present but cannot be compiled" >&5 -echo "$as_me: WARNING: boost/shared_ptr.hpp: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: boost/shared_ptr.hpp: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: boost/shared_ptr.hpp: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: in the future, the compiler will take precedence" >&2;} + ;; esac -echo "$as_me:$LINENO: checking for boost/shared_ptr.hpp" >&5 -echo $ECHO_N "checking for boost/shared_ptr.hpp... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for boost/shared_ptr.hpp" >&5 +$as_echo_n "checking for boost/shared_ptr.hpp... " >&6; } if test "${ac_cv_header_boost_shared_ptr_hpp+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_cv_header_boost_shared_ptr_hpp=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_boost_shared_ptr_hpp" >&5 -echo "${ECHO_T}$ac_cv_header_boost_shared_ptr_hpp" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_shared_ptr_hpp" >&5 +$as_echo "$ac_cv_header_boost_shared_ptr_hpp" >&6; } fi -if test $ac_cv_header_boost_shared_ptr_hpp = yes; then +if test "x$ac_cv_header_boost_shared_ptr_hpp" = x""yes; then : else - { { echo "$as_me:$LINENO: error: boost/shared_ptr.hpp not found. install boost" >&5 -echo "$as_me: error: boost/shared_ptr.hpp not found. install boost" >&2;} + { { $as_echo "$as_me:$LINENO: error: boost/shared_ptr.hpp not found. install boost" >&5 +$as_echo "$as_me: error: boost/shared_ptr.hpp not found. install boost" >&2;} { (exit 1); exit 1; }; } fi if test "${ac_cv_header_boost_spirit_core_hpp+set}" = set; then - echo "$as_me:$LINENO: checking for boost/spirit/core.hpp" >&5 -echo $ECHO_N "checking for boost/spirit/core.hpp... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for boost/spirit/core.hpp" >&5 +$as_echo_n "checking for boost/spirit/core.hpp... " >&6; } if test "${ac_cv_header_boost_spirit_core_hpp+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_boost_spirit_core_hpp" >&5 -echo "${ECHO_T}$ac_cv_header_boost_spirit_core_hpp" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_spirit_core_hpp" >&5 +$as_echo "$ac_cv_header_boost_spirit_core_hpp" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking boost/spirit/core.hpp usability" >&5 -echo $ECHO_N "checking boost/spirit/core.hpp usability... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking boost/spirit/core.hpp usability" >&5 +$as_echo_n "checking boost/spirit/core.hpp usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -14666,33 +16639,39 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking boost/spirit/core.hpp presence" >&5 -echo $ECHO_N "checking boost/spirit/core.hpp presence... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking boost/spirit/core.hpp presence" >&5 +$as_echo_n "checking boost/spirit/core.hpp presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -14700,83 +16679,76 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) - { echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: boost/spirit/core.hpp: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: boost/spirit/core.hpp: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: boost/spirit/core.hpp: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: boost/spirit/core.hpp: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) - { echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: present but cannot be compiled" >&5 -echo "$as_me: WARNING: boost/spirit/core.hpp: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: boost/spirit/core.hpp: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: boost/spirit/core.hpp: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: boost/spirit/core.hpp: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: boost/spirit/core.hpp: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: boost/spirit/core.hpp: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: boost/spirit/core.hpp: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: boost/spirit/core.hpp: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: boost/spirit/core.hpp: in the future, the compiler will take precedence" >&2;} + ;; esac -echo "$as_me:$LINENO: checking for boost/spirit/core.hpp" >&5 -echo $ECHO_N "checking for boost/spirit/core.hpp... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for boost/spirit/core.hpp" >&5 +$as_echo_n "checking for boost/spirit/core.hpp... " >&6; } if test "${ac_cv_header_boost_spirit_core_hpp+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_cv_header_boost_spirit_core_hpp=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_boost_spirit_core_hpp" >&5 -echo "${ECHO_T}$ac_cv_header_boost_spirit_core_hpp" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_spirit_core_hpp" >&5 +$as_echo "$ac_cv_header_boost_spirit_core_hpp" >&6; } fi -if test $ac_cv_header_boost_spirit_core_hpp = yes; then +if test "x$ac_cv_header_boost_spirit_core_hpp" = x""yes; then : else - { { echo "$as_me:$LINENO: error: boost/spirit/core.hpp not found. install boost" >&5 -echo "$as_me: error: boost/spirit/core.hpp not found. install boost" >&2;} + { { $as_echo "$as_me:$LINENO: error: boost/spirit/core.hpp not found. install boost" >&5 +$as_echo "$as_me: error: boost/spirit/core.hpp not found. install boost" >&2;} { (exit 1); exit 1; }; } fi @@ -14788,40 +16760,39 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu else - echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6 + { $as_echo "$as_me:$LINENO: result: internal" >&5 +$as_echo "internal" >&6; } BUILD_TYPE="$BUILD_TYPE BOOST" SYSTEM_BOOST=NO fi -echo "$as_me:$LINENO: checking which vigra to use" >&5 -echo $ECHO_N "checking which vigra to use... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking which vigra to use" >&5 +$as_echo_n "checking which vigra to use... " >&6; } if test -n "$with_system_vigra" -o -n "$with_system_headers" && \ test "$with_system_vigra" != "no"; then - echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6 + { $as_echo "$as_me:$LINENO: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_VIGRA=YES - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu if test "${ac_cv_header_vigra_copyimage_hxx+set}" = set; then - echo "$as_me:$LINENO: checking for vigra/copyimage.hxx" >&5 -echo $ECHO_N "checking for vigra/copyimage.hxx... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for vigra/copyimage.hxx" >&5 +$as_echo_n "checking for vigra/copyimage.hxx... " >&6; } if test "${ac_cv_header_vigra_copyimage_hxx+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_vigra_copyimage_hxx" >&5 -echo "${ECHO_T}$ac_cv_header_vigra_copyimage_hxx" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_vigra_copyimage_hxx" >&5 +$as_echo "$ac_cv_header_vigra_copyimage_hxx" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking vigra/copyimage.hxx usability" >&5 -echo $ECHO_N "checking vigra/copyimage.hxx usability... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking vigra/copyimage.hxx usability" >&5 +$as_echo_n "checking vigra/copyimage.hxx usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -14831,33 +16802,39 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking vigra/copyimage.hxx presence" >&5 -echo $ECHO_N "checking vigra/copyimage.hxx presence... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking vigra/copyimage.hxx presence" >&5 +$as_echo_n "checking vigra/copyimage.hxx presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -14865,83 +16842,76 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) - { echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: vigra/copyimage.hxx: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: vigra/copyimage.hxx: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: vigra/copyimage.hxx: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: vigra/copyimage.hxx: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) - { echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: present but cannot be compiled" >&5 -echo "$as_me: WARNING: vigra/copyimage.hxx: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: vigra/copyimage.hxx: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: vigra/copyimage.hxx: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: vigra/copyimage.hxx: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: vigra/copyimage.hxx: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: vigra/copyimage.hxx: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: vigra/copyimage.hxx: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: vigra/copyimage.hxx: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: vigra/copyimage.hxx: in the future, the compiler will take precedence" >&2;} + ;; esac -echo "$as_me:$LINENO: checking for vigra/copyimage.hxx" >&5 -echo $ECHO_N "checking for vigra/copyimage.hxx... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for vigra/copyimage.hxx" >&5 +$as_echo_n "checking for vigra/copyimage.hxx... " >&6; } if test "${ac_cv_header_vigra_copyimage_hxx+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_cv_header_vigra_copyimage_hxx=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_vigra_copyimage_hxx" >&5 -echo "${ECHO_T}$ac_cv_header_vigra_copyimage_hxx" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_vigra_copyimage_hxx" >&5 +$as_echo "$ac_cv_header_vigra_copyimage_hxx" >&6; } fi -if test $ac_cv_header_vigra_copyimage_hxx = yes; then +if test "x$ac_cv_header_vigra_copyimage_hxx" = x""yes; then : else - { { echo "$as_me:$LINENO: error: vigra/copyimage.hxx not found. install vigra" >&5 -echo "$as_me: error: vigra/copyimage.hxx not found. install vigra" >&2;} + { { $as_echo "$as_me:$LINENO: error: vigra/copyimage.hxx not found. install vigra" >&5 +$as_echo "$as_me: error: vigra/copyimage.hxx not found. install vigra" >&2;} { (exit 1); exit 1; }; } fi @@ -14953,35 +16923,34 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu else - echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6 + { $as_echo "$as_me:$LINENO: result: internal" >&5 +$as_echo "internal" >&6; } BUILD_TYPE="$BUILD_TYPE VIGRA" SYSTEM_VIGRA=NO fi -echo "$as_me:$LINENO: checking which odbc headers to use" >&5 -echo $ECHO_N "checking which odbc headers to use... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking which odbc headers to use" >&5 +$as_echo_n "checking which odbc headers to use... " >&6; } if test -n "$with_system_odbc_headers" -o -n "$with_system_headers" && \ test "$with_system_odbc_headers" != "no"; then - echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6 + { $as_echo "$as_me:$LINENO: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_ODBC_HEADERS=YES if test "${ac_cv_header_sqlext_h+set}" = set; then - echo "$as_me:$LINENO: checking for sqlext.h" >&5 -echo $ECHO_N "checking for sqlext.h... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for sqlext.h" >&5 +$as_echo_n "checking for sqlext.h... " >&6; } if test "${ac_cv_header_sqlext_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_sqlext_h" >&5 -echo "${ECHO_T}$ac_cv_header_sqlext_h" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sqlext_h" >&5 +$as_echo "$ac_cv_header_sqlext_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking sqlext.h usability" >&5 -echo $ECHO_N "checking sqlext.h usability... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking sqlext.h usability" >&5 +$as_echo_n "checking sqlext.h usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -14991,33 +16960,39 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking sqlext.h presence" >&5 -echo $ECHO_N "checking sqlext.h presence... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking sqlext.h presence" >&5 +$as_echo_n "checking sqlext.h presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -15025,174 +17000,168 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) - { echo "$as_me:$LINENO: WARNING: sqlext.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: sqlext.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: sqlext.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: sqlext.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: sqlext.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: sqlext.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: sqlext.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: sqlext.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) - { echo "$as_me:$LINENO: WARNING: sqlext.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: sqlext.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: sqlext.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: sqlext.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: sqlext.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: sqlext.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: sqlext.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: sqlext.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: sqlext.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: sqlext.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: sqlext.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: sqlext.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: sqlext.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: sqlext.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: sqlext.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: sqlext.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: sqlext.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: sqlext.h: in the future, the compiler will take precedence" >&2;} + ;; esac -echo "$as_me:$LINENO: checking for sqlext.h" >&5 -echo $ECHO_N "checking for sqlext.h... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for sqlext.h" >&5 +$as_echo_n "checking for sqlext.h... " >&6; } if test "${ac_cv_header_sqlext_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_cv_header_sqlext_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_sqlext_h" >&5 -echo "${ECHO_T}$ac_cv_header_sqlext_h" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sqlext_h" >&5 +$as_echo "$ac_cv_header_sqlext_h" >&6; } fi -if test $ac_cv_header_sqlext_h = yes; then +if test "x$ac_cv_header_sqlext_h" = x""yes; then : else - { { echo "$as_me:$LINENO: error: odbc not found. install odbc" >&5 -echo "$as_me: error: odbc not found. install odbc" >&2;} + { { $as_echo "$as_me:$LINENO: error: odbc not found. install odbc" >&5 +$as_echo "$as_me: error: odbc not found. install odbc" >&2;} { (exit 1); exit 1; }; } fi else - echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6 + { $as_echo "$as_me:$LINENO: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_ODBC_HEADERS=NO BUILD_TYPE="$BUILD_TYPE UNIXODBC" fi -echo "$as_me:$LINENO: checking whether to enable build of Mozilla/Mozilla NSS-using components" >&5 -echo $ECHO_N "checking whether to enable build of Mozilla/Mozilla NSS-using components... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to enable build of Mozilla/Mozilla NSS-using components" >&5 +$as_echo_n "checking whether to enable build of Mozilla/Mozilla NSS-using components... " >&6; } if test "$enable_mozilla" = "no"; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } WITH_MOZILLA=NO else - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } WITH_MOZILLA=YES fi -echo "$as_me:$LINENO: checking whether to build Mozilla addressbook connectivity" >&5 -echo $ECHO_N "checking whether to build Mozilla addressbook connectivity... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to build Mozilla addressbook connectivity" >&5 +$as_echo_n "checking whether to build Mozilla addressbook connectivity... " >&6; } if test "$enable_mozilla" = "no"; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } elif test "$with_system_mozilla" = "yes"; then - echo "$as_me:$LINENO: result: no, not possible with system-mozilla" >&5 -echo "${ECHO_T}no, not possible with system-mozilla" >&6 + { $as_echo "$as_me:$LINENO: result: no, not possible with system-mozilla" >&5 +$as_echo "no, not possible with system-mozilla" >&6; } else - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } fi -echo "$as_me:$LINENO: checking whether to build XML Security support" >&5 -echo $ECHO_N "checking whether to build XML Security support... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to build XML Security support" >&5 +$as_echo_n "checking whether to build XML Security support... " >&6; } if test "$enable_mozilla" = "no"; then - echo "$as_me:$LINENO: result: no, since Mozilla (NSS) disabled but needed" >&5 -echo "${ECHO_T}no, since Mozilla (NSS) disabled but needed" >&6 + { $as_echo "$as_me:$LINENO: result: no, since Mozilla (NSS) disabled but needed" >&5 +$as_echo "no, since Mozilla (NSS) disabled but needed" >&6; } else - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } fi -echo "$as_me:$LINENO: checking whether to build LDAP configuration backend" >&5 -echo $ECHO_N "checking whether to build LDAP configuration backend... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to build LDAP configuration backend" >&5 +$as_echo_n "checking whether to build LDAP configuration backend... " >&6; } if test -z "$enable_ldap" || test "$enable_ldap" = "yes"; then if test "$enable_mozilla" = "yes" || test "$with_openldap" = "yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } WITH_LDAP=YES else - echo "$as_me:$LINENO: result: no. Either Mozilla or OpenLDAP needed" >&5 -echo "${ECHO_T}no. Either Mozilla or OpenLDAP needed" >&6 + { $as_echo "$as_me:$LINENO: result: no. Either Mozilla or OpenLDAP needed" >&5 +$as_echo "no. Either Mozilla or OpenLDAP needed" >&6; } WITH_LDAP=NO fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } WITH_LDAP=NO fi if test "$WITH_LDAP" = "YES"; then - echo "$as_me:$LINENO: checking which LDAP SDK to use" >&5 -echo $ECHO_N "checking which LDAP SDK to use... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking which LDAP SDK to use" >&5 +$as_echo_n "checking which LDAP SDK to use... " >&6; } if test -n "$with_openldap" && test "$with_openldap" != "no"; then - echo "$as_me:$LINENO: result: OpenLDAP" >&5 -echo "${ECHO_T}OpenLDAP" >&6 + { $as_echo "$as_me:$LINENO: result: OpenLDAP" >&5 +$as_echo "OpenLDAP" >&6; } WITH_OPENLDAP=YES for ac_header in ldap.h do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +$as_echo_n "checking $ac_header usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -15202,33 +17171,39 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +$as_echo_n "checking $ac_header presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -15236,147 +17211,155 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 else - eval "$as_ac_Header=$ac_header_preproc" + eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF else - { { echo "$as_me:$LINENO: error: ldap.h not found. install openldap libs" >&5 -echo "$as_me: error: ldap.h not found. install openldap libs" >&2;} + { { $as_echo "$as_me:$LINENO: error: ldap.h not found. install openldap libs" >&5 +$as_echo "$as_me: error: ldap.h not found. install openldap libs" >&2;} { (exit 1); exit 1; }; } fi done -echo "$as_me:$LINENO: checking for ldap_simple_bind_s in -lldap" >&5 -echo $ECHO_N "checking for ldap_simple_bind_s in -lldap... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for ldap_simple_bind_s in -lldap" >&5 +$as_echo_n "checking for ldap_simple_bind_s in -lldap... " >&6; } if test "${ac_cv_lib_ldap_ldap_simple_bind_s+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lldap $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char ldap_simple_bind_s (); int main () { -ldap_simple_bind_s (); +return ldap_simple_bind_s (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_ldap_ldap_simple_bind_s=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_ldap_ldap_simple_bind_s=no + ac_cv_lib_ldap_ldap_simple_bind_s=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_simple_bind_s" >&5 -echo "${ECHO_T}$ac_cv_lib_ldap_ldap_simple_bind_s" >&6 -if test $ac_cv_lib_ldap_ldap_simple_bind_s = yes; then +{ $as_echo "$as_me:$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" = x""yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBLDAP 1 _ACEOF @@ -15384,69 +17367,80 @@ _ACEOF LIBS="-lldap $LIBS" else - { { echo "$as_me:$LINENO: error: openldap lib not found or functional" >&5 -echo "$as_me: error: openldap lib not found or functional" >&2;} + { { $as_echo "$as_me:$LINENO: error: openldap lib not found or functional" >&5 +$as_echo "$as_me: error: openldap lib not found or functional" >&2;} { (exit 1); exit 1; }; } fi # rumours say that OpenLDAP doesn't have that function. I looked and # it has it. Test for it to be sure -echo "$as_me:$LINENO: checking for ldap_set_option in -lldap" >&5 -echo $ECHO_N "checking for ldap_set_option in -lldap... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for ldap_set_option in -lldap" >&5 +$as_echo_n "checking for ldap_set_option in -lldap... " >&6; } if test "${ac_cv_lib_ldap_ldap_set_option+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lldap $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char ldap_set_option (); int main () { -ldap_set_option (); +return ldap_set_option (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_ldap_ldap_set_option=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_ldap_ldap_set_option=no + ac_cv_lib_ldap_ldap_set_option=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_set_option" >&5 -echo "${ECHO_T}$ac_cv_lib_ldap_ldap_set_option" >&6 -if test $ac_cv_lib_ldap_ldap_set_option = yes; then +{ $as_echo "$as_me:$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" = x""yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBLDAP 1 _ACEOF @@ -15454,14 +17448,14 @@ _ACEOF LIBS="-lldap $LIBS" else - { { echo "$as_me:$LINENO: error: openldap lib not found or functional" >&5 -echo "$as_me: error: openldap lib not found or functional" >&2;} + { { $as_echo "$as_me:$LINENO: error: openldap lib not found or functional" >&5 +$as_echo "$as_me: error: openldap lib not found or functional" >&2;} { (exit 1); exit 1; }; } fi else - echo "$as_me:$LINENO: result: Netscape/Mozilla" >&5 -echo "${ECHO_T}Netscape/Mozilla" >&6 + { $as_echo "$as_me:$LINENO: result: Netscape/Mozilla" >&5 +$as_echo "Netscape/Mozilla" >&6; } # TODO. Actually do a sanity check and check for # LDAP_OPT_SIZELIMIT and LDAP_X_OPT_CONNECT_TIMEOUT WITH_OPENLDAP=NO @@ -15470,14 +17464,14 @@ fi -echo "$as_me:$LINENO: checking which mozilla to use" >&5 -echo $ECHO_N "checking which mozilla to use... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking which mozilla to use" >&5 +$as_echo_n "checking which mozilla to use... " >&6; } if test -n "$with_system_mozilla" && test "$with_system_mozilla" != "no"; then - echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6 + { $as_echo "$as_me:$LINENO: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_MOZILLA=YES - echo "$as_me:$LINENO: checking which Mozilla flavour to use" >&5 -echo $ECHO_N "checking which Mozilla flavour to use... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking which Mozilla flavour to use" >&5 +$as_echo_n "checking which Mozilla flavour to use... " >&6; } if test -n "$with_system_mozilla" && test "$with_system_mozilla" = "libxul"; then MOZ_FLAVOUR=libxul elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "xulrunner"; then @@ -15492,8 +17486,8 @@ echo $ECHO_N "checking which Mozilla flavour to use... $ECHO_C" >&6 MOZ_FLAVOUR=libxul fi tmp=`echo $MOZ_FLAVOUR | $PERL -e 'print ucfirst();'` - echo "$as_me:$LINENO: result: $tmp" >&5 -echo "${ECHO_T}$tmp" >&6 + { $as_echo "$as_me:$LINENO: result: $tmp" >&5 +$as_echo "$tmp" >&6; } succeeded=no @@ -15501,10 +17495,10 @@ echo "${ECHO_T}$tmp" >&6 if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -15517,28 +17511,29 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test "$PKG_CONFIG" = "no" ; then @@ -15549,25 +17544,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for nss" >&5 -echo $ECHO_N "checking for nss... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for nss" >&5 +$as_echo_n "checking for nss... " >&6; } if $PKG_CONFIG --exists "nss" ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } succeeded=yes - echo "$as_me:$LINENO: checking MOZ_NSS_CFLAGS" >&5 -echo $ECHO_N "checking MOZ_NSS_CFLAGS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking MOZ_NSS_CFLAGS" >&5 +$as_echo_n "checking MOZ_NSS_CFLAGS... " >&6; } MOZ_NSS_CFLAGS=`$PKG_CONFIG --cflags "nss"` - echo "$as_me:$LINENO: result: $MOZ_NSS_CFLAGS" >&5 -echo "${ECHO_T}$MOZ_NSS_CFLAGS" >&6 + { $as_echo "$as_me:$LINENO: result: $MOZ_NSS_CFLAGS" >&5 +$as_echo "$MOZ_NSS_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking MOZ_NSS_LIBS" >&5 -echo $ECHO_N "checking MOZ_NSS_LIBS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking MOZ_NSS_LIBS" >&5 +$as_echo_n "checking MOZ_NSS_LIBS... " >&6; } MOZ_NSS_LIBS=`$PKG_CONFIG --libs "nss"` - echo "$as_me:$LINENO: result: $MOZ_NSS_LIBS" >&5 -echo "${ECHO_T}$MOZ_NSS_LIBS" >&6 + { $as_echo "$as_me:$LINENO: result: $MOZ_NSS_LIBS" >&5 +$as_echo "$MOZ_NSS_LIBS" >&6; } else MOZ_NSS_CFLAGS="" MOZ_NSS_LIBS="" @@ -15598,10 +17593,10 @@ echo "${ECHO_T}$MOZ_NSS_LIBS" >&6 if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -15614,28 +17609,29 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test "$PKG_CONFIG" = "no" ; then @@ -15646,25 +17642,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-nss " >&5 -echo $ECHO_N "checking for $MOZ_FLAVOUR-nss ... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-nss " >&5 +$as_echo_n "checking for $MOZ_FLAVOUR-nss ... " >&6; } if $PKG_CONFIG --exists "$MOZ_FLAVOUR-nss " ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } succeeded=yes - echo "$as_me:$LINENO: checking MOZ_NSS_CFLAGS" >&5 -echo $ECHO_N "checking MOZ_NSS_CFLAGS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking MOZ_NSS_CFLAGS" >&5 +$as_echo_n "checking MOZ_NSS_CFLAGS... " >&6; } MOZ_NSS_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-nss "` - echo "$as_me:$LINENO: result: $MOZ_NSS_CFLAGS" >&5 -echo "${ECHO_T}$MOZ_NSS_CFLAGS" >&6 + { $as_echo "$as_me:$LINENO: result: $MOZ_NSS_CFLAGS" >&5 +$as_echo "$MOZ_NSS_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking MOZ_NSS_LIBS" >&5 -echo $ECHO_N "checking MOZ_NSS_LIBS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking MOZ_NSS_LIBS" >&5 +$as_echo_n "checking MOZ_NSS_LIBS... " >&6; } MOZ_NSS_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-nss "` - echo "$as_me:$LINENO: result: $MOZ_NSS_LIBS" >&5 -echo "${ECHO_T}$MOZ_NSS_LIBS" >&6 + { $as_echo "$as_me:$LINENO: result: $MOZ_NSS_LIBS" >&5 +$as_echo "$MOZ_NSS_LIBS" >&6; } else MOZ_NSS_CFLAGS="" MOZ_NSS_LIBS="" @@ -15685,8 +17681,8 @@ echo "${ECHO_T}$MOZ_NSS_LIBS" >&6 if test $succeeded = yes; then : else - { { echo "$as_me:$LINENO: error: Library requirements ($MOZ_FLAVOUR-nss ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -echo "$as_me: error: Library requirements ($MOZ_FLAVOUR-nss ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { { $as_echo "$as_me:$LINENO: error: Library requirements ($MOZ_FLAVOUR-nss ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +$as_echo "$as_me: error: Library requirements ($MOZ_FLAVOUR-nss ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi @@ -15702,10 +17698,10 @@ echo "$as_me: error: Library requirements ($MOZ_FLAVOUR-nss ) not met; consider if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -15718,28 +17714,29 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test "$PKG_CONFIG" = "no" ; then @@ -15750,25 +17747,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for nspr " >&5 -echo $ECHO_N "checking for nspr ... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for nspr " >&5 +$as_echo_n "checking for nspr ... " >&6; } if $PKG_CONFIG --exists "nspr " ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } succeeded=yes - echo "$as_me:$LINENO: checking MOZ_NSPR_CFLAGS" >&5 -echo $ECHO_N "checking MOZ_NSPR_CFLAGS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking MOZ_NSPR_CFLAGS" >&5 +$as_echo_n "checking MOZ_NSPR_CFLAGS... " >&6; } MOZ_NSPR_CFLAGS=`$PKG_CONFIG --cflags "nspr "` - echo "$as_me:$LINENO: result: $MOZ_NSPR_CFLAGS" >&5 -echo "${ECHO_T}$MOZ_NSPR_CFLAGS" >&6 + { $as_echo "$as_me:$LINENO: result: $MOZ_NSPR_CFLAGS" >&5 +$as_echo "$MOZ_NSPR_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking MOZ_NSPR_LIBS" >&5 -echo $ECHO_N "checking MOZ_NSPR_LIBS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking MOZ_NSPR_LIBS" >&5 +$as_echo_n "checking MOZ_NSPR_LIBS... " >&6; } MOZ_NSPR_LIBS=`$PKG_CONFIG --libs "nspr "` - echo "$as_me:$LINENO: result: $MOZ_NSPR_LIBS" >&5 -echo "${ECHO_T}$MOZ_NSPR_LIBS" >&6 + { $as_echo "$as_me:$LINENO: result: $MOZ_NSPR_LIBS" >&5 +$as_echo "$MOZ_NSPR_LIBS" >&6; } else MOZ_NSPR_CFLAGS="" MOZ_NSPR_LIBS="" @@ -15789,8 +17786,8 @@ echo "${ECHO_T}$MOZ_NSPR_LIBS" >&6 if test $succeeded = yes; then : else - { { echo "$as_me:$LINENO: error: Library requirements (nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -echo "$as_me: error: Library requirements (nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { { $as_echo "$as_me:$LINENO: error: Library requirements (nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +$as_echo "$as_me: error: Library requirements (nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi @@ -15803,10 +17800,10 @@ echo "$as_me: error: Library requirements (nspr ) not met; consider adjusting th if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -15819,28 +17816,29 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test "$PKG_CONFIG" = "no" ; then @@ -15851,25 +17849,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-nspr " >&5 -echo $ECHO_N "checking for $MOZ_FLAVOUR-nspr ... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-nspr " >&5 +$as_echo_n "checking for $MOZ_FLAVOUR-nspr ... " >&6; } if $PKG_CONFIG --exists "$MOZ_FLAVOUR-nspr " ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } succeeded=yes - echo "$as_me:$LINENO: checking MOZ_NSPR_CFLAGS" >&5 -echo $ECHO_N "checking MOZ_NSPR_CFLAGS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking MOZ_NSPR_CFLAGS" >&5 +$as_echo_n "checking MOZ_NSPR_CFLAGS... " >&6; } MOZ_NSPR_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-nspr "` - echo "$as_me:$LINENO: result: $MOZ_NSPR_CFLAGS" >&5 -echo "${ECHO_T}$MOZ_NSPR_CFLAGS" >&6 + { $as_echo "$as_me:$LINENO: result: $MOZ_NSPR_CFLAGS" >&5 +$as_echo "$MOZ_NSPR_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking MOZ_NSPR_LIBS" >&5 -echo $ECHO_N "checking MOZ_NSPR_LIBS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking MOZ_NSPR_LIBS" >&5 +$as_echo_n "checking MOZ_NSPR_LIBS... " >&6; } MOZ_NSPR_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-nspr "` - echo "$as_me:$LINENO: result: $MOZ_NSPR_LIBS" >&5 -echo "${ECHO_T}$MOZ_NSPR_LIBS" >&6 + { $as_echo "$as_me:$LINENO: result: $MOZ_NSPR_LIBS" >&5 +$as_echo "$MOZ_NSPR_LIBS" >&6; } else MOZ_NSPR_CFLAGS="" MOZ_NSPR_LIBS="" @@ -15890,8 +17888,8 @@ echo "${ECHO_T}$MOZ_NSPR_LIBS" >&6 if test $succeeded = yes; then : else - { { echo "$as_me:$LINENO: error: Library requirements ($MOZ_FLAVOUR-nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -echo "$as_me: error: Library requirements ($MOZ_FLAVOUR-nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { { $as_echo "$as_me:$LINENO: error: Library requirements ($MOZ_FLAVOUR-nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +$as_echo "$as_me: error: Library requirements ($MOZ_FLAVOUR-nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi @@ -15904,10 +17902,10 @@ echo "$as_me: error: Library requirements ($MOZ_FLAVOUR-nspr ) not met; consider if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -15920,28 +17918,29 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test "$PKG_CONFIG" = "no" ; then @@ -15952,25 +17951,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-xpcom" >&5 -echo $ECHO_N "checking for $MOZ_FLAVOUR-xpcom... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-xpcom" >&5 +$as_echo_n "checking for $MOZ_FLAVOUR-xpcom... " >&6; } if $PKG_CONFIG --exists "$MOZ_FLAVOUR-xpcom" ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } succeeded=yes - echo "$as_me:$LINENO: checking MOZILLAXPCOM_CFLAGS" >&5 -echo $ECHO_N "checking MOZILLAXPCOM_CFLAGS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking MOZILLAXPCOM_CFLAGS" >&5 +$as_echo_n "checking MOZILLAXPCOM_CFLAGS... " >&6; } MOZILLAXPCOM_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-xpcom"` - echo "$as_me:$LINENO: result: $MOZILLAXPCOM_CFLAGS" >&5 -echo "${ECHO_T}$MOZILLAXPCOM_CFLAGS" >&6 + { $as_echo "$as_me:$LINENO: result: $MOZILLAXPCOM_CFLAGS" >&5 +$as_echo "$MOZILLAXPCOM_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking MOZILLAXPCOM_LIBS" >&5 -echo $ECHO_N "checking MOZILLAXPCOM_LIBS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking MOZILLAXPCOM_LIBS" >&5 +$as_echo_n "checking MOZILLAXPCOM_LIBS... " >&6; } MOZILLAXPCOM_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-xpcom"` - echo "$as_me:$LINENO: result: $MOZILLAXPCOM_LIBS" >&5 -echo "${ECHO_T}$MOZILLAXPCOM_LIBS" >&6 + { $as_echo "$as_me:$LINENO: result: $MOZILLAXPCOM_LIBS" >&5 +$as_echo "$MOZILLAXPCOM_LIBS" >&6; } else MOZILLAXPCOM_CFLAGS="" MOZILLAXPCOM_LIBS="" @@ -16005,10 +18004,10 @@ echo "${ECHO_T}$MOZILLAXPCOM_LIBS" >&6 if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -16021,28 +18020,29 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test "$PKG_CONFIG" = "no" ; then @@ -16053,25 +18053,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for libxul " >&5 -echo $ECHO_N "checking for libxul ... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for libxul " >&5 +$as_echo_n "checking for libxul ... " >&6; } if $PKG_CONFIG --exists "libxul " ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } succeeded=yes - echo "$as_me:$LINENO: checking MOZILLAXPCOM_CFLAGS" >&5 -echo $ECHO_N "checking MOZILLAXPCOM_CFLAGS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking MOZILLAXPCOM_CFLAGS" >&5 +$as_echo_n "checking MOZILLAXPCOM_CFLAGS... " >&6; } MOZILLAXPCOM_CFLAGS=`$PKG_CONFIG --cflags "libxul "` - echo "$as_me:$LINENO: result: $MOZILLAXPCOM_CFLAGS" >&5 -echo "${ECHO_T}$MOZILLAXPCOM_CFLAGS" >&6 + { $as_echo "$as_me:$LINENO: result: $MOZILLAXPCOM_CFLAGS" >&5 +$as_echo "$MOZILLAXPCOM_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking MOZILLAXPCOM_LIBS" >&5 -echo $ECHO_N "checking MOZILLAXPCOM_LIBS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking MOZILLAXPCOM_LIBS" >&5 +$as_echo_n "checking MOZILLAXPCOM_LIBS... " >&6; } MOZILLAXPCOM_LIBS=`$PKG_CONFIG --libs "libxul "` - echo "$as_me:$LINENO: result: $MOZILLAXPCOM_LIBS" >&5 -echo "${ECHO_T}$MOZILLAXPCOM_LIBS" >&6 + { $as_echo "$as_me:$LINENO: result: $MOZILLAXPCOM_LIBS" >&5 +$as_echo "$MOZILLAXPCOM_LIBS" >&6; } else MOZILLAXPCOM_CFLAGS="" MOZILLAXPCOM_LIBS="" @@ -16092,8 +18092,8 @@ echo "${ECHO_T}$MOZILLAXPCOM_LIBS" >&6 if test $succeeded = yes; then : else - { { echo "$as_me:$LINENO: error: Library requirements (libxul ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -echo "$as_me: error: Library requirements (libxul ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { { $as_echo "$as_me:$LINENO: error: Library requirements (libxul ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +$as_echo "$as_me: error: Library requirements (libxul ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi @@ -16113,61 +18113,72 @@ echo "$as_me: error: Library requirements (libxul ) not met; consider adjusting CPPFLAGS="$CPPFLAGS $MOZ_NSS_CFLAGS" LDFLAGS="$LDFLAGS $MOZ_NSS_LIBS" -echo "$as_me:$LINENO: checking for PK11_GetCertFromPrivateKey in -lnss3" >&5 -echo $ECHO_N "checking for PK11_GetCertFromPrivateKey in -lnss3... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for PK11_GetCertFromPrivateKey in -lnss3" >&5 +$as_echo_n "checking for PK11_GetCertFromPrivateKey in -lnss3... " >&6; } if test "${ac_cv_lib_nss3_PK11_GetCertFromPrivateKey+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lnss3 $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char PK11_GetCertFromPrivateKey (); int main () { -PK11_GetCertFromPrivateKey (); +return PK11_GetCertFromPrivateKey (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_nss3_PK11_GetCertFromPrivateKey=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_nss3_PK11_GetCertFromPrivateKey=no + ac_cv_lib_nss3_PK11_GetCertFromPrivateKey=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_nss3_PK11_GetCertFromPrivateKey" >&5 -echo "${ECHO_T}$ac_cv_lib_nss3_PK11_GetCertFromPrivateKey" >&6 -if test $ac_cv_lib_nss3_PK11_GetCertFromPrivateKey = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nss3_PK11_GetCertFromPrivateKey" >&5 +$as_echo "$ac_cv_lib_nss3_PK11_GetCertFromPrivateKey" >&6; } +if test "x$ac_cv_lib_nss3_PK11_GetCertFromPrivateKey" = x""yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBNSS3 1 _ACEOF @@ -16175,10 +18186,10 @@ _ACEOF LIBS="-lnss3 $LIBS" else - { { echo "$as_me:$LINENO: error: PK11_GetCertFromPrivateKey missing but needed. + { { $as_echo "$as_me:$LINENO: error: PK11_GetCertFromPrivateKey missing but needed. See https://bugzilla.mozilla.org/show_bug.cgi?id=262274. Fixed since nss 3.9.3 (contained by e.g. mozilla >= 1.7.5)" >&5 -echo "$as_me: error: PK11_GetCertFromPrivateKey missing but needed. +$as_echo "$as_me: error: PK11_GetCertFromPrivateKey missing but needed. See https://bugzilla.mozilla.org/show_bug.cgi?id=262274. Fixed since nss 3.9.3 (contained by e.g. mozilla >= 1.7.5)" >&2;} { (exit 1); exit 1; }; } @@ -16190,17 +18201,17 @@ fi MOZ_LIB_XPCOM=$MOZILLAXPCOM_LIBS if test "$WITH_LDAP" != "NO" && test "$WITH_OPENLDAP" != "YES"; then - echo "$as_me:$LINENO: checking whether $tmp was compiled with --enable-ldap" >&5 -echo $ECHO_N "checking whether $tmp was compiled with --enable-ldap... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking whether $tmp was compiled with --enable-ldap" >&5 +$as_echo_n "checking whether $tmp was compiled with --enable-ldap... " >&6; } if test -d "$MOZ_INC/ldap"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } MOZ_LDAP_CFLAGS="-I$MOZ_INC" else - { { echo "$as_me:$LINENO: error: no. + { { $as_echo "$as_me:$LINENO: error: no. Could not find LDAP header include files in $MOZ_INC/ldap. Please recompile $tmp with --enable-ldap or use --with-openldap." >&5 -echo "$as_me: error: no. +$as_echo "$as_me: error: no. Could not find LDAP header include files in $MOZ_INC/ldap. Please recompile $tmp with --enable-ldap or use --with-openldap." >&2;} { (exit 1); exit 1; }; } @@ -16214,46 +18225,46 @@ Please recompile $tmp with --enable-ldap or use --with-openldap." >&2;} fi elif test "$enable_mozilla" = "no"; then - echo "$as_me:$LINENO: result: none" >&5 -echo "${ECHO_T}none" >&6 + { $as_echo "$as_me:$LINENO: result: none" >&5 +$as_echo "none" >&6; } WITH_MOZILLA=NO else - echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6 + { $as_echo "$as_me:$LINENO: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_MOZILLA=NO BUILD_TYPE="$BUILD_TYPE MOZ" if test -z "$with_mozilla_version"; then MOZILLA_VERSION= else - echo "$as_me:$LINENO: checking which mozilla version to build" >&5 -echo $ECHO_N "checking which mozilla version to build... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking which mozilla version to build" >&5 +$as_echo_n "checking which mozilla version to build... " >&6; } MOZILLA_VERSION=$with_mozilla_version enable_build_mozilla=1 - echo "$as_me:$LINENO: result: $MOZILLA_VERSION" >&5 -echo "${ECHO_T}$MOZILLA_VERSION" >&6 + { $as_echo "$as_me:$LINENO: result: $MOZILLA_VERSION" >&5 +$as_echo "$MOZILLA_VERSION" >&6; } fi -echo "$as_me:$LINENO: checking for toolkit mozilla should use" >&5 -echo $ECHO_N "checking for toolkit mozilla should use... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for toolkit mozilla should use" >&5 +$as_echo_n "checking for toolkit mozilla should use... " >&6; } if test -z "$with_mozilla_toolkit"; then if test "$_os" != "WINNT" ; then if test "$_os" = "Darwin" ; then MOZILLA_TOOLKIT=mac - echo "$as_me:$LINENO: result: mac" >&5 -echo "${ECHO_T}mac" >&6 + { $as_echo "$as_me:$LINENO: result: mac" >&5 +$as_echo "mac" >&6; } else MOZILLA_TOOLKIT=gtk2 - echo "$as_me:$LINENO: result: gtk2" >&5 -echo "${ECHO_T}gtk2" >&6 + { $as_echo "$as_me:$LINENO: result: gtk2" >&5 +$as_echo "gtk2" >&6; } fi fi else MOZILLA_TOOLKIT=$with_mozilla_toolkit enable_build_mozilla=1 - echo "$as_me:$LINENO: result: $MOZILLA_TOOLKIT" >&5 -echo "${ECHO_T}$MOZILLA_TOOLKIT" >&6 + { $as_echo "$as_me:$LINENO: result: $MOZILLA_TOOLKIT" >&5 +$as_echo "$MOZILLA_TOOLKIT" >&6; } fi #if test "$_os" = "Darwin" && test "$MOZILLA_TOOLKIT" != "gtk2"; then # #only gtk2 toolkit supported - xlib or cocoa nees glib1 and libIDL1 - the latter is not @@ -16270,16 +18281,16 @@ else enable_build_mozilla= fi -echo "$as_me:$LINENO: checking whether to build Mozilla/SeaMonkey" >&5 -echo $ECHO_N "checking whether to build Mozilla/SeaMonkey... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to build Mozilla/SeaMonkey" >&5 +$as_echo_n "checking whether to build Mozilla/SeaMonkey... " >&6; } if test -n "$enable_build_mozilla"; then BUILD_MOZAB="TRUE" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else BUILD_MOZAB="" - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi if test "$BUILD_MOZAB" = "TRUE"; then @@ -16287,13 +18298,13 @@ if test "$BUILD_MOZAB" = "TRUE"; then if test "$WITH_MINGWIN" != "yes"; then # compiling with MSVC. Only supported platform here is MSVS2005 at the moment. if test "$MSVSVER" != "2005"; then - { { echo "$as_me:$LINENO: error: Building SeaMonkey is supported with Microsoft Visual Studio .NET 2005 only." >&5 -echo "$as_me: error: Building SeaMonkey is supported with Microsoft Visual Studio .NET 2005 only." >&2;} + { { $as_echo "$as_me:$LINENO: error: Building SeaMonkey is supported with Microsoft Visual Studio .NET 2005 only." >&5 +$as_echo "$as_me: error: Building SeaMonkey is supported with Microsoft Visual Studio .NET 2005 only." >&2;} { (exit 1); exit 1; }; } fi else - { echo "$as_me:$LINENO: WARNING: Building SeaMonkey with mingwin is not tested, and likely to break." >&5 -echo "$as_me: WARNING: Building SeaMonkey with mingwin is not tested, and likely to break." >&2;} + { $as_echo "$as_me:$LINENO: WARNING: Building SeaMonkey with mingwin is not tested, and likely to break." >&5 +$as_echo "$as_me: WARNING: Building SeaMonkey with mingwin is not tested, and likely to break." >&2;} echo "Building SeaMonkey with mingwin is not tested, and likely to break." >> warn fi fi @@ -16303,56 +18314,56 @@ echo "$as_me: WARNING: Building SeaMonkey with mingwin is not tested, and likely fi MOZILLA_SOURCE_VERSION="seamonkey-${MOZILLA_VERSION}.source" for e in gz bz2; do - echo "$as_me:$LINENO: checking for $MOZILLA_SOURCE_VERSION.tar.$e" >&5 -echo $ECHO_N "checking for $MOZILLA_SOURCE_VERSION.tar.$e... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for $MOZILLA_SOURCE_VERSION.tar.$e" >&5 +$as_echo_n "checking for $MOZILLA_SOURCE_VERSION.tar.$e... " >&6; } if test ! -e "moz/download/$MOZILLA_SOURCE_VERSION.tar.$e" && test "$HAVE_MOZILLA_TARBALL" != "y"; then - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { $as_echo "$as_me:$LINENO: result: not found" >&5 +$as_echo "not found" >&6; } HAVE_MOZILLA_TARBALL=n else - echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6 + { $as_echo "$as_me:$LINENO: result: found" >&5 +$as_echo "found" >&6; } HAVE_MOZILLA_TARBALL=y fi done if test "$HAVE_MOZILLA_TARBALL" != "y"; then - { { echo "$as_me:$LINENO: error: Mozilla/SeaMonkey source archive not found. + { { $as_echo "$as_me:$LINENO: error: Mozilla/SeaMonkey source archive not found. Please copy $MOZILLA_SOURCE_VERSION.tar.bz2 or $MOZILLA_SOURCE_VERSION.tar.gz to moz/download/. The archives can be found here: http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/$MOZILLA_VERSION/" >&5 -echo "$as_me: error: Mozilla/SeaMonkey source archive not found. +$as_echo "$as_me: error: Mozilla/SeaMonkey source archive not found. Please copy $MOZILLA_SOURCE_VERSION.tar.bz2 or $MOZILLA_SOURCE_VERSION.tar.gz to moz/download/. The archives can be found here: http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/$MOZILLA_VERSION/" >&2;} { (exit 1); exit 1; }; } fi if test "$_os" = "WINNT"; then - echo "$as_me:$LINENO: checking for moztools binaries" >&5 -echo $ECHO_N "checking for moztools binaries... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for moztools binaries" >&5 +$as_echo_n "checking for moztools binaries... " >&6; } if test ! -e "moz/download/vc8-moztools.zip" ; then - { { echo "$as_me:$LINENO: error: The following file is missing in moz/download: vc8-moztools.zip + { { $as_echo "$as_me:$LINENO: error: The following file is missing in moz/download: vc8-moztools.zip (from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc8/)" >&5 -echo "$as_me: error: The following file is missing in moz/download: vc8-moztools.zip +$as_echo "$as_me: error: The following file is missing in moz/download: vc8-moztools.zip (from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc8/)" >&2;} { (exit 1); exit 1; }; } else - echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6 + { $as_echo "$as_me:$LINENO: result: ok" >&5 +$as_echo "ok" >&6; } fi elif test "$_os" = "Darwin"; then if test "$MOZILLA_TOOLKIT" = "gtk2"; then - { echo "$as_me:$LINENO: checking whether mozilla can be built..." >&5 -echo "$as_me: checking whether mozilla can be built..." >&6;} + { $as_echo "$as_me:$LINENO: checking whether mozilla can be built..." >&5 +$as_echo "$as_me: checking whether mozilla can be built..." >&6;} succeeded=no if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -16365,28 +18376,29 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test "$PKG_CONFIG" = "no" ; then @@ -16397,25 +18409,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8" >&5 -echo $ECHO_N "checking for gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8" >&5 +$as_echo_n "checking for gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8... " >&6; } if $PKG_CONFIG --exists "gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8" ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } succeeded=yes - echo "$as_me:$LINENO: checking MOZGTK2_CFLAGS" >&5 -echo $ECHO_N "checking MOZGTK2_CFLAGS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking MOZGTK2_CFLAGS" >&5 +$as_echo_n "checking MOZGTK2_CFLAGS... " >&6; } MOZGTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8"` - echo "$as_me:$LINENO: result: $MOZGTK2_CFLAGS" >&5 -echo "${ECHO_T}$MOZGTK2_CFLAGS" >&6 + { $as_echo "$as_me:$LINENO: result: $MOZGTK2_CFLAGS" >&5 +$as_echo "$MOZGTK2_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking MOZGTK2_LIBS" >&5 -echo $ECHO_N "checking MOZGTK2_LIBS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking MOZGTK2_LIBS" >&5 +$as_echo_n "checking MOZGTK2_LIBS... " >&6; } MOZGTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8"` - echo "$as_me:$LINENO: result: $MOZGTK2_LIBS" >&5 -echo "${ECHO_T}$MOZGTK2_LIBS" >&6 + { $as_echo "$as_me:$LINENO: result: $MOZGTK2_LIBS" >&5 +$as_echo "$MOZGTK2_LIBS" >&6; } else MOZGTK2_CFLAGS="" MOZGTK2_LIBS="" @@ -16434,11 +18446,11 @@ echo "${ECHO_T}$MOZGTK2_LIBS" >&6 fi if test $succeeded = yes; then - { echo "$as_me:$LINENO: OK - can build mozilla" >&5 -echo "$as_me: OK - can build mozilla" >&6;} + { $as_echo "$as_me:$LINENO: OK - can build mozilla" >&5 +$as_echo "$as_me: OK - can build mozilla" >&6;} else - { { echo "$as_me:$LINENO: error: Prerequisites to build mozilla not met. Either use the precompiled mozilla binaries or install the missing packages" >&5 -echo "$as_me: error: Prerequisites to build mozilla not met. Either use the precompiled mozilla binaries or install the missing packages" >&2;} + { { $as_echo "$as_me:$LINENO: error: Prerequisites to build mozilla not met. Either use the precompiled mozilla binaries or install the missing packages" >&5 +$as_echo "$as_me: error: Prerequisites to build mozilla not met. Either use the precompiled mozilla binaries or install the missing packages" >&2;} { (exit 1); exit 1; }; } fi @@ -16449,10 +18461,10 @@ echo "$as_me: error: Prerequisites to build mozilla not met. Either use the prec if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -16465,28 +18477,29 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test "$PKG_CONFIG" = "no" ; then @@ -16497,25 +18510,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for libIDL >= 0.6.3 libIDL <= 0.6.8" >&5 -echo $ECHO_N "checking for libIDL >= 0.6.3 libIDL <= 0.6.8... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for libIDL >= 0.6.3 libIDL <= 0.6.8" >&5 +$as_echo_n "checking for libIDL >= 0.6.3 libIDL <= 0.6.8... " >&6; } if $PKG_CONFIG --exists "libIDL >= 0.6.3 libIDL <= 0.6.8" ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } succeeded=yes - echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5 -echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5 +$as_echo_n "checking MOZLIBREQ_CFLAGS... " >&6; } MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "libIDL >= 0.6.3 libIDL <= 0.6.8"` - echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5 -echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6 + { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5 +$as_echo "$MOZLIBREQ_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5 -echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5 +$as_echo_n "checking MOZLIBREQ_LIBS... " >&6; } MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "libIDL >= 0.6.3 libIDL <= 0.6.8"` - echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5 -echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6 + { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5 +$as_echo "$MOZLIBREQ_LIBS" >&6; } else MOZLIBREQ_CFLAGS="" MOZLIBREQ_LIBS="" @@ -16540,8 +18553,8 @@ echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6 fi if test -z "$MOZIDL"; then - { { echo "$as_me:$LINENO: error: libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla." >&5 -echo "$as_me: error: libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla." >&2;} + { { $as_echo "$as_me:$LINENO: error: libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla." >&5 +$as_echo "$as_me: error: libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla." >&2;} { (exit 1); exit 1; }; } fi fi @@ -16554,10 +18567,10 @@ echo "$as_me: error: libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -16570,28 +18583,29 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test "$PKG_CONFIG" = "no" ; then @@ -16602,25 +18616,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for gtk+-2.0" >&5 -echo $ECHO_N "checking for gtk+-2.0... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for gtk+-2.0" >&5 +$as_echo_n "checking for gtk+-2.0... " >&6; } if $PKG_CONFIG --exists "gtk+-2.0" ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } succeeded=yes - echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5 -echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5 +$as_echo_n "checking MOZLIBREQ_CFLAGS... " >&6; } MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0"` - echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5 -echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6 + { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5 +$as_echo "$MOZLIBREQ_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5 -echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5 +$as_echo_n "checking MOZLIBREQ_LIBS... " >&6; } MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "gtk+-2.0"` - echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5 -echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6 + { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5 +$as_echo "$MOZLIBREQ_LIBS" >&6; } else MOZLIBREQ_CFLAGS="" MOZLIBREQ_LIBS="" @@ -16645,8 +18659,8 @@ echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6 fi if test -z "$MOZGTK"; then - { { echo "$as_me:$LINENO: error: GTK2 is needed to build mozilla." >&5 -echo "$as_me: error: GTK2 is needed to build mozilla." >&2;} + { { $as_echo "$as_me:$LINENO: error: GTK2 is needed to build mozilla." >&5 +$as_echo "$as_me: error: GTK2 is needed to build mozilla." >&2;} { (exit 1); exit 1; }; } fi @@ -16655,10 +18669,10 @@ echo "$as_me: error: GTK2 is needed to build mozilla." >&2;} if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -16671,28 +18685,29 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test "$PKG_CONFIG" = "no" ; then @@ -16703,25 +18718,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for libIDL-2.0 >= 0.8.0" >&5 -echo $ECHO_N "checking for libIDL-2.0 >= 0.8.0... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for libIDL-2.0 >= 0.8.0" >&5 +$as_echo_n "checking for libIDL-2.0 >= 0.8.0... " >&6; } if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } succeeded=yes - echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5 -echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5 +$as_echo_n "checking MOZLIBREQ_CFLAGS... " >&6; } MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"` - echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5 -echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6 + { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5 +$as_echo "$MOZLIBREQ_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5 -echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5 +$as_echo_n "checking MOZLIBREQ_LIBS... " >&6; } MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "libIDL-2.0 >= 0.8.0"` - echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5 -echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6 + { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5 +$as_echo "$MOZLIBREQ_LIBS" >&6; } else MOZLIBREQ_CFLAGS="" MOZLIBREQ_LIBS="" @@ -16746,8 +18761,8 @@ echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6 fi if test -z "$MOZIDL"; then - { { echo "$as_me:$LINENO: error: libIDL >= 0.8.0 is needed when using GTK2 to build mozilla." >&5 -echo "$as_me: error: libIDL >= 0.8.0 is needed when using GTK2 to build mozilla." >&2;} + { { $as_echo "$as_me:$LINENO: error: libIDL >= 0.8.0 is needed when using GTK2 to build mozilla." >&5 +$as_echo "$as_me: error: libIDL >= 0.8.0 is needed when using GTK2 to build mozilla." >&2;} { (exit 1); exit 1; }; } fi else @@ -16757,10 +18772,10 @@ echo "$as_me: error: libIDL >= 0.8.0 is needed when using GTK2 to build mozilla. if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -16773,28 +18788,29 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test "$PKG_CONFIG" = "no" ; then @@ -16805,25 +18821,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for gtk+ >= 1.2.3" >&5 -echo $ECHO_N "checking for gtk+ >= 1.2.3... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for gtk+ >= 1.2.3" >&5 +$as_echo_n "checking for gtk+ >= 1.2.3... " >&6; } if $PKG_CONFIG --exists "gtk+ >= 1.2.3" ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } succeeded=yes - echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5 -echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5 +$as_echo_n "checking MOZLIBREQ_CFLAGS... " >&6; } MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "gtk+ >= 1.2.3"` - echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5 -echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6 + { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5 +$as_echo "$MOZLIBREQ_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5 -echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5 +$as_echo_n "checking MOZLIBREQ_LIBS... " >&6; } MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "gtk+ >= 1.2.3"` - echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5 -echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6 + { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5 +$as_echo "$MOZLIBREQ_LIBS" >&6; } else MOZLIBREQ_CFLAGS="" MOZLIBREQ_LIBS="" @@ -16848,8 +18864,8 @@ echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6 fi if test -z "$MOZGTK"; then - { { echo "$as_me:$LINENO: error: gtk 1.2 is needed when not using GTK2 to build mozilla." >&5 -echo "$as_me: error: gtk 1.2 is needed when not using GTK2 to build mozilla." >&2;} + { { $as_echo "$as_me:$LINENO: error: gtk 1.2 is needed when not using GTK2 to build mozilla." >&5 +$as_echo "$as_me: error: gtk 1.2 is needed when not using GTK2 to build mozilla." >&2;} { (exit 1); exit 1; }; } fi @@ -16858,10 +18874,10 @@ echo "$as_me: error: gtk 1.2 is needed when not using GTK2 to build mozilla." >& if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -16874,28 +18890,29 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test "$PKG_CONFIG" = "no" ; then @@ -16906,25 +18923,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for libidl >= 0.6.3 libidl <= 0.6.8" >&5 -echo $ECHO_N "checking for libidl >= 0.6.3 libidl <= 0.6.8... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for libidl >= 0.6.3 libidl <= 0.6.8" >&5 +$as_echo_n "checking for libidl >= 0.6.3 libidl <= 0.6.8... " >&6; } if $PKG_CONFIG --exists "libidl >= 0.6.3 libidl <= 0.6.8" ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } succeeded=yes - echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5 -echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5 +$as_echo_n "checking MOZLIBREQ_CFLAGS... " >&6; } MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "libidl >= 0.6.3 libidl <= 0.6.8"` - echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5 -echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6 + { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5 +$as_echo "$MOZLIBREQ_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5 -echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5 +$as_echo_n "checking MOZLIBREQ_LIBS... " >&6; } MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "libidl >= 0.6.3 libidl <= 0.6.8"` - echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5 -echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6 + { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5 +$as_echo "$MOZLIBREQ_LIBS" >&6; } else MOZLIBREQ_CFLAGS="" MOZLIBREQ_LIBS="" @@ -16949,8 +18966,8 @@ echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6 fi if test -z "$MOZIDL"; then - { { echo "$as_me:$LINENO: error: libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla." >&5 -echo "$as_me: error: libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla." >&2;} + { { $as_echo "$as_me:$LINENO: error: libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla." >&5 +$as_echo "$as_me: error: libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla." >&2;} { (exit 1); exit 1; }; } fi fi @@ -16969,27 +18986,26 @@ fi -echo "$as_me:$LINENO: checking which sane header to use" >&5 -echo $ECHO_N "checking which sane header to use... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking which sane header to use" >&5 +$as_echo_n "checking which sane header to use... " >&6; } if test -n "$with_system_sane_header" -o -n "$with_system_headers" && \ test "$with_system_sane_header" != "no"; then - echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6 + { $as_echo "$as_me:$LINENO: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_SANE_HEADER=YES if test "${ac_cv_header_sane_sane_h+set}" = set; then - echo "$as_me:$LINENO: checking for sane/sane.h" >&5 -echo $ECHO_N "checking for sane/sane.h... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for sane/sane.h" >&5 +$as_echo_n "checking for sane/sane.h... " >&6; } if test "${ac_cv_header_sane_sane_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_sane_sane_h" >&5 -echo "${ECHO_T}$ac_cv_header_sane_sane_h" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sane_sane_h" >&5 +$as_echo "$ac_cv_header_sane_sane_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking sane/sane.h usability" >&5 -echo $ECHO_N "checking sane/sane.h usability... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking sane/sane.h usability" >&5 +$as_echo_n "checking sane/sane.h usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -16999,33 +19015,39 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking sane/sane.h presence" >&5 -echo $ECHO_N "checking sane/sane.h presence... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking sane/sane.h presence" >&5 +$as_echo_n "checking sane/sane.h presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -17033,112 +19055,104 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) - { echo "$as_me:$LINENO: WARNING: sane/sane.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: sane/sane.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: sane/sane.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: sane/sane.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: sane/sane.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: sane/sane.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: sane/sane.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: sane/sane.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) - { echo "$as_me:$LINENO: WARNING: sane/sane.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: sane/sane.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: sane/sane.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: sane/sane.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: sane/sane.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: sane/sane.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: sane/sane.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: sane/sane.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: sane/sane.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: sane/sane.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: sane/sane.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: sane/sane.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: sane/sane.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: sane/sane.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: sane/sane.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: sane/sane.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: sane/sane.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: sane/sane.h: in the future, the compiler will take precedence" >&2;} + ;; esac -echo "$as_me:$LINENO: checking for sane/sane.h" >&5 -echo $ECHO_N "checking for sane/sane.h... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for sane/sane.h" >&5 +$as_echo_n "checking for sane/sane.h... " >&6; } if test "${ac_cv_header_sane_sane_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_cv_header_sane_sane_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_sane_sane_h" >&5 -echo "${ECHO_T}$ac_cv_header_sane_sane_h" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sane_sane_h" >&5 +$as_echo "$ac_cv_header_sane_sane_h" >&6; } fi -if test $ac_cv_header_sane_sane_h = yes; then +if test "x$ac_cv_header_sane_sane_h" = x""yes; then : else - { { echo "$as_me:$LINENO: error: sane not found. install sane" >&5 -echo "$as_me: error: sane not found. install sane" >&2;} + { { $as_echo "$as_me:$LINENO: error: sane not found. install sane" >&5 +$as_echo "$as_me: error: sane not found. install sane" >&2;} { (exit 1); exit 1; }; } fi else - echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6 + { $as_echo "$as_me:$LINENO: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_SANE_HEADER=NO BUILD_TYPE="$BUILD_TYPE SANE" fi -echo "$as_me:$LINENO: checking which icu to use" >&5 -echo $ECHO_N "checking which icu to use... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking which icu to use" >&5 +$as_echo_n "checking which icu to use... " >&6; } if test -n "$with_system_icu" -o -n "$with_system_libs" && \ test "$with_system_icu" != "no"; then - echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6 + { $as_echo "$as_me:$LINENO: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_ICU=YES - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - echo "$as_me:$LINENO: checking for unicode/rbbi.h" >&5 -echo $ECHO_N "checking for unicode/rbbi.h... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for unicode/rbbi.h" >&5 +$as_echo_n "checking for unicode/rbbi.h... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -17146,40 +19160,41 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ unicode/rbbi.h _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - echo "$as_me:$LINENO: result: checked." >&5 -echo "${ECHO_T}checked." >&6 -else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then + { $as_echo "$as_me:$LINENO: result: checked." >&5 +$as_echo "checked." >&6; } +else + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { { echo "$as_me:$LINENO: error: icu headers not found." >&5 -echo "$as_me: error: icu headers not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: icu headers not found." >&5 +$as_echo "$as_me: error: icu headers not found." >&2;} { (exit 1); exit 1; }; } fi + rm -f conftest.err conftest.$ac_ext # Extract the first word of "genbrk", so it can be a program name with args. set dummy genbrk; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_SYSTEM_GENBRK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $SYSTEM_GENBRK in [\\/]* | ?:[\\/]*) @@ -17193,38 +19208,39 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_SYSTEM_GENBRK="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi SYSTEM_GENBRK=$ac_cv_path_SYSTEM_GENBRK - if test -n "$SYSTEM_GENBRK"; then - echo "$as_me:$LINENO: result: $SYSTEM_GENBRK" >&5 -echo "${ECHO_T}$SYSTEM_GENBRK" >&6 + { $as_echo "$as_me:$LINENO: result: $SYSTEM_GENBRK" >&5 +$as_echo "$SYSTEM_GENBRK" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + if test -z "$SYSTEM_GENBRK"; then - { { echo "$as_me:$LINENO: error: \\"genbrk\\" not found in \$PATH, install the icu development tool \\"genbrk\"\" >&5 -echo "$as_me: error: \\"genbrk\\" not found in \$PATH, install the icu development tool \\"genbrk\"\" >&2;} + { { $as_echo "$as_me:$LINENO: error: \\"genbrk\\" not found in \$PATH, install the icu development tool \\"genbrk\"\" >&5 +$as_echo "$as_me: error: \\"genbrk\\" not found in \$PATH, install the icu development tool \\"genbrk\"\" >&2;} { (exit 1); exit 1; }; } fi # Extract the first word of "genccode", so it can be a program name with args. set dummy genccode; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_SYSTEM_GENCCODE+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $SYSTEM_GENCCODE in [\\/]* | ?:[\\/]*) @@ -17238,38 +19254,39 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_SYSTEM_GENCCODE="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi SYSTEM_GENCCODE=$ac_cv_path_SYSTEM_GENCCODE - if test -n "$SYSTEM_GENCCODE"; then - echo "$as_me:$LINENO: result: $SYSTEM_GENCCODE" >&5 -echo "${ECHO_T}$SYSTEM_GENCCODE" >&6 + { $as_echo "$as_me:$LINENO: result: $SYSTEM_GENCCODE" >&5 +$as_echo "$SYSTEM_GENCCODE" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + if test -z "$SYSTEM_GENCCODE"; then - { { echo "$as_me:$LINENO: error: \\"genccode\\" not found in \$PATH, install the icu development tool \\"genccode\"\" >&5 -echo "$as_me: error: \\"genccode\\" not found in \$PATH, install the icu development tool \\"genccode\"\" >&2;} + { { $as_echo "$as_me:$LINENO: error: \\"genccode\\" not found in \$PATH, install the icu development tool \\"genccode\"\" >&5 +$as_echo "$as_me: error: \\"genccode\\" not found in \$PATH, install the icu development tool \\"genccode\"\" >&2;} { (exit 1); exit 1; }; } fi # Extract the first word of "gencmn", so it can be a program name with args. set dummy gencmn; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_SYSTEM_GENCMN+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $SYSTEM_GENCMN in [\\/]* | ?:[\\/]*) @@ -17283,43 +19300,45 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_SYSTEM_GENCMN="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi SYSTEM_GENCMN=$ac_cv_path_SYSTEM_GENCMN - if test -n "$SYSTEM_GENCMN"; then - echo "$as_me:$LINENO: result: $SYSTEM_GENCMN" >&5 -echo "${ECHO_T}$SYSTEM_GENCMN" >&6 + { $as_echo "$as_me:$LINENO: result: $SYSTEM_GENCMN" >&5 +$as_echo "$SYSTEM_GENCMN" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + if test -z "$SYSTEM_GENCMN"; then - { { echo "$as_me:$LINENO: error: \\"gencmn\\" not found in \$PATH, install the icu development tool \\"gencmn\"\" >&5 -echo "$as_me: error: \\"gencmn\\" not found in \$PATH, install the icu development tool \\"gencmn\"\" >&2;} + { { $as_echo "$as_me:$LINENO: error: \\"gencmn\\" not found in \$PATH, install the icu development tool \\"gencmn\"\" >&5 +$as_echo "$as_me: error: \\"gencmn\\" not found in \$PATH, install the icu development tool \\"gencmn\"\" >&2;} { (exit 1); exit 1; }; } fi - echo "$as_me:$LINENO: checking ICU version" >&5 -echo $ECHO_N "checking ICU version... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking ICU version" >&5 +$as_echo_n "checking ICU version... " >&6; } if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run test program while cross compiling +$as_echo "$as_me: error: cannot run test program while cross compiling See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -17337,30 +19356,44 @@ int main(int argc, char **argv) { _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: OK" >&5 -echo "${ECHO_T}OK" >&6 + { $as_echo "$as_me:$LINENO: result: OK" >&5 +$as_echo "OK" >&6; } else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: not suitable, only >= 4.0 supported currently" >&5 -echo "$as_me: error: not suitable, only >= 4.0 supported currently" >&2;} +{ { $as_echo "$as_me:$LINENO: error: not suitable, only >= 4.0 supported currently" >&5 +$as_echo "$as_me: error: not suitable, only >= 4.0 supported currently" >&2;} { (exit 1); exit 1; }; } fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -17368,8 +19401,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu else - echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6 + { $as_echo "$as_me:$LINENO: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_ICU=NO BUILD_TYPE="$BUILD_TYPE ICU" fi @@ -17379,17 +19412,155 @@ fi -if test "$_os" = "Darwin"; then - if test "x$with_x" = "xyes"; then - { { echo "$as_me:$LINENO: error: X11 build is no longer supported on MacOSX, please use the native aqua build" >&5 -echo "$as_me: error: X11 build is no longer supported on MacOSX, please use the native aqua build" >&2;} - { (exit 1); exit 1; }; } +{ $as_echo "$as_me:$LINENO: checking whether to enable graphite support" >&5 +$as_echo_n "checking whether to enable graphite support... " >&6; } +if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "z$enable_graphite" == "z" -o "$enable_graphite" != "no" ; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + ENABLE_GRAPHITE="TRUE" + { $as_echo "$as_me:$LINENO: checking which graphite to use" >&5 +$as_echo_n "checking which graphite to use... " >&6; } + if test -n "$with_system_graphite" -o -n "$with_system_libs" && \ + test "$with_system_graphite" != "no"; then + { $as_echo "$as_me:$LINENO: result: external" >&5 +$as_echo "external" >&6; } + SYSTEM_GRAPHITE=YES + + succeeded=no + + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + { $as_echo "$as_me:$LINENO: checking for silgraphite " >&5 +$as_echo_n "checking for silgraphite ... " >&6; } + + if $PKG_CONFIG --exists "silgraphite " ; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + succeeded=yes + + { $as_echo "$as_me:$LINENO: checking GRAPHITE_CFLAGS" >&5 +$as_echo_n "checking GRAPHITE_CFLAGS... " >&6; } + GRAPHITE_CFLAGS=`$PKG_CONFIG --cflags "silgraphite "` + { $as_echo "$as_me:$LINENO: result: $GRAPHITE_CFLAGS" >&5 +$as_echo "$GRAPHITE_CFLAGS" >&6; } + + { $as_echo "$as_me:$LINENO: checking GRAPHITE_LIBS" >&5 +$as_echo_n "checking GRAPHITE_LIBS... " >&6; } + GRAPHITE_LIBS=`$PKG_CONFIG --libs "silgraphite "` + { $as_echo "$as_me:$LINENO: result: $GRAPHITE_LIBS" >&5 +$as_echo "$GRAPHITE_LIBS" >&6; } + else + GRAPHITE_CFLAGS="" + GRAPHITE_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + GRAPHITE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "silgraphite "` + echo $GRAPHITE_PKG_ERRORS + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + : + else + { { $as_echo "$as_me:$LINENO: error: Library requirements (silgraphite ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +$as_echo "$as_me: error: Library requirements (silgraphite ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { (exit 1); exit 1; }; } + fi + + { $as_echo "$as_me:$LINENO: checking STL compatibility" >&5 +$as_echo_n "checking STL compatibility... " >&6; } + if test "$WITH_STLPORT" != "no"; then + { { $as_echo "$as_me:$LINENO: error: to use system graphite you need to use --without-stlport" >&5 +$as_echo "$as_me: error: to use system graphite you need to use --without-stlport" >&2;} + { (exit 1); exit 1; }; } + else + { $as_echo "$as_me:$LINENO: result: OK" >&5 +$as_echo "OK" >&6; } + fi + else + { $as_echo "$as_me:$LINENO: result: internal" >&5 +$as_echo "internal" >&6; } + SYSTEM_GRAPHITE=NO + BUILD_TYPE="$BUILD_TYPE GRAPHITE" + fi +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + + + + +if test "$_os" = "Darwin"; then + if test "x$with_x" = "xyes"; then + { { $as_echo "$as_me:$LINENO: error: X11 build is no longer supported on MacOSX, please use the native aqua build" >&5 +$as_echo "$as_me: error: X11 build is no longer supported on MacOSX, please use the native aqua build" >&2;} + { (exit 1); exit 1; }; } else - echo "$as_me:$LINENO: checking for /System/Library/Frameworks/AppKit.framework" >&5 -echo $ECHO_N "checking for /System/Library/Frameworks/AppKit.framework... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for /System/Library/Frameworks/AppKit.framework" >&5 +$as_echo_n "checking for /System/Library/Frameworks/AppKit.framework... " >&6; } if test -d "/System/Library/Frameworks/AppKit.framework/"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } x_includes="no_x_includes" x_libraries="no_x_libraries" enable_gtk=no @@ -17397,8 +19568,8 @@ echo "${ECHO_T}yes" >&6 ENABLE_CUPS="" else - { { echo "$as_me:$LINENO: error: No AppKit.framewrok found" >&5 -echo "$as_me: error: No AppKit.framewrok found" >&2;} + { { $as_echo "$as_me:$LINENO: error: No AppKit.framewrok found" >&5 +$as_echo "$as_me: error: No AppKit.framewrok found" >&2;} { (exit 1); exit 1; }; } fi fi @@ -17411,61 +19582,66 @@ elif test "$_os" = "OS2" ; then echo "Do Nothing for _os = OS2. Don't check for X11." : elif test "$_os" != "WINNT" ; then - echo "$as_me:$LINENO: checking for X" >&5 -echo $ECHO_N "checking for X... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for X" >&5 +$as_echo_n "checking for X... " >&6; } -# Check whether --with-x or --without-x was given. +# Check whether --with-x was given. if test "${with_x+set}" = set; then - withval="$with_x" + withval=$with_x; +fi -fi; # $have_x is `yes', `no', `disabled', or empty when we do not yet know. if test "x$with_x" = xno; then # The user explicitly disabled X. have_x=disabled else - if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then - # Both variables are already set. - have_x=yes - else - if test "${ac_cv_have_x+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + case $x_includes,$x_libraries in #( + *\'*) { { $as_echo "$as_me:$LINENO: error: cannot use X directory names containing '" >&5 +$as_echo "$as_me: error: cannot use X directory names containing '" >&2;} + { (exit 1); exit 1; }; };; #( + *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then + $as_echo_n "(cached) " >&6 else # One or both of the vars are not set, and there is no cached value. ac_x_includes=no ac_x_libraries=no -rm -fr conftest.dir +rm -f -r conftest.dir if mkdir conftest.dir; then cd conftest.dir - # Make sure to not put "make" in the Imakefile rules, since we grep it out. cat >Imakefile <<'_ACEOF' -acfindx: - @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' -_ACEOF - if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then +incroot: + @echo incroot='${INCROOT}' +usrlibdir: + @echo usrlibdir='${USRLIBDIR}' +libdir: + @echo libdir='${LIBDIR}' +_ACEOF + if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then # GNU make sometimes prints "make[1]: Entering...", which would confuse us. - eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` + for ac_var in incroot usrlibdir libdir; do + eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" + done # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. - for ac_extension in a so sl; do - if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && - test -f $ac_im_libdir/libX11.$ac_extension; then - ac_im_usrlibdir=$ac_im_libdir; break + for ac_extension in a so sl dylib la dll; do + if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && + test -f "$ac_im_libdir/libX11.$ac_extension"; then + ac_im_usrlibdir=$ac_im_libdir; break fi done # Screen out bogus values from the imake configuration. They are # bogus both because they are the default anyway, and because # using them would break gcc on systems where it needs fixed includes. case $ac_im_incroot in - /usr/include) ;; + /usr/include) ac_x_includes= ;; *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; esac case $ac_im_usrlibdir in - /usr/lib | /lib) ;; + /usr/lib | /usr/lib64 | /lib | /lib64) ;; *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; esac fi cd .. - rm -fr conftest.dir + rm -f -r conftest.dir fi # Standard set of common directories for X headers. @@ -17506,47 +19682,47 @@ ac_x_header_dirs=' /usr/openwin/share/include' if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Intrinsic.h. + # Guess where to find include files, by looking for Xlib.h. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then # We can compile using X headers with no special include directory. ac_x_includes= else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Intrinsic.h"; then + if test -r "$ac_dir/X11/Xlib.h"; then ac_x_includes=$ac_dir break fi done fi + rm -f conftest.err conftest.$ac_ext fi # $ac_x_includes = no @@ -17555,84 +19731,99 @@ if test "$ac_x_libraries" = no; then # See if we find them without any special options. # Don't add to $LIBS permanently. ac_save_LIBS=$LIBS - LIBS="-lXt $LIBS" + LIBS="-lX11 $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include int main () { -XtMalloc (0) +XrmInitialize () ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then LIBS=$ac_save_LIBS # We can link X programs with no special library path. ac_x_libraries= else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -LIBS=$ac_save_LIBS -for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` + LIBS=$ac_save_LIBS +for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` do # Don't even attempt the hair of trying to link an X program! - for ac_extension in a so sl; do - if test -r $ac_dir/libXt.$ac_extension; then + for ac_extension in a so sl dylib la dll; do + if test -r "$ac_dir/libX11.$ac_extension"; then ac_x_libraries=$ac_dir break 2 fi done done fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi # $ac_x_libraries = no -if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then - # Didn't find X anywhere. Cache the known absence of X. - ac_cv_have_x="have_x=no" -else - # Record where we found X for the cache. - ac_cv_have_x="have_x=yes \ - ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" -fi +case $ac_x_includes,$ac_x_libraries in #( + no,* | *,no | *\'*) + # Didn't find X, or a directory has "'" in its name. + ac_cv_have_x="have_x=no";; #( + *) + # Record where we found X for the cache. + ac_cv_have_x="have_x=yes\ + ac_x_includes='$ac_x_includes'\ + ac_x_libraries='$ac_x_libraries'" +esac fi - - fi +;; #( + *) have_x=yes;; + esac eval "$ac_cv_have_x" fi # $with_x != no if test "$have_x" != yes; then - echo "$as_me:$LINENO: result: $have_x" >&5 -echo "${ECHO_T}$have_x" >&6 + { $as_echo "$as_me:$LINENO: result: $have_x" >&5 +$as_echo "$have_x" >&6; } no_x=yes else # If each of the values was on the command line, it overrides each guess. test "x$x_includes" = xNONE && x_includes=$ac_x_includes test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries # Update the cache value to reflect the command line values. - ac_cv_have_x="have_x=yes \ - ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 -echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 + ac_cv_have_x="have_x=yes\ + ac_x_includes='$x_includes'\ + ac_x_libraries='$x_libraries'" + { $as_echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 +$as_echo "libraries $x_libraries, headers $x_includes" >&6; } fi if test "$no_x" = yes; then @@ -17653,13 +19844,12 @@ else X_LIBS="$X_LIBS -L$x_libraries" # For Solaris; some versions of Sun CC require a space after -R and # others require no space. Words are not sufficient . . . . - case `(uname -sr) 2>/dev/null` in - "SunOS 5"*) - echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 -echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 - ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" + { $as_echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 +$as_echo_n "checking whether -R must be followed by a space... " >&6; } + ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" + ac_xsave_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -17675,33 +19865,35 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_R_nospace=yes -else - echo "$as_me: failed program was:" >&5 + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + X_LIBS="$X_LIBS -R$x_libraries" +else + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_R_nospace=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - if test $ac_R_nospace = yes; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - X_LIBS="$X_LIBS -R$x_libraries" - else LIBS="$ac_xsave_LIBS -R $x_libraries" - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -17717,36 +19909,47 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_R_space=yes + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + X_LIBS="$X_LIBS -R $x_libraries" else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_R_space=no + { $as_echo "$as_me:$LINENO: result: neither works" >&5 +$as_echo "neither works" >&6; } fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - if test $ac_R_space = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - X_LIBS="$X_LIBS -R $x_libraries" - else - echo "$as_me:$LINENO: result: neither works" >&5 -echo "${ECHO_T}neither works" >&6 - fi - fi - LIBS=$ac_xsave_LIBS - esac + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + ac_c_werror_flag=$ac_xsave_c_werror_flag + LIBS=$ac_xsave_LIBS fi # Check for system-dependent libraries X programs must link with. @@ -17761,165 +19964,198 @@ echo "${ECHO_T}neither works" >&6 # the Alpha needs dnet_stub (dnet does not exist). ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char XOpenDisplay (); int main () { -XOpenDisplay (); +return XOpenDisplay (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then : else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 -echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 +$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dnet_ntoa (); int main () { -dnet_ntoa (); +return dnet_ntoa (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_dnet_dnet_ntoa=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dnet_dnet_ntoa=no + ac_cv_lib_dnet_dnet_ntoa=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 -if test $ac_cv_lib_dnet_dnet_ntoa = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } +if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then - echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 -echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 +$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dnet_ntoa (); int main () { -dnet_ntoa (); +return dnet_ntoa (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_dnet_stub_dnet_ntoa=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dnet_stub_dnet_ntoa=no + ac_cv_lib_dnet_stub_dnet_ntoa=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 -if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } +if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" fi fi fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS="$ac_xsave_LIBS" # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, @@ -17930,194 +20166,229 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext # on Irix 5.2, according to T.E. Dickey. # The functions gethostbyname, getservbyname, and inet_addr are # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. - echo "$as_me:$LINENO: checking for gethostbyname" >&5 -echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5 +$as_echo_n "checking for gethostbyname... " >&6; } if test "${ac_cv_func_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define gethostbyname to an innocuous variant, in case declares gethostbyname. + For example, HP-UX 11i declares gettimeofday. */ +#define gethostbyname innocuous_gethostbyname + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ + #ifdef __STDC__ # include #else # include #endif -/* Override any gcc2 internal prototype to avoid an error. */ + +#undef gethostbyname + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char gethostbyname (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname) +#if defined __stub_gethostbyname || defined __stub___gethostbyname choke me -#else -char (*f) () = gethostbyname; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != gethostbyname; +return gethostbyname (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_func_gethostbyname=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_gethostbyname=no + ac_cv_func_gethostbyname=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 +$as_echo "$ac_cv_func_gethostbyname" >&6; } if test $ac_cv_func_gethostbyname = no; then - echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 -echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 +$as_echo_n "checking for gethostbyname in -lnsl... " >&6; } if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char gethostbyname (); int main () { -gethostbyname (); +return gethostbyname (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_nsl_gethostbyname=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_nsl_gethostbyname=no + ac_cv_lib_nsl_gethostbyname=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 -if test $ac_cv_lib_nsl_gethostbyname = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 +$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } +if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi if test $ac_cv_lib_nsl_gethostbyname = no; then - echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 -echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 +$as_echo_n "checking for gethostbyname in -lbsd... " >&6; } if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char gethostbyname (); int main () { -gethostbyname (); +return gethostbyname (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_bsd_gethostbyname=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_bsd_gethostbyname=no + ac_cv_lib_bsd_gethostbyname=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 -if test $ac_cv_lib_bsd_gethostbyname = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 +$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } +if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" fi @@ -18131,405 +20402,477 @@ fi # variants that don't use the name server (or something). -lsocket # must be given before -lnsl if both are needed. We assume that # if connect needs -lnsl, so does gethostbyname. - echo "$as_me:$LINENO: checking for connect" >&5 -echo $ECHO_N "checking for connect... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for connect" >&5 +$as_echo_n "checking for connect... " >&6; } if test "${ac_cv_func_connect+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define connect to an innocuous variant, in case declares connect. + For example, HP-UX 11i declares gettimeofday. */ +#define connect innocuous_connect + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ + #ifdef __STDC__ # include #else # include #endif -/* Override any gcc2 internal prototype to avoid an error. */ + +#undef connect + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char connect (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_connect) || defined (__stub___connect) +#if defined __stub_connect || defined __stub___connect choke me -#else -char (*f) () = connect; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != connect; +return connect (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_func_connect=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_connect=no + ac_cv_func_connect=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 -echo "${ECHO_T}$ac_cv_func_connect" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 +$as_echo "$ac_cv_func_connect" >&6; } if test $ac_cv_func_connect = no; then - echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 -echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 +$as_echo_n "checking for connect in -lsocket... " >&6; } if test "${ac_cv_lib_socket_connect+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char connect (); int main () { -connect (); +return connect (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_socket_connect=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_socket_connect=no + ac_cv_lib_socket_connect=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 -echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 -if test $ac_cv_lib_socket_connect = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 +$as_echo "$ac_cv_lib_socket_connect" >&6; } +if test "x$ac_cv_lib_socket_connect" = x""yes; then X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" fi fi # Guillermo Gomez says -lposix is necessary on A/UX. - echo "$as_me:$LINENO: checking for remove" >&5 -echo $ECHO_N "checking for remove... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for remove" >&5 +$as_echo_n "checking for remove... " >&6; } if test "${ac_cv_func_remove+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define remove to an innocuous variant, in case declares remove. + For example, HP-UX 11i declares gettimeofday. */ +#define remove innocuous_remove + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char remove (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ + #ifdef __STDC__ # include #else # include #endif -/* Override any gcc2 internal prototype to avoid an error. */ + +#undef remove + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char remove (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_remove) || defined (__stub___remove) +#if defined __stub_remove || defined __stub___remove choke me -#else -char (*f) () = remove; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != remove; +return remove (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_func_remove=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_remove=no + ac_cv_func_remove=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 -echo "${ECHO_T}$ac_cv_func_remove" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 +$as_echo "$ac_cv_func_remove" >&6; } if test $ac_cv_func_remove = no; then - echo "$as_me:$LINENO: checking for remove in -lposix" >&5 -echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5 +$as_echo_n "checking for remove in -lposix... " >&6; } if test "${ac_cv_lib_posix_remove+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char remove (); int main () { -remove (); +return remove (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_posix_remove=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_posix_remove=no + ac_cv_lib_posix_remove=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 -echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 -if test $ac_cv_lib_posix_remove = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 +$as_echo "$ac_cv_lib_posix_remove" >&6; } +if test "x$ac_cv_lib_posix_remove" = x""yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" fi fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo "$as_me:$LINENO: checking for shmat" >&5 -echo $ECHO_N "checking for shmat... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for shmat" >&5 +$as_echo_n "checking for shmat... " >&6; } if test "${ac_cv_func_shmat+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define shmat to an innocuous variant, in case declares shmat. + For example, HP-UX 11i declares gettimeofday. */ +#define shmat innocuous_shmat + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shmat (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ + #ifdef __STDC__ # include #else # include #endif -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus + +#undef shmat + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char shmat (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_shmat) || defined (__stub___shmat) +#if defined __stub_shmat || defined __stub___shmat choke me -#else -char (*f) () = shmat; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != shmat; +return shmat (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_func_shmat=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_shmat=no + ac_cv_func_shmat=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 -echo "${ECHO_T}$ac_cv_func_shmat" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 +$as_echo "$ac_cv_func_shmat" >&6; } if test $ac_cv_func_shmat = no; then - echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 -echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 +$as_echo_n "checking for shmat in -lipc... " >&6; } if test "${ac_cv_lib_ipc_shmat+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char shmat (); int main () { -shmat (); +return shmat (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_ipc_shmat=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_ipc_shmat=no + ac_cv_lib_ipc_shmat=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 -echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 -if test $ac_cv_lib_ipc_shmat = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 +$as_echo "$ac_cv_lib_ipc_shmat" >&6; } +if test "x$ac_cv_lib_ipc_shmat" = x""yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" fi @@ -18545,61 +20888,72 @@ fi # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. # John Interrante, Karl Berry - echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 -echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 +$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char IceConnectionNumber (); int main () { -IceConnectionNumber (); +return IceConnectionNumber (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_ICE_IceConnectionNumber=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_ICE_IceConnectionNumber=no + ac_cv_lib_ICE_IceConnectionNumber=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 -echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 -if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } +if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" fi @@ -18616,134 +20970,156 @@ fi x_libraries="default_x_libraries" fi if test -z "$x_libraries"; then - { { echo "$as_me:$LINENO: error: No X libraries found" >&5 -echo "$as_me: error: No X libraries found" >&2;} + { { $as_echo "$as_me:$LINENO: error: No X libraries found" >&5 +$as_echo "$as_me: error: No X libraries found" >&2;} { (exit 1); exit 1; }; } # Exit fi if test -z "$x_includes"; then - { { echo "$as_me:$LINENO: error: No X includes found" >&5 -echo "$as_me: error: No X includes found" >&2;} + { { $as_echo "$as_me:$LINENO: error: No X includes found" >&5 +$as_echo "$as_me: error: No X includes found" >&2;} { (exit 1); exit 1; }; } # Exit fi CFLAGS=$X_CFLAGS LDFLAGS="$X_LDFLAGS $X_LIBS" - echo "$as_me:$LINENO: checking for XOpenDisplay in -lX11" >&5 -echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for XOpenDisplay in -lX11" >&5 +$as_echo_n "checking for XOpenDisplay in -lX11... " >&6; } if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char XOpenDisplay (); int main () { -XOpenDisplay (); +return XOpenDisplay (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_X11_XOpenDisplay=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_X11_XOpenDisplay=no + ac_cv_lib_X11_XOpenDisplay=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XOpenDisplay" >&5 -echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6 -if test $ac_cv_lib_X11_XOpenDisplay = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +$as_echo "$ac_cv_lib_X11_XOpenDisplay" >&6; } +if test "x$ac_cv_lib_X11_XOpenDisplay" = x""yes; then x_libs="-lX11 $X_EXTRA_LIBS" else - { { echo "$as_me:$LINENO: error: X Development libraries not found" >&5 -echo "$as_me: error: X Development libraries not found" >&2;} + { { $as_echo "$as_me:$LINENO: error: X Development libraries not found" >&5 +$as_echo "$as_me: error: X Development libraries not found" >&2;} { (exit 1); exit 1; }; } fi - echo "$as_me:$LINENO: checking for XauDisposeAuth in -lXau" >&5 -echo $ECHO_N "checking for XauDisposeAuth in -lXau... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for XauDisposeAuth in -lXau" >&5 +$as_echo_n "checking for XauDisposeAuth in -lXau... " >&6; } if test "${ac_cv_lib_Xau_XauDisposeAuth+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lXau $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char XauDisposeAuth (); int main () { -XauDisposeAuth (); +return XauDisposeAuth (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_Xau_XauDisposeAuth=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xau_XauDisposeAuth=no + ac_cv_lib_Xau_XauDisposeAuth=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xau_XauDisposeAuth" >&5 -echo "${ECHO_T}$ac_cv_lib_Xau_XauDisposeAuth" >&6 -if test $ac_cv_lib_Xau_XauDisposeAuth = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xau_XauDisposeAuth" >&5 +$as_echo "$ac_cv_lib_Xau_XauDisposeAuth" >&6; } +if test "x$ac_cv_lib_Xau_XauDisposeAuth" = x""yes; then XAU_LIBS="-lXau" fi @@ -18775,23 +21151,22 @@ fi if test "$_os" != "WINNT" -a "$_os" != "OS2" -a "$_os" != "Darwin"; then - echo "$as_me:$LINENO: checking whether to use Xaw" >&5 -echo $ECHO_N "checking whether to use Xaw... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking whether to use Xaw" >&5 +$as_echo_n "checking whether to use Xaw... " >&6; } if test "$enable_Xaw" = "no"; then DISABLE_XAW=TRUE - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } for ac_header in X11/Composite.h do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -18802,62 +21177,74 @@ cat >>conftest.$ac_ext <<_ACEOF #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then eval "$as_ac_Header=yes" else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Header=no" + eval "$as_ac_Header=no" fi -rm -f conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF else - { { echo "$as_me:$LINENO: error: Xt include headers not found" >&5 -echo "$as_me: error: Xt include headers not found" >&2;} + { { $as_echo "$as_me:$LINENO: error: Xt include headers not found" >&5 +$as_echo "$as_me: error: Xt include headers not found" >&2;} { (exit 1); exit 1; }; } fi done else - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } for ac_header in X11/Xaw/Label.h do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +$as_echo_n "checking $ac_header usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -18867,33 +21254,39 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +$as_echo_n "checking $ac_header presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -18901,101 +21294,97 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 else - eval "$as_ac_Header=$ac_header_preproc" + eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF else - { { echo "$as_me:$LINENO: error: Xaw include headers not found" >&5 -echo "$as_me: error: Xaw include headers not found" >&2;} + { { $as_echo "$as_me:$LINENO: error: Xaw include headers not found" >&5 +$as_echo "$as_me: error: Xaw include headers not found" >&2;} { (exit 1); exit 1; }; } fi done -echo "$as_me:$LINENO: checking for main in -lXaw" >&5 -echo $ECHO_N "checking for main in -lXaw... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for main in -lXaw" >&5 +$as_echo_n "checking for main in -lXaw... " >&6; } if test "${ac_cv_lib_Xaw_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lXaw $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19006,36 +21395,48 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -main (); +return main (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_Xaw_main=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xaw_main=no + ac_cv_lib_Xaw_main=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xaw_main" >&5 -echo "${ECHO_T}$ac_cv_lib_Xaw_main" >&6 -if test $ac_cv_lib_Xaw_main = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xaw_main" >&5 +$as_echo "$ac_cv_lib_Xaw_main" >&6; } +if test "x$ac_cv_lib_Xaw_main" = x""yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBXAW 1 _ACEOF @@ -19043,8 +21444,8 @@ _ACEOF LIBS="-lXaw $LIBS" else - { { echo "$as_me:$LINENO: error: Xaw library not found or functional" >&5 -echo "$as_me: error: Xaw library not found or functional" >&2;} + { { $as_echo "$as_me:$LINENO: error: Xaw library not found or functional" >&5 +$as_echo "$as_me: error: Xaw library not found or functional" >&2;} { (exit 1); exit 1; }; } fi @@ -19056,19 +21457,18 @@ fi if test "$ENABLE_FONTCONFIG" = "TRUE" ; then if test "${ac_cv_header_fontconfig_fontconfig_h+set}" = set; then - echo "$as_me:$LINENO: checking for fontconfig/fontconfig.h" >&5 -echo $ECHO_N "checking for fontconfig/fontconfig.h... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for fontconfig/fontconfig.h" >&5 +$as_echo_n "checking for fontconfig/fontconfig.h... " >&6; } if test "${ac_cv_header_fontconfig_fontconfig_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_fontconfig_fontconfig_h" >&5 -echo "${ECHO_T}$ac_cv_header_fontconfig_fontconfig_h" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_fontconfig_fontconfig_h" >&5 +$as_echo "$ac_cv_header_fontconfig_fontconfig_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking fontconfig/fontconfig.h usability" >&5 -echo $ECHO_N "checking fontconfig/fontconfig.h usability... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking fontconfig/fontconfig.h usability" >&5 +$as_echo_n "checking fontconfig/fontconfig.h usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19078,33 +21478,39 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking fontconfig/fontconfig.h presence" >&5 -echo $ECHO_N "checking fontconfig/fontconfig.h presence... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking fontconfig/fontconfig.h presence" >&5 +$as_echo_n "checking fontconfig/fontconfig.h presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19112,98 +21518,92 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) - { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: fontconfig/fontconfig.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: fontconfig/fontconfig.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: fontconfig/fontconfig.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: fontconfig/fontconfig.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) - { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: fontconfig/fontconfig.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: fontconfig/fontconfig.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: fontconfig/fontconfig.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: fontconfig/fontconfig.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: fontconfig/fontconfig.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: fontconfig/fontconfig.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: fontconfig/fontconfig.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: fontconfig/fontconfig.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: fontconfig/fontconfig.h: in the future, the compiler will take precedence" >&2;} + ;; esac -echo "$as_me:$LINENO: checking for fontconfig/fontconfig.h" >&5 -echo $ECHO_N "checking for fontconfig/fontconfig.h... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for fontconfig/fontconfig.h" >&5 +$as_echo_n "checking for fontconfig/fontconfig.h... " >&6; } if test "${ac_cv_header_fontconfig_fontconfig_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_cv_header_fontconfig_fontconfig_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_fontconfig_fontconfig_h" >&5 -echo "${ECHO_T}$ac_cv_header_fontconfig_fontconfig_h" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_fontconfig_fontconfig_h" >&5 +$as_echo "$ac_cv_header_fontconfig_fontconfig_h" >&6; } fi -if test $ac_cv_header_fontconfig_fontconfig_h = yes; then +if test "x$ac_cv_header_fontconfig_fontconfig_h" = x""yes; then : else - { { echo "$as_me:$LINENO: error: fontconfig/fontconfig.h could not be found. libfontconfig1-dev or fontconfig???-devel missing?" >&5 -echo "$as_me: error: fontconfig/fontconfig.h could not be found. libfontconfig1-dev or fontconfig???-devel missing?" >&2;} + { { $as_echo "$as_me:$LINENO: error: fontconfig/fontconfig.h could not be found. libfontconfig1-dev or fontconfig???-devel missing?" >&5 +$as_echo "$as_me: error: fontconfig/fontconfig.h could not be found. libfontconfig1-dev or fontconfig???-devel missing?" >&2;} { (exit 1); exit 1; }; } fi - echo "$as_me:$LINENO: checking whether fontconfig is >= 2.2.0" >&5 -echo $ECHO_N "checking whether fontconfig is >= 2.2.0... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking whether fontconfig is >= 2.2.0" >&5 +$as_echo_n "checking whether fontconfig is >= 2.2.0... " >&6; } if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run test program while cross compiling +$as_echo "$as_me: error: cannot run test program while cross compiling See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19219,65 +21619,78 @@ int main(int argc, char **argv) { _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: no, fontconfig >= 2.2.0 needed" >&5 -echo "$as_me: error: no, fontconfig >= 2.2.0 needed" >&2;} +{ { $as_echo "$as_me:$LINENO: error: no, fontconfig >= 2.2.0 needed" >&5 +$as_echo "$as_me: error: no, fontconfig >= 2.2.0 needed" >&2;} { (exit 1); exit 1; }; } fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + fi -echo "$as_me:$LINENO: checking whether to link to Xrender" >&5 -echo $ECHO_N "checking whether to link to Xrender... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to link to Xrender" >&5 +$as_echo_n "checking whether to link to Xrender... " >&6; } if test -n "$enable_xrender_link" -a "$enable_xrender_link" != "no"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } XRENDER_LINK=YES with_system_xrender_headers=yes else - echo "$as_me:$LINENO: result: no, dynamically open it" >&5 -echo "${ECHO_T}no, dynamically open it" >&6 + { $as_echo "$as_me:$LINENO: result: no, dynamically open it" >&5 +$as_echo "no, dynamically open it" >&6; } XRENDER_LINK=NO fi -echo "$as_me:$LINENO: checking which Xrender headers to use" >&5 -echo $ECHO_N "checking which Xrender headers to use... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking which Xrender headers to use" >&5 +$as_echo_n "checking which Xrender headers to use... " >&6; } if test -n "$with_system_xrender_headers" -o -n "$with_system_headers" && \ test "$with_system_xrender_headers" != "no"; then - echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6 + { $as_echo "$as_me:$LINENO: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_XRENDER_HEADERS=YES if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then - echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5 -echo $ECHO_N "checking for X11/extensions/Xrender.h... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5 +$as_echo_n "checking for X11/extensions/Xrender.h... " >&6; } if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrender_h" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5 +$as_echo "$ac_cv_header_X11_extensions_Xrender_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking X11/extensions/Xrender.h usability" >&5 -echo $ECHO_N "checking X11/extensions/Xrender.h usability... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking X11/extensions/Xrender.h usability" >&5 +$as_echo_n "checking X11/extensions/Xrender.h usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19287,33 +21700,39 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking X11/extensions/Xrender.h presence" >&5 -echo $ECHO_N "checking X11/extensions/Xrender.h presence... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking X11/extensions/Xrender.h presence" >&5 +$as_echo_n "checking X11/extensions/Xrender.h presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19321,150 +21740,154 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) - { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: X11/extensions/Xrender.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: X11/extensions/Xrender.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: X11/extensions/Xrender.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: X11/extensions/Xrender.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) - { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: X11/extensions/Xrender.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: X11/extensions/Xrender.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: X11/extensions/Xrender.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: X11/extensions/Xrender.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: X11/extensions/Xrender.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: X11/extensions/Xrender.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: X11/extensions/Xrender.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: X11/extensions/Xrender.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: X11/extensions/Xrender.h: in the future, the compiler will take precedence" >&2;} + ;; esac -echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5 -echo $ECHO_N "checking for X11/extensions/Xrender.h... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5 +$as_echo_n "checking for X11/extensions/Xrender.h... " >&6; } if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_cv_header_X11_extensions_Xrender_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrender_h" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5 +$as_echo "$ac_cv_header_X11_extensions_Xrender_h" >&6; } fi -if test $ac_cv_header_X11_extensions_Xrender_h = yes; then +if test "x$ac_cv_header_X11_extensions_Xrender_h" = x""yes; then : else - { { echo "$as_me:$LINENO: error: Xrender not found. install X" >&5 -echo "$as_me: error: Xrender not found. install X" >&2;} + { { $as_echo "$as_me:$LINENO: error: Xrender not found. install X" >&5 +$as_echo "$as_me: error: Xrender not found. install X" >&2;} { (exit 1); exit 1; }; } fi else - echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6 + { $as_echo "$as_me:$LINENO: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_XRENDER_HEADERS=NO BUILD_TYPE="$BUILD_TYPE X11_EXTENSIONS" fi if test "$XRENDER_LINK" = "YES"; then -echo "$as_me:$LINENO: checking for XRenderQueryVersion in -lXrender" >&5 -echo $ECHO_N "checking for XRenderQueryVersion in -lXrender... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for XRenderQueryVersion in -lXrender" >&5 +$as_echo_n "checking for XRenderQueryVersion in -lXrender... " >&6; } if test "${ac_cv_lib_Xrender_XRenderQueryVersion+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lXrender $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char XRenderQueryVersion (); int main () { -XRenderQueryVersion (); +return XRenderQueryVersion (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_Xrender_XRenderQueryVersion=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xrender_XRenderQueryVersion=no + ac_cv_lib_Xrender_XRenderQueryVersion=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xrender_XRenderQueryVersion" >&5 -echo "${ECHO_T}$ac_cv_lib_Xrender_XRenderQueryVersion" >&6 -if test $ac_cv_lib_Xrender_XRenderQueryVersion = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xrender_XRenderQueryVersion" >&5 +$as_echo "$ac_cv_lib_Xrender_XRenderQueryVersion" >&6; } +if test "x$ac_cv_lib_Xrender_XRenderQueryVersion" = x""yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBXRENDER 1 _ACEOF @@ -19472,8 +21895,8 @@ _ACEOF LIBS="-lXrender $LIBS" else - { { echo "$as_me:$LINENO: error: libXrender not found or functional" >&5 -echo "$as_me: error: libXrender not found or functional" >&2;} + { { $as_echo "$as_me:$LINENO: error: libXrender not found or functional" >&5 +$as_echo "$as_me: error: libXrender not found or functional" >&2;} { (exit 1); exit 1; }; } fi @@ -19481,13 +21904,13 @@ fi -echo "$as_me:$LINENO: checking whether to enable RandR support" >&5 -echo $ECHO_N "checking whether to enable RandR support... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to enable RandR support" >&5 +$as_echo_n "checking whether to enable RandR support... " >&6; } if test "$test_randr" = "yes" -a \( "$enable_randr" = "yes" -o "$enable_randr" = "TRUE" \) ; then if test -z "$enable_randr_link" -o "$enable_randr_link" = "no"; then XRANDR_DLOPEN="TRUE" - echo "$as_me:$LINENO: result: resorting to dlopen libXrandr at runtime" >&5 -echo "${ECHO_T}resorting to dlopen libXrandr at runtime" >&6 + { $as_echo "$as_me:$LINENO: result: resorting to dlopen libXrandr at runtime" >&5 +$as_echo "resorting to dlopen libXrandr at runtime" >&6; } else XRANDR_DLOPEN="FALSE" @@ -19496,10 +21919,10 @@ echo "${ECHO_T}resorting to dlopen libXrandr at runtime" >&6 if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -19512,28 +21935,29 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test "$PKG_CONFIG" = "no" ; then @@ -19544,25 +21968,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for xrandr >= 1.2" >&5 -echo $ECHO_N "checking for xrandr >= 1.2... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for xrandr >= 1.2" >&5 +$as_echo_n "checking for xrandr >= 1.2... " >&6; } if $PKG_CONFIG --exists "xrandr >= 1.2" ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } succeeded=yes - echo "$as_me:$LINENO: checking XRANDR_CFLAGS" >&5 -echo $ECHO_N "checking XRANDR_CFLAGS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking XRANDR_CFLAGS" >&5 +$as_echo_n "checking XRANDR_CFLAGS... " >&6; } XRANDR_CFLAGS=`$PKG_CONFIG --cflags "xrandr >= 1.2"` - echo "$as_me:$LINENO: result: $XRANDR_CFLAGS" >&5 -echo "${ECHO_T}$XRANDR_CFLAGS" >&6 + { $as_echo "$as_me:$LINENO: result: $XRANDR_CFLAGS" >&5 +$as_echo "$XRANDR_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking XRANDR_LIBS" >&5 -echo $ECHO_N "checking XRANDR_LIBS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking XRANDR_LIBS" >&5 +$as_echo_n "checking XRANDR_LIBS... " >&6; } XRANDR_LIBS=`$PKG_CONFIG --libs "xrandr >= 1.2"` - echo "$as_me:$LINENO: result: $XRANDR_LIBS" >&5 -echo "${ECHO_T}$XRANDR_LIBS" >&6 + { $as_echo "$as_me:$LINENO: result: $XRANDR_LIBS" >&5 +$as_echo "$XRANDR_LIBS" >&6; } else XRANDR_CFLAGS="" XRANDR_LIBS="" @@ -19588,19 +22012,18 @@ echo "${ECHO_T}$XRANDR_LIBS" >&6 if test "$ENABLE_RANDR" != "TRUE"; then if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then - echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5 -echo $ECHO_N "checking for X11/extensions/Xrandr.h... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5 +$as_echo_n "checking for X11/extensions/Xrandr.h... " >&6; } if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrandr_h" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5 +$as_echo "$ac_cv_header_X11_extensions_Xrandr_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking X11/extensions/Xrandr.h usability" >&5 -echo $ECHO_N "checking X11/extensions/Xrandr.h usability... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking X11/extensions/Xrandr.h usability" >&5 +$as_echo_n "checking X11/extensions/Xrandr.h usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19610,33 +22033,39 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking X11/extensions/Xrandr.h presence" >&5 -echo $ECHO_N "checking X11/extensions/Xrandr.h presence... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking X11/extensions/Xrandr.h presence" >&5 +$as_echo_n "checking X11/extensions/Xrandr.h presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19644,144 +22073,148 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) - { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: X11/extensions/Xrandr.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: X11/extensions/Xrandr.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: X11/extensions/Xrandr.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: X11/extensions/Xrandr.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) - { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: X11/extensions/Xrandr.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: X11/extensions/Xrandr.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: X11/extensions/Xrandr.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: X11/extensions/Xrandr.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: X11/extensions/Xrandr.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: X11/extensions/Xrandr.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: X11/extensions/Xrandr.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: X11/extensions/Xrandr.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: X11/extensions/Xrandr.h: in the future, the compiler will take precedence" >&2;} + ;; esac -echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5 -echo $ECHO_N "checking for X11/extensions/Xrandr.h... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5 +$as_echo_n "checking for X11/extensions/Xrandr.h... " >&6; } if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_cv_header_X11_extensions_Xrandr_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrandr_h" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5 +$as_echo "$ac_cv_header_X11_extensions_Xrandr_h" >&6; } fi -if test $ac_cv_header_X11_extensions_Xrandr_h = yes; then +if test "x$ac_cv_header_X11_extensions_Xrandr_h" = x""yes; then : else - { { echo "$as_me:$LINENO: error: X11/extensions/Xrandr.h could not be found. X11 dev missing?" >&5 -echo "$as_me: error: X11/extensions/Xrandr.h could not be found. X11 dev missing?" >&2;} + { { $as_echo "$as_me:$LINENO: error: X11/extensions/Xrandr.h could not be found. X11 dev missing?" >&5 +$as_echo "$as_me: error: X11/extensions/Xrandr.h could not be found. X11 dev missing?" >&2;} { (exit 1); exit 1; }; } fi XRANDR_CFLAGS=" " -echo "$as_me:$LINENO: checking for XRRQueryExtension in -lXrandr" >&5 -echo $ECHO_N "checking for XRRQueryExtension in -lXrandr... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for XRRQueryExtension in -lXrandr" >&5 +$as_echo_n "checking for XRRQueryExtension in -lXrandr... " >&6; } if test "${ac_cv_lib_Xrandr_XRRQueryExtension+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lXrandr $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char XRRQueryExtension (); int main () { -XRRQueryExtension (); +return XRRQueryExtension (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_Xrandr_XRRQueryExtension=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xrandr_XRRQueryExtension=no + ac_cv_lib_Xrandr_XRRQueryExtension=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRQueryExtension" >&5 -echo "${ECHO_T}$ac_cv_lib_Xrandr_XRRQueryExtension" >&6 -if test $ac_cv_lib_Xrandr_XRRQueryExtension = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRQueryExtension" >&5 +$as_echo "$ac_cv_lib_Xrandr_XRRQueryExtension" >&6; } +if test "x$ac_cv_lib_Xrandr_XRRQueryExtension" = x""yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBXRANDR 1 _ACEOF @@ -19789,53 +22222,53 @@ _ACEOF LIBS="-lXrandr $LIBS" else - { { echo "$as_me:$LINENO: error: libXrandr not found or functional" >&5 -echo "$as_me: error: libXrandr not found or functional" >&2;} + { { $as_echo "$as_me:$LINENO: error: libXrandr not found or functional" >&5 +$as_echo "$as_me: error: libXrandr not found or functional" >&2;} { (exit 1); exit 1; }; } fi XRANDR_LIBS="-lXrandr " ENABLE_RANDR="TRUE" - echo "$as_me:$LINENO: result: enabling RandR support" >&5 -echo "${ECHO_T}enabling RandR support" >&6 + { $as_echo "$as_me:$LINENO: result: enabling RandR support" >&5 +$as_echo "enabling RandR support" >&6; } fi fi else ENABLE_RANDR="" - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi -echo "$as_me:$LINENO: checking whether to use neon" >&5 -echo $ECHO_N "checking whether to use neon... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to use neon" >&5 +$as_echo_n "checking whether to use neon... " >&6; } if test "$enable_neon" = "no"; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } DISABLE_NEON=TRUE else - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -echo "$as_me:$LINENO: checking which neon to use" >&5 -echo $ECHO_N "checking which neon to use... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } +{ $as_echo "$as_me:$LINENO: checking which neon to use" >&5 +$as_echo_n "checking which neon to use... " >&6; } if test -n "$with_system_neon" -o -n "$with_system_libs" && \ test "$with_system_neon" != "no"; then - echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6 + { $as_echo "$as_me:$LINENO: result: external" >&5 +$as_echo "external" >&6; } succeeded=no if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -19848,28 +22281,29 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test "$PKG_CONFIG" = "no" ; then @@ -19880,25 +22314,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for neon >= 0.24.0" >&5 -echo $ECHO_N "checking for neon >= 0.24.0... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for neon >= 0.24.0" >&5 +$as_echo_n "checking for neon >= 0.24.0... " >&6; } if $PKG_CONFIG --exists "neon >= 0.24.0" ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } succeeded=yes - echo "$as_me:$LINENO: checking NEON_CFLAGS" >&5 -echo $ECHO_N "checking NEON_CFLAGS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking NEON_CFLAGS" >&5 +$as_echo_n "checking NEON_CFLAGS... " >&6; } NEON_CFLAGS=`$PKG_CONFIG --cflags "neon >= 0.24.0"` - echo "$as_me:$LINENO: result: $NEON_CFLAGS" >&5 -echo "${ECHO_T}$NEON_CFLAGS" >&6 + { $as_echo "$as_me:$LINENO: result: $NEON_CFLAGS" >&5 +$as_echo "$NEON_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking NEON_LIBS" >&5 -echo $ECHO_N "checking NEON_LIBS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking NEON_LIBS" >&5 +$as_echo_n "checking NEON_LIBS... " >&6; } NEON_LIBS=`$PKG_CONFIG --libs "neon >= 0.24.0"` - echo "$as_me:$LINENO: result: $NEON_LIBS" >&5 -echo "${ECHO_T}$NEON_LIBS" >&6 + { $as_echo "$as_me:$LINENO: result: $NEON_LIBS" >&5 +$as_echo "$NEON_LIBS" >&6; } else NEON_CFLAGS="" NEON_LIBS="" @@ -19919,8 +22353,8 @@ echo "${ECHO_T}$NEON_LIBS" >&6 if test $succeeded = yes; then : else - { { echo "$as_me:$LINENO: error: you need neon >= 0.24.x for system-neon" >&5 -echo "$as_me: error: you need neon >= 0.24.x for system-neon" >&2;} + { { $as_echo "$as_me:$LINENO: error: you need neon >= 0.24.x for system-neon" >&5 +$as_echo "$as_me: error: you need neon >= 0.24.x for system-neon" >&2;} { (exit 1); exit 1; }; } fi @@ -19928,8 +22362,8 @@ echo "$as_me: error: you need neon >= 0.24.x for system-neon" >&2;} NEON_CFLAGS="$NEON_CFLAGS -DSYSTEM_NEON -DUSE_DAV_LOCKS=1" SYSTEM_NEON=YES else - echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6 + { $as_echo "$as_me:$LINENO: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_NEON=NO NEON_LIBS=-lneon NEON_CFLAGS= @@ -19938,12 +22372,12 @@ fi if test "$_os" = "Darwin" && test "$with_system_openssl" != "no"; then with_system_openssl=yes fi -echo "$as_me:$LINENO: checking which libssl to use" >&5 -echo $ECHO_N "checking which libssl to use... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking which libssl to use" >&5 +$as_echo_n "checking which libssl to use... " >&6; } if test -n "$with_system_openssl" -o -n "$with_system_libs" && \ test "$with_system_openssl" != "no"; then - echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6 + { $as_echo "$as_me:$LINENO: result: external" >&5 +$as_echo "external" >&6; } # Mac OS builds should get out without extra stuff is the Mac porters' # wish. And pkg-config is although Xcode ships a .pc for openssl if test "$_os" = "Darwin"; then @@ -19956,10 +22390,10 @@ echo "${ECHO_T}external" >&6 if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -19972,28 +22406,29 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test "$PKG_CONFIG" = "no" ; then @@ -20004,25 +22439,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for openssl " >&5 -echo $ECHO_N "checking for openssl ... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for openssl " >&5 +$as_echo_n "checking for openssl ... " >&6; } if $PKG_CONFIG --exists "openssl " ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } succeeded=yes - echo "$as_me:$LINENO: checking OPENSSL_CFLAGS" >&5 -echo $ECHO_N "checking OPENSSL_CFLAGS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking OPENSSL_CFLAGS" >&5 +$as_echo_n "checking OPENSSL_CFLAGS... " >&6; } OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl "` - echo "$as_me:$LINENO: result: $OPENSSL_CFLAGS" >&5 -echo "${ECHO_T}$OPENSSL_CFLAGS" >&6 + { $as_echo "$as_me:$LINENO: result: $OPENSSL_CFLAGS" >&5 +$as_echo "$OPENSSL_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking OPENSSL_LIBS" >&5 -echo $ECHO_N "checking OPENSSL_LIBS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking OPENSSL_LIBS" >&5 +$as_echo_n "checking OPENSSL_LIBS... " >&6; } OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl "` - echo "$as_me:$LINENO: result: $OPENSSL_LIBS" >&5 -echo "${ECHO_T}$OPENSSL_LIBS" >&6 + { $as_echo "$as_me:$LINENO: result: $OPENSSL_LIBS" >&5 +$as_echo "$OPENSSL_LIBS" >&6; } else OPENSSL_CFLAGS="" OPENSSL_LIBS="" @@ -20043,16 +22478,16 @@ echo "${ECHO_T}$OPENSSL_LIBS" >&6 if test $succeeded = yes; then : else - { { echo "$as_me:$LINENO: error: Library requirements (openssl ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -echo "$as_me: error: Library requirements (openssl ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { { $as_echo "$as_me:$LINENO: error: Library requirements (openssl ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +$as_echo "$as_me: error: Library requirements (openssl ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi fi SYSTEM_OPENSSL=YES else - echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6 + { $as_echo "$as_me:$LINENO: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_OPENSSL=NO BUILD_TYPE="$BUILD_TYPE OPENSSL" fi @@ -20066,33 +22501,33 @@ fi fi -echo "$as_me:$LINENO: checking whether to enable agg" >&5 -echo $ECHO_N "checking whether to enable agg... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to enable agg" >&5 +$as_echo_n "checking whether to enable agg... " >&6; } if test "$with_agg" = "no"; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } else - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } ENABLE_AGG=YES - echo "$as_me:$LINENO: checking which AGG to use" >&5 -echo $ECHO_N "checking which AGG to use... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking which AGG to use" >&5 +$as_echo_n "checking which AGG to use... " >&6; } if test -n "$with_system_agg" -o -n "$with_system_libs" && \ test "$with_system_agg" != "no"; then - echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6 + { $as_echo "$as_me:$LINENO: result: external" >&5 +$as_echo "external" >&6; } succeeded=no if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -20105,28 +22540,29 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test "$PKG_CONFIG" = "no" ; then @@ -20137,25 +22573,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for libagg >= 2.3" >&5 -echo $ECHO_N "checking for libagg >= 2.3... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for libagg >= 2.3" >&5 +$as_echo_n "checking for libagg >= 2.3... " >&6; } if $PKG_CONFIG --exists "libagg >= 2.3" ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } succeeded=yes - echo "$as_me:$LINENO: checking AGG_CFLAGS" >&5 -echo $ECHO_N "checking AGG_CFLAGS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking AGG_CFLAGS" >&5 +$as_echo_n "checking AGG_CFLAGS... " >&6; } AGG_CFLAGS=`$PKG_CONFIG --cflags "libagg >= 2.3"` - echo "$as_me:$LINENO: result: $AGG_CFLAGS" >&5 -echo "${ECHO_T}$AGG_CFLAGS" >&6 + { $as_echo "$as_me:$LINENO: result: $AGG_CFLAGS" >&5 +$as_echo "$AGG_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking AGG_LIBS" >&5 -echo $ECHO_N "checking AGG_LIBS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking AGG_LIBS" >&5 +$as_echo_n "checking AGG_LIBS... " >&6; } AGG_LIBS=`$PKG_CONFIG --libs "libagg >= 2.3"` - echo "$as_me:$LINENO: result: $AGG_LIBS" >&5 -echo "${ECHO_T}$AGG_LIBS" >&6 + { $as_echo "$as_me:$LINENO: result: $AGG_LIBS" >&5 +$as_echo "$AGG_LIBS" >&6; } else AGG_CFLAGS="" AGG_LIBS="" @@ -20176,13 +22612,13 @@ echo "${ECHO_T}$AGG_LIBS" >&6 if test $succeeded = yes; then : else - { { echo "$as_me:$LINENO: error: Library requirements (libagg >= 2.3) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -echo "$as_me: error: Library requirements (libagg >= 2.3) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { { $as_echo "$as_me:$LINENO: error: Library requirements (libagg >= 2.3) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +$as_echo "$as_me: error: Library requirements (libagg >= 2.3) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi - echo "$as_me:$LINENO: checking agg version" >&5 -echo $ECHO_N "checking agg version... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking agg version" >&5 +$as_echo_n "checking agg version... " >&6; } # workaround; if AGG_CFLAGS is empty (broken libagg.pc in 2.3), add /usr/include/agg2 anyway # (/usr/include gets stripped from pkg-config output) if test -z "$AGG_CFLAGS" || test "$AGG_CFLAGS" = " "; then @@ -20194,23 +22630,23 @@ echo $ECHO_N "checking agg version... $ECHO_C" >&6 $PKG_CONFIG --modversion libagg | grep -q 2.4; then # 2.4's libagg.pc.in still contains 2.3 :/ if $EGREP -q "Version 2.4" `echo $AGG_INCDIR`/agg_basics.h; then - echo "$as_me:$LINENO: result: 2.4" >&5 -echo "${ECHO_T}2.4" >&6 + { $as_echo "$as_me:$LINENO: result: 2.4" >&5 +$as_echo "2.4" >&6; } AGG_VERSION=2400 else - echo "$as_me:$LINENO: result: 2.3" >&5 -echo "${ECHO_T}2.3" >&6 + { $as_echo "$as_me:$LINENO: result: 2.3" >&5 +$as_echo "2.3" >&6; } AGG_VERSION=2300 fi SYSTEM_AGG=YES else - { { echo "$as_me:$LINENO: error: only agg 2.3 and 2.4 are supported" >&5 -echo "$as_me: error: only agg 2.3 and 2.4 are supported" >&2;} + { { $as_echo "$as_me:$LINENO: error: only agg 2.3 and 2.4 are supported" >&5 +$as_echo "$as_me: error: only agg 2.3 and 2.4 are supported" >&2;} { (exit 1); exit 1; }; } fi else - echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6 + { $as_echo "$as_me:$LINENO: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_AGG=NO AGG_VERSION=2300 BUILD_TYPE="$BUILD_TYPE AGG" @@ -20219,12 +22655,12 @@ echo "${ECHO_T}internal" >&6 fi -echo "$as_me:$LINENO: checking which redland library to use" >&5 -echo $ECHO_N "checking which redland library to use... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking which redland library to use" >&5 +$as_echo_n "checking which redland library to use... " >&6; } if test -n "$with_system_redland" && \ test "$with_system_redland" != "no"; then - echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6 + { $as_echo "$as_me:$LINENO: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_REDLAND=YES succeeded=no @@ -20232,10 +22668,10 @@ echo "${ECHO_T}external" >&6 if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -20248,28 +22684,29 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test "$PKG_CONFIG" = "no" ; then @@ -20280,25 +22717,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for redland" >&5 -echo $ECHO_N "checking for redland... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for redland" >&5 +$as_echo_n "checking for redland... " >&6; } if $PKG_CONFIG --exists "redland" ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } succeeded=yes - echo "$as_me:$LINENO: checking REDLAND_CFLAGS" >&5 -echo $ECHO_N "checking REDLAND_CFLAGS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking REDLAND_CFLAGS" >&5 +$as_echo_n "checking REDLAND_CFLAGS... " >&6; } REDLAND_CFLAGS=`$PKG_CONFIG --cflags "redland"` - echo "$as_me:$LINENO: result: $REDLAND_CFLAGS" >&5 -echo "${ECHO_T}$REDLAND_CFLAGS" >&6 + { $as_echo "$as_me:$LINENO: result: $REDLAND_CFLAGS" >&5 +$as_echo "$REDLAND_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking REDLAND_LIBS" >&5 -echo $ECHO_N "checking REDLAND_LIBS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking REDLAND_LIBS" >&5 +$as_echo_n "checking REDLAND_LIBS... " >&6; } REDLAND_LIBS=`$PKG_CONFIG --libs "redland"` - echo "$as_me:$LINENO: result: $REDLAND_LIBS" >&5 -echo "${ECHO_T}$REDLAND_LIBS" >&6 + { $as_echo "$as_me:$LINENO: result: $REDLAND_LIBS" >&5 +$as_echo "$REDLAND_LIBS" >&6; } else REDLAND_CFLAGS="" REDLAND_LIBS="" @@ -20319,28 +22756,28 @@ echo "${ECHO_T}$REDLAND_LIBS" >&6 if test $succeeded = yes; then : else - { { echo "$as_me:$LINENO: error: Library requirements (redland) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -echo "$as_me: error: Library requirements (redland) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { { $as_echo "$as_me:$LINENO: error: Library requirements (redland) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +$as_echo "$as_me: error: Library requirements (redland) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi else - echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6 + { $as_echo "$as_me:$LINENO: result: internal" >&5 +$as_echo "internal" >&6; } BUILD_TYPE="$BUILD_TYPE REDLAND" SYSTEM_REDLAND=NO fi -echo "$as_me:$LINENO: checking which libhunspell to use" >&5 -echo $ECHO_N "checking which libhunspell to use... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking which libhunspell to use" >&5 +$as_echo_n "checking which libhunspell to use... " >&6; } if test -n "$with_system_hunspell" -o -n "$with_system_libs" && \ test "$with_system_hunspell" != "no"; then - echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6 + { $as_echo "$as_me:$LINENO: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_HUNSPELL=YES - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -20352,10 +22789,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -20368,28 +22805,29 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test "$PKG_CONFIG" = "no" ; then @@ -20400,25 +22838,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for hunspell" >&5 -echo $ECHO_N "checking for hunspell... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for hunspell" >&5 +$as_echo_n "checking for hunspell... " >&6; } if $PKG_CONFIG --exists "hunspell" ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } succeeded=yes - echo "$as_me:$LINENO: checking HUNSPELL_CFLAGS" >&5 -echo $ECHO_N "checking HUNSPELL_CFLAGS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking HUNSPELL_CFLAGS" >&5 +$as_echo_n "checking HUNSPELL_CFLAGS... " >&6; } HUNSPELL_CFLAGS=`$PKG_CONFIG --cflags "hunspell"` - echo "$as_me:$LINENO: result: $HUNSPELL_CFLAGS" >&5 -echo "${ECHO_T}$HUNSPELL_CFLAGS" >&6 + { $as_echo "$as_me:$LINENO: result: $HUNSPELL_CFLAGS" >&5 +$as_echo "$HUNSPELL_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking HUNSPELL_LIBS" >&5 -echo $ECHO_N "checking HUNSPELL_LIBS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking HUNSPELL_LIBS" >&5 +$as_echo_n "checking HUNSPELL_LIBS... " >&6; } HUNSPELL_LIBS=`$PKG_CONFIG --libs "hunspell"` - echo "$as_me:$LINENO: result: $HUNSPELL_LIBS" >&5 -echo "${ECHO_T}$HUNSPELL_LIBS" >&6 + { $as_echo "$as_me:$LINENO: result: $HUNSPELL_LIBS" >&5 +$as_echo "$HUNSPELL_LIBS" >&6; } else HUNSPELL_CFLAGS="" HUNSPELL_LIBS="" @@ -20444,19 +22882,18 @@ echo "${ECHO_T}$HUNSPELL_LIBS" >&6 if test "$HUNSPELL_PC" != "TRUE"; then if test "${ac_cv_header_hunspell_hxx+set}" = set; then - echo "$as_me:$LINENO: checking for hunspell.hxx" >&5 -echo $ECHO_N "checking for hunspell.hxx... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for hunspell.hxx" >&5 +$as_echo_n "checking for hunspell.hxx... " >&6; } if test "${ac_cv_header_hunspell_hxx+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hxx" >&5 -echo "${ECHO_T}$ac_cv_header_hunspell_hxx" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hxx" >&5 +$as_echo "$ac_cv_header_hunspell_hxx" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking hunspell.hxx usability" >&5 -echo $ECHO_N "checking hunspell.hxx usability... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking hunspell.hxx usability" >&5 +$as_echo_n "checking hunspell.hxx usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -20466,33 +22903,39 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking hunspell.hxx presence" >&5 -echo $ECHO_N "checking hunspell.hxx presence... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking hunspell.hxx presence" >&5 +$as_echo_n "checking hunspell.hxx presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -20500,96 +22943,88 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) - { echo "$as_me:$LINENO: WARNING: hunspell.hxx: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: hunspell.hxx: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: hunspell.hxx: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: hunspell.hxx: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: hunspell.hxx: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: hunspell.hxx: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: hunspell.hxx: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: hunspell.hxx: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) - { echo "$as_me:$LINENO: WARNING: hunspell.hxx: present but cannot be compiled" >&5 -echo "$as_me: WARNING: hunspell.hxx: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: hunspell.hxx: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: hunspell.hxx: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: hunspell.hxx: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: hunspell.hxx: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: hunspell.hxx: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: hunspell.hxx: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: hunspell.hxx: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: hunspell.hxx: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: hunspell.hxx: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: hunspell.hxx: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: hunspell.hxx: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: hunspell.hxx: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: hunspell.hxx: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: hunspell.hxx: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: hunspell.hxx: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: hunspell.hxx: in the future, the compiler will take precedence" >&2;} + ;; esac -echo "$as_me:$LINENO: checking for hunspell.hxx" >&5 -echo $ECHO_N "checking for hunspell.hxx... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for hunspell.hxx" >&5 +$as_echo_n "checking for hunspell.hxx... " >&6; } if test "${ac_cv_header_hunspell_hxx+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_cv_header_hunspell_hxx=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hxx" >&5 -echo "${ECHO_T}$ac_cv_header_hunspell_hxx" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hxx" >&5 +$as_echo "$ac_cv_header_hunspell_hxx" >&6; } fi -if test $ac_cv_header_hunspell_hxx = yes; then +if test "x$ac_cv_header_hunspell_hxx" = x""yes; then : else if test "${ac_cv_header_hunspell_hunspell_hxx+set}" = set; then - echo "$as_me:$LINENO: checking for hunspell/hunspell.hxx" >&5 -echo $ECHO_N "checking for hunspell/hunspell.hxx... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for hunspell/hunspell.hxx" >&5 +$as_echo_n "checking for hunspell/hunspell.hxx... " >&6; } if test "${ac_cv_header_hunspell_hunspell_hxx+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hunspell_hxx" >&5 -echo "${ECHO_T}$ac_cv_header_hunspell_hunspell_hxx" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hunspell_hxx" >&5 +$as_echo "$ac_cv_header_hunspell_hunspell_hxx" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking hunspell/hunspell.hxx usability" >&5 -echo $ECHO_N "checking hunspell/hunspell.hxx usability... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking hunspell/hunspell.hxx usability" >&5 +$as_echo_n "checking hunspell/hunspell.hxx usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -20599,33 +23034,39 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking hunspell/hunspell.hxx presence" >&5 -echo $ECHO_N "checking hunspell/hunspell.hxx presence... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking hunspell/hunspell.hxx presence" >&5 +$as_echo_n "checking hunspell/hunspell.hxx presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -20633,83 +23074,76 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) - { echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: hunspell/hunspell.hxx: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: hunspell/hunspell.hxx: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: hunspell/hunspell.hxx: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: hunspell/hunspell.hxx: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) - { echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: present but cannot be compiled" >&5 -echo "$as_me: WARNING: hunspell/hunspell.hxx: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: hunspell/hunspell.hxx: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: hunspell/hunspell.hxx: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: hunspell/hunspell.hxx: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: hunspell/hunspell.hxx: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: hunspell/hunspell.hxx: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: hunspell/hunspell.hxx: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: hunspell/hunspell.hxx: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: hunspell/hunspell.hxx: in the future, the compiler will take precedence" >&2;} + ;; esac -echo "$as_me:$LINENO: checking for hunspell/hunspell.hxx" >&5 -echo $ECHO_N "checking for hunspell/hunspell.hxx... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for hunspell/hunspell.hxx" >&5 +$as_echo_n "checking for hunspell/hunspell.hxx... " >&6; } if test "${ac_cv_header_hunspell_hunspell_hxx+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_cv_header_hunspell_hunspell_hxx=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hunspell_hxx" >&5 -echo "${ECHO_T}$ac_cv_header_hunspell_hunspell_hxx" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hunspell_hxx" >&5 +$as_echo "$ac_cv_header_hunspell_hunspell_hxx" >&6; } fi -if test $ac_cv_header_hunspell_hunspell_hxx = yes; then +if test "x$ac_cv_header_hunspell_hunspell_hxx" = x""yes; then HUNSPELL_CFLAGS=-I/usr/include/hunspell else - { { echo "$as_me:$LINENO: error: hunspell headers not found." >&5 -echo "$as_me: error: hunspell headers not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: hunspell headers not found." >&5 +$as_echo "$as_me: error: hunspell headers not found." >&2;} { (exit 1); exit 1; }; } fi @@ -20719,15 +23153,14 @@ fi -echo "$as_me:$LINENO: checking for main in -lhunspell" >&5 -echo $ECHO_N "checking for main in -lhunspell... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for main in -lhunspell" >&5 +$as_echo_n "checking for main in -lhunspell... " >&6; } if test "${ac_cv_lib_hunspell_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lhunspell $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -20738,36 +23171,48 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -main (); +return main (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_hunspell_main=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_hunspell_main=no + ac_cv_lib_hunspell_main=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_hunspell_main" >&5 -echo "${ECHO_T}$ac_cv_lib_hunspell_main" >&6 -if test $ac_cv_lib_hunspell_main = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_hunspell_main" >&5 +$as_echo "$ac_cv_lib_hunspell_main" >&6; } +if test "x$ac_cv_lib_hunspell_main" = x""yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBHUNSPELL 1 _ACEOF @@ -20775,8 +23220,8 @@ _ACEOF LIBS="-lhunspell $LIBS" else - { { echo "$as_me:$LINENO: error: hunspell library not found." >&5 -echo "$as_me: error: hunspell library not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: hunspell library not found." >&5 +$as_echo "$as_me: error: hunspell library not found." >&2;} { (exit 1); exit 1; }; } fi @@ -20789,8 +23234,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu else - echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6 + { $as_echo "$as_me:$LINENO: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_HUNSPELL=NO BUILD_TYPE="$BUILD_TYPE HUNSPELL" fi @@ -20798,27 +23243,26 @@ fi -echo "$as_me:$LINENO: checking which altlinuxhyph to use" >&5 -echo $ECHO_N "checking which altlinuxhyph to use... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking which altlinuxhyph to use" >&5 +$as_echo_n "checking which altlinuxhyph to use... " >&6; } if test -n "$with_system_altlinuxhyph" -o -n "$with_system_libs" && \ test "$with_system_altlinuxhyph" != "no"; then - echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6 + { $as_echo "$as_me:$LINENO: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_HYPH=YES if test "${ac_cv_header_hyphen_h+set}" = set; then - echo "$as_me:$LINENO: checking for hyphen.h" >&5 -echo $ECHO_N "checking for hyphen.h... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for hyphen.h" >&5 +$as_echo_n "checking for hyphen.h... " >&6; } if test "${ac_cv_header_hyphen_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_hyphen_h" >&5 -echo "${ECHO_T}$ac_cv_header_hyphen_h" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_hyphen_h" >&5 +$as_echo "$ac_cv_header_hyphen_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking hyphen.h usability" >&5 -echo $ECHO_N "checking hyphen.h usability... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking hyphen.h usability" >&5 +$as_echo_n "checking hyphen.h usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -20828,33 +23272,39 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking hyphen.h presence" >&5 -echo $ECHO_N "checking hyphen.h presence... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking hyphen.h presence" >&5 +$as_echo_n "checking hyphen.h presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -20862,94 +23312,86 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) - { echo "$as_me:$LINENO: WARNING: hyphen.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: hyphen.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: hyphen.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: hyphen.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: hyphen.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: hyphen.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: hyphen.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: hyphen.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) - { echo "$as_me:$LINENO: WARNING: hyphen.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: hyphen.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: hyphen.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: hyphen.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: hyphen.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: hyphen.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: hyphen.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: hyphen.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: hyphen.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: hyphen.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: hyphen.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: hyphen.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: hyphen.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: hyphen.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: hyphen.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: hyphen.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: hyphen.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: hyphen.h: in the future, the compiler will take precedence" >&2;} + ;; esac -echo "$as_me:$LINENO: checking for hyphen.h" >&5 -echo $ECHO_N "checking for hyphen.h... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for hyphen.h" >&5 +$as_echo_n "checking for hyphen.h... " >&6; } if test "${ac_cv_header_hyphen_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_cv_header_hyphen_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_hyphen_h" >&5 -echo "${ECHO_T}$ac_cv_header_hyphen_h" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_hyphen_h" >&5 +$as_echo "$ac_cv_header_hyphen_h" >&6; } fi -if test $ac_cv_header_hyphen_h = yes; then +if test "x$ac_cv_header_hyphen_h" = x""yes; then : else - { { echo "$as_me:$LINENO: error: altlinuxhyph headers not found." >&5 -echo "$as_me: error: altlinuxhyph headers not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: altlinuxhyph headers not found." >&5 +$as_echo "$as_me: error: altlinuxhyph headers not found." >&2;} { (exit 1); exit 1; }; } fi - echo "$as_me:$LINENO: checking for struct _HyphenDict.cset" >&5 -echo $ECHO_N "checking for struct _HyphenDict.cset... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for struct _HyphenDict.cset" >&5 +$as_echo_n "checking for struct _HyphenDict.cset... " >&6; } if test "${ac_cv_member_struct__HyphenDict_cset+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -20968,24 +23410,29 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_member_struct__HyphenDict_cset=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21004,256 +23451,296 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_member_struct__HyphenDict_cset=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_member_struct__HyphenDict_cset=no + ac_cv_member_struct__HyphenDict_cset=no fi -rm -f conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_member_struct__HyphenDict_cset" >&5 -echo "${ECHO_T}$ac_cv_member_struct__HyphenDict_cset" >&6 -if test $ac_cv_member_struct__HyphenDict_cset = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct__HyphenDict_cset" >&5 +$as_echo "$ac_cv_member_struct__HyphenDict_cset" >&6; } +if test "x$ac_cv_member_struct__HyphenDict_cset" = x""yes; then : else - { { echo "$as_me:$LINENO: error: no. You are sure you have altlinuyhyph headers?" >&5 -echo "$as_me: error: no. You are sure you have altlinuyhyph headers?" >&2;} + { { $as_echo "$as_me:$LINENO: error: no. You are sure you have altlinuyhyph headers?" >&5 +$as_echo "$as_me: error: no. You are sure you have altlinuyhyph headers?" >&2;} { (exit 1); exit 1; }; } fi - echo "$as_me:$LINENO: checking for hnj_hyphen_hyphenate2 in -lhyphen" >&5 -echo $ECHO_N "checking for hnj_hyphen_hyphenate2 in -lhyphen... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for hnj_hyphen_hyphenate2 in -lhyphen" >&5 +$as_echo_n "checking for hnj_hyphen_hyphenate2 in -lhyphen... " >&6; } if test "${ac_cv_lib_hyphen_hnj_hyphen_hyphenate2+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lhyphen $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char hnj_hyphen_hyphenate2 (); int main () { -hnj_hyphen_hyphenate2 (); +return hnj_hyphen_hyphenate2 (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_hyphen_hnj_hyphen_hyphenate2=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_hyphen_hnj_hyphen_hyphenate2=no + ac_cv_lib_hyphen_hnj_hyphen_hyphenate2=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" >&5 -echo "${ECHO_T}$ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" >&6 -if test $ac_cv_lib_hyphen_hnj_hyphen_hyphenate2 = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" >&5 +$as_echo "$ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" >&6; } +if test "x$ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" = x""yes; then HYPHEN_LIB=-lhyphen else - { { echo "$as_me:$LINENO: error: altlinuxhyph library not found or too old." >&5 -echo "$as_me: error: altlinuxhyph library not found or too old." >&2;} + { { $as_echo "$as_me:$LINENO: error: altlinuxhyph library not found or too old." >&5 +$as_echo "$as_me: error: altlinuxhyph library not found or too old." >&2;} { (exit 1); exit 1; }; } fi if test -z "$HYPHEN_LIB"; then - echo "$as_me:$LINENO: checking for hnj_hyphen_hyphenate2 in -lhyph" >&5 -echo $ECHO_N "checking for hnj_hyphen_hyphenate2 in -lhyph... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for hnj_hyphen_hyphenate2 in -lhyph" >&5 +$as_echo_n "checking for hnj_hyphen_hyphenate2 in -lhyph... " >&6; } if test "${ac_cv_lib_hyph_hnj_hyphen_hyphenate2+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lhyph $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char hnj_hyphen_hyphenate2 (); int main () { -hnj_hyphen_hyphenate2 (); +return hnj_hyphen_hyphenate2 (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_hyph_hnj_hyphen_hyphenate2=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_hyph_hnj_hyphen_hyphenate2=no + ac_cv_lib_hyph_hnj_hyphen_hyphenate2=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_hyph_hnj_hyphen_hyphenate2" >&5 -echo "${ECHO_T}$ac_cv_lib_hyph_hnj_hyphen_hyphenate2" >&6 -if test $ac_cv_lib_hyph_hnj_hyphen_hyphenate2 = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_hyph_hnj_hyphen_hyphenate2" >&5 +$as_echo "$ac_cv_lib_hyph_hnj_hyphen_hyphenate2" >&6; } +if test "x$ac_cv_lib_hyph_hnj_hyphen_hyphenate2" = x""yes; then HYPHEN_LIB=-lhyph else - { { echo "$as_me:$LINENO: error: altlinuxhyph library not found or too old." >&5 -echo "$as_me: error: altlinuxhyph library not found or too old." >&2;} + { { $as_echo "$as_me:$LINENO: error: altlinuxhyph library not found or too old." >&5 +$as_echo "$as_me: error: altlinuxhyph library not found or too old." >&2;} { (exit 1); exit 1; }; } fi fi if test -z "$HYPHEN_LIB"; then - echo "$as_me:$LINENO: checking for hnj_hyphen_hyphenate2 in -lhnj" >&5 -echo $ECHO_N "checking for hnj_hyphen_hyphenate2 in -lhnj... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for hnj_hyphen_hyphenate2 in -lhnj" >&5 +$as_echo_n "checking for hnj_hyphen_hyphenate2 in -lhnj... " >&6; } if test "${ac_cv_lib_hnj_hnj_hyphen_hyphenate2+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lhnj $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char hnj_hyphen_hyphenate2 (); int main () { -hnj_hyphen_hyphenate2 (); +return hnj_hyphen_hyphenate2 (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_hnj_hnj_hyphen_hyphenate2=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_hnj_hnj_hyphen_hyphenate2=no + ac_cv_lib_hnj_hnj_hyphen_hyphenate2=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_hnj_hnj_hyphen_hyphenate2" >&5 -echo "${ECHO_T}$ac_cv_lib_hnj_hnj_hyphen_hyphenate2" >&6 -if test $ac_cv_lib_hnj_hnj_hyphen_hyphenate2 = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_hnj_hnj_hyphen_hyphenate2" >&5 +$as_echo "$ac_cv_lib_hnj_hnj_hyphen_hyphenate2" >&6; } +if test "x$ac_cv_lib_hnj_hnj_hyphen_hyphenate2" = x""yes; then HYPHEN_LIB=-lhnj else - { { echo "$as_me:$LINENO: error: altlinuxhyph library not found or too old." >&5 -echo "$as_me: error: altlinuxhyph library not found or too old." >&2;} + { { $as_echo "$as_me:$LINENO: error: altlinuxhyph library not found or too old." >&5 +$as_echo "$as_me: error: altlinuxhyph library not found or too old." >&2;} { (exit 1); exit 1; }; } fi fi else - echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6 + { $as_echo "$as_me:$LINENO: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_HYPH=NO fi -echo "$as_me:$LINENO: checking which mythes to use" >&5 -echo $ECHO_N "checking which mythes to use... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking which mythes to use" >&5 +$as_echo_n "checking which mythes to use... " >&6; } if test -n "$with_system_mythes" && test "$with_system_mythes" != "no"; then - echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6 + { $as_echo "$as_me:$LINENO: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_MYTHES=YES if test "${ac_cv_header_mythes_hxx+set}" = set; then - echo "$as_me:$LINENO: checking for mythes.hxx" >&5 -echo $ECHO_N "checking for mythes.hxx... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for mythes.hxx" >&5 +$as_echo_n "checking for mythes.hxx... " >&6; } if test "${ac_cv_header_mythes_hxx+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_mythes_hxx" >&5 -echo "${ECHO_T}$ac_cv_header_mythes_hxx" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_mythes_hxx" >&5 +$as_echo "$ac_cv_header_mythes_hxx" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking mythes.hxx usability" >&5 -echo $ECHO_N "checking mythes.hxx usability... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking mythes.hxx usability" >&5 +$as_echo_n "checking mythes.hxx usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21263,33 +23750,39 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking mythes.hxx presence" >&5 -echo $ECHO_N "checking mythes.hxx presence... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking mythes.hxx presence" >&5 +$as_echo_n "checking mythes.hxx presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21297,97 +23790,89 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) - { echo "$as_me:$LINENO: WARNING: mythes.hxx: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: mythes.hxx: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: mythes.hxx: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: mythes.hxx: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: mythes.hxx: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: mythes.hxx: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: mythes.hxx: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: mythes.hxx: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) - { echo "$as_me:$LINENO: WARNING: mythes.hxx: present but cannot be compiled" >&5 -echo "$as_me: WARNING: mythes.hxx: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: mythes.hxx: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: mythes.hxx: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: mythes.hxx: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: mythes.hxx: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: mythes.hxx: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: mythes.hxx: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: mythes.hxx: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: mythes.hxx: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: mythes.hxx: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: mythes.hxx: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: mythes.hxx: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: mythes.hxx: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: mythes.hxx: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: mythes.hxx: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: mythes.hxx: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: mythes.hxx: in the future, the compiler will take precedence" >&2;} + ;; esac -echo "$as_me:$LINENO: checking for mythes.hxx" >&5 -echo $ECHO_N "checking for mythes.hxx... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for mythes.hxx" >&5 +$as_echo_n "checking for mythes.hxx... " >&6; } if test "${ac_cv_header_mythes_hxx+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_cv_header_mythes_hxx=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_mythes_hxx" >&5 -echo "${ECHO_T}$ac_cv_header_mythes_hxx" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_mythes_hxx" >&5 +$as_echo "$ac_cv_header_mythes_hxx" >&6; } fi -if test $ac_cv_header_mythes_hxx = yes; then +if test "x$ac_cv_header_mythes_hxx" = x""yes; then : else - { { echo "$as_me:$LINENO: error: mythes.hxx headers not found." >&5 -echo "$as_me: error: mythes.hxx headers not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: mythes.hxx headers not found." >&5 +$as_echo "$as_me: error: mythes.hxx headers not found." >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:$LINENO: checking for main in -lmythes" >&5 -echo $ECHO_N "checking for main in -lmythes... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for main in -lmythes" >&5 +$as_echo_n "checking for main in -lmythes... " >&6; } if test "${ac_cv_lib_mythes_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lmythes $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21398,36 +23883,48 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -main (); +return main (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_mythes_main=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_mythes_main=no + ac_cv_lib_mythes_main=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_mythes_main" >&5 -echo "${ECHO_T}$ac_cv_lib_mythes_main" >&6 -if test $ac_cv_lib_mythes_main = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mythes_main" >&5 +$as_echo "$ac_cv_lib_mythes_main" >&6; } +if test "x$ac_cv_lib_mythes_main" = x""yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBMYTHES 1 _ACEOF @@ -21435,39 +23932,38 @@ _ACEOF LIBS="-lmythes $LIBS" else - { { echo "$as_me:$LINENO: error: mythes library not found." >&5 -echo "$as_me: error: mythes library not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: mythes library not found." >&5 +$as_echo "$as_me: error: mythes library not found." >&2;} { (exit 1); exit 1; }; } fi else - echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6 + { $as_echo "$as_me:$LINENO: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_MYTHES=NO fi -echo "$as_me:$LINENO: checking which lpsolve to use" >&5 -echo $ECHO_N "checking which lpsolve to use... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking which lpsolve to use" >&5 +$as_echo_n "checking which lpsolve to use... " >&6; } if test -n "$with_system_lpsolve" -o -n "$with_system_libs" && \ test "$with_system_lpsolve" != "no"; then - echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6 + { $as_echo "$as_me:$LINENO: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_LPSOLVE=YES if test "${ac_cv_header_lpsolve_lp_lib_h+set}" = set; then - echo "$as_me:$LINENO: checking for lpsolve/lp_lib.h" >&5 -echo $ECHO_N "checking for lpsolve/lp_lib.h... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for lpsolve/lp_lib.h" >&5 +$as_echo_n "checking for lpsolve/lp_lib.h... " >&6; } if test "${ac_cv_header_lpsolve_lp_lib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_lpsolve_lp_lib_h" >&5 -echo "${ECHO_T}$ac_cv_header_lpsolve_lp_lib_h" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_lpsolve_lp_lib_h" >&5 +$as_echo "$ac_cv_header_lpsolve_lp_lib_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking lpsolve/lp_lib.h usability" >&5 -echo $ECHO_N "checking lpsolve/lp_lib.h usability... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking lpsolve/lp_lib.h usability" >&5 +$as_echo_n "checking lpsolve/lp_lib.h usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21477,33 +23973,39 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking lpsolve/lp_lib.h presence" >&5 -echo $ECHO_N "checking lpsolve/lp_lib.h presence... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking lpsolve/lp_lib.h presence" >&5 +$as_echo_n "checking lpsolve/lp_lib.h presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -21511,143 +24013,147 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) - { echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: lpsolve/lp_lib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: lpsolve/lp_lib.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: lpsolve/lp_lib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: lpsolve/lp_lib.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) - { echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: lpsolve/lp_lib.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: lpsolve/lp_lib.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: lpsolve/lp_lib.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: lpsolve/lp_lib.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: lpsolve/lp_lib.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: lpsolve/lp_lib.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: lpsolve/lp_lib.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: lpsolve/lp_lib.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: lpsolve/lp_lib.h: in the future, the compiler will take precedence" >&2;} + ;; esac -echo "$as_me:$LINENO: checking for lpsolve/lp_lib.h" >&5 -echo $ECHO_N "checking for lpsolve/lp_lib.h... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for lpsolve/lp_lib.h" >&5 +$as_echo_n "checking for lpsolve/lp_lib.h... " >&6; } if test "${ac_cv_header_lpsolve_lp_lib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_cv_header_lpsolve_lp_lib_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_lpsolve_lp_lib_h" >&5 -echo "${ECHO_T}$ac_cv_header_lpsolve_lp_lib_h" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_lpsolve_lp_lib_h" >&5 +$as_echo "$ac_cv_header_lpsolve_lp_lib_h" >&6; } fi -if test $ac_cv_header_lpsolve_lp_lib_h = yes; then +if test "x$ac_cv_header_lpsolve_lp_lib_h" = x""yes; then : else - { { echo "$as_me:$LINENO: error: lpsolve headers not found." >&5 -echo "$as_me: error: lpsolve headers not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: lpsolve headers not found." >&5 +$as_echo "$as_me: error: lpsolve headers not found." >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:$LINENO: checking for make_lp in -llpsolve55" >&5 -echo $ECHO_N "checking for make_lp in -llpsolve55... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for make_lp in -llpsolve55" >&5 +$as_echo_n "checking for make_lp in -llpsolve55... " >&6; } if test "${ac_cv_lib_lpsolve55_make_lp+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-llpsolve55 $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char make_lp (); int main () { -make_lp (); +return make_lp (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_lpsolve55_make_lp=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_lpsolve55_make_lp=no + ac_cv_lib_lpsolve55_make_lp=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_lpsolve55_make_lp" >&5 -echo "${ECHO_T}$ac_cv_lib_lpsolve55_make_lp" >&6 -if test $ac_cv_lib_lpsolve55_make_lp = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lpsolve55_make_lp" >&5 +$as_echo "$ac_cv_lib_lpsolve55_make_lp" >&6; } +if test "x$ac_cv_lib_lpsolve55_make_lp" = x""yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBLPSOLVE55 1 _ACEOF @@ -21655,95 +24161,106 @@ _ACEOF LIBS="-llpsolve55 $LIBS" else - { { echo "$as_me:$LINENO: error: lpsolve library not found or too old." >&5 -echo "$as_me: error: lpsolve library not found or too old." >&2;} + { { $as_echo "$as_me:$LINENO: error: lpsolve library not found or too old." >&5 +$as_echo "$as_me: error: lpsolve library not found or too old." >&2;} { (exit 1); exit 1; }; } fi else - echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6 + { $as_echo "$as_me:$LINENO: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_LPSOLVE=NO BUILD_TYPE="$BUILD_TYPE LPSOLVE" fi if test "$_os" = "Linux"; then - echo "$as_me:$LINENO: checking whether libc is >= 2.1.1" >&5 -echo $ECHO_N "checking whether libc is >= 2.1.1... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking whether libc is >= 2.1.1" >&5 +$as_echo_n "checking whether libc is >= 2.1.1... " >&6; } exec 6>/dev/null # no output - echo "$as_me:$LINENO: checking for gnu_get_libc_version in -lc" >&5 -echo $ECHO_N "checking for gnu_get_libc_version in -lc... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for gnu_get_libc_version in -lc" >&5 +$as_echo_n "checking for gnu_get_libc_version in -lc... " >&6; } if test "${ac_cv_lib_c_gnu_get_libc_version+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char gnu_get_libc_version (); int main () { -gnu_get_libc_version (); +return gnu_get_libc_version (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_c_gnu_get_libc_version=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_c_gnu_get_libc_version=no + ac_cv_lib_c_gnu_get_libc_version=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_c_gnu_get_libc_version" >&5 -echo "${ECHO_T}$ac_cv_lib_c_gnu_get_libc_version" >&6 -if test $ac_cv_lib_c_gnu_get_libc_version = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_c_gnu_get_libc_version" >&5 +$as_echo "$ac_cv_lib_c_gnu_get_libc_version" >&6; } +if test "x$ac_cv_lib_c_gnu_get_libc_version" = x""yes; then HAVE_LIBC=yes; export HAVE_LIBC fi exec 6>&1 # output on again if test "$HAVE_LIBC"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else - { { echo "$as_me:$LINENO: error: no, upgrade libc" >&5 -echo "$as_me: error: no, upgrade libc" >&2;} + { { $as_echo "$as_me:$LINENO: error: no, upgrade libc" >&5 +$as_echo "$as_me: error: no, upgrade libc" >&2;} { (exit 1); exit 1; }; } fi fi if test \( "$_os" = "WINNT" \) ; then - echo "$as_me:$LINENO: checking for PSDK files" >&5 -echo $ECHO_N "checking for PSDK files... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for PSDK files" >&5 +$as_echo_n "checking for PSDK files... " >&6; } if test -z "$with_psdk_home"; then # This first line will detect a February 2003 Microsoft Platform SDK PSDK_HOME=`./oowintool --psdk-home` @@ -21764,13 +24281,13 @@ echo $ECHO_N "checking for PSDK files... $ECHO_C" >&6 PSDK_HOME=`echo $PSDK_HOME | $SED 's/\/$//'` # Problem with current PSDK (iz 49865) if test -f "$PSDK_HOME/Lib/libcp.lib"; then - { { echo "$as_me:$LINENO: error: + { { $as_echo "$as_me:$LINENO: error: Some modules do not build correctly with MS Platform SDK - April 2005 Edition if the library ($PSDK_HOME/Lib/libcp.lib) is found. Remove/rename/backup that file and restart configure. Details about this problem can be found in issue 49856." >&5 -echo "$as_me: error: +$as_echo "$as_me: error: Some modules do not build correctly with MS Platform SDK - April 2005 Edition if the library ($PSDK_HOME/Lib/libcp.lib) is found. @@ -21792,9 +24309,9 @@ problem can be found in issue 49856." >&2;} HAVE_PSDK_LIB="no" fi if test "$HAVE_PSDK_H" = "no" -o "$HAVE_PSDK_LIB" = "no"; then - { { echo "$as_me:$LINENO: error: Some (all?) PSDK files not found, please check if all needed Platform SDKs + { { $as_echo "$as_me:$LINENO: error: Some (all?) PSDK files not found, please check if all needed Platform SDKs are installed or use --with-psdk-home ." >&5 -echo "$as_me: error: Some (all?) PSDK files not found, please check if all needed Platform SDKs +$as_echo "$as_me: error: Some (all?) PSDK files not found, please check if all needed Platform SDKs are installed or use --with-psdk-home ." >&2;} { (exit 1); exit 1; }; } fi @@ -21802,31 +24319,31 @@ are installed or use --with-psdk-home ." >&2;} -o ! -x "$PSDK_HOME/bin/msidb.exe" \ -o ! -x "$PSDK_HOME/bin/uuidgen.exe" \ -o ! -x "$PSDK_HOME/bin/msitran.exe" ; then - { { echo "$as_me:$LINENO: error: Some (all) files of the Windows Installer SDK are missing, please install." >&5 -echo "$as_me: error: Some (all) files of the Windows Installer SDK are missing, please install." >&2;} + { { $as_echo "$as_me:$LINENO: error: Some (all) files of the Windows Installer SDK are missing, please install." >&5 +$as_echo "$as_me: error: Some (all) files of the Windows Installer SDK are missing, please install." >&2;} { (exit 1); exit 1; }; } fi - echo "$as_me:$LINENO: result: SDK files found ...)" >&5 -echo "${ECHO_T}SDK files found ...)" >&6 + { $as_echo "$as_me:$LINENO: result: SDK files found ...)" >&5 +$as_echo "SDK files found ...)" >&6; } if echo $PSDK_HOME | grep "v6.1" >/dev/null 2>/dev/null; then - echo "$as_me:$LINENO: result: Found Windows SDK 6.1 ($PSDK_HOME)" >&5 -echo "${ECHO_T}Found Windows SDK 6.1 ($PSDK_HOME)" >&6 + { $as_echo "$as_me:$LINENO: result: Found Windows SDK 6.1 ($PSDK_HOME)" >&5 +$as_echo "Found Windows SDK 6.1 ($PSDK_HOME)" >&6; } WINDOWS_VISTA_PSDK=TRUE elif echo $PSDK_HOME | grep "v6.0" >/dev/null 2>/dev/null; then - echo "$as_me:$LINENO: result: Found Windows SDK 6.0 ($PSDK_HOME)" >&5 -echo "${ECHO_T}Found Windows SDK 6.0 ($PSDK_HOME)" >&6 + { $as_echo "$as_me:$LINENO: result: Found Windows SDK 6.0 ($PSDK_HOME)" >&5 +$as_echo "Found Windows SDK 6.0 ($PSDK_HOME)" >&6; } WINDOWS_VISTA_PSDK=TRUE else - echo "$as_me:$LINENO: result: Found Legacy Windows Platform SDK ($PSDK_HOME)" >&5 -echo "${ECHO_T}Found Legacy Windows Platform SDK ($PSDK_HOME)" >&6 + { $as_echo "$as_me:$LINENO: result: Found Legacy Windows Platform SDK ($PSDK_HOME)" >&5 +$as_echo "Found Legacy Windows Platform SDK ($PSDK_HOME)" >&6; } fi fi if test \( "$_os" = "WINNT" \) ; then - echo "$as_me:$LINENO: checking for DirectX SDK files" >&5 -echo $ECHO_N "checking for DirectX SDK files... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for DirectX SDK files" >&5 +$as_echo_n "checking for DirectX SDK files... " >&6; } if test -z "$with_directx_home"; then if test -n "$DXSDK_DIR"; then DIRECTXSDK_HOME=`cygpath -d "$DXSDK_DIR"` @@ -21858,17 +24375,17 @@ echo $ECHO_N "checking for DirectX SDK files... $ECHO_C" >&6 fi if test -n "$ENABLE_DIRECTX"; then if test "$HAVE_DIRECTXSDK_H" = "yes" -a "$HAVE_DIRECTXSDK_LIB" = "yes"; then - echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6 + { $as_echo "$as_me:$LINENO: result: found" >&5 +$as_echo "found" >&6; } else - { { echo "$as_me:$LINENO: error: DirectX SDK files not found, please use --with-directx-home or -disable-directx." >&5 -echo "$as_me: error: DirectX SDK files not found, please use --with-directx-home or -disable-directx." >&2;} + { { $as_echo "$as_me:$LINENO: error: DirectX SDK files not found, please use --with-directx-home or -disable-directx." >&5 +$as_echo "$as_me: error: DirectX SDK files not found, please use --with-directx-home or -disable-directx." >&2;} { (exit 1); exit 1; }; } fi else DIRECTXSDK_HOME="" - echo "$as_me:$LINENO: result: disabled" >&5 -echo "${ECHO_T}disabled" >&6 + { $as_echo "$as_me:$LINENO: result: disabled" >&5 +$as_echo "disabled" >&6; } fi fi @@ -21876,14 +24393,14 @@ fi NSIS_PATH="" if test "$_os" = "WINNT" ; then - echo "$as_me:$LINENO: checking for NSIS" >&5 -echo $ECHO_N "checking for NSIS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for NSIS" >&5 +$as_echo_n "checking for NSIS... " >&6; } # Extract the first word of "nsis.exe", so it can be a program name with args. set dummy nsis.exe; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_NSIS_PATH+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $NSIS_PATH in [\\/]* | ?:[\\/]*) @@ -21896,27 +24413,28 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_NSIS_PATH="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi NSIS_PATH=$ac_cv_path_NSIS_PATH - if test -n "$NSIS_PATH"; then - echo "$as_me:$LINENO: result: $NSIS_PATH" >&5 -echo "${ECHO_T}$NSIS_PATH" >&6 + { $as_echo "$as_me:$LINENO: result: $NSIS_PATH" >&5 +$as_echo "$NSIS_PATH" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + if test -n "$NSIS_PATH"; then NSIS_PATH=`dirname "$NSIS_PATH"` fi @@ -21931,24 +24449,24 @@ fi NSIS_PATH="$nsistest" fi if test -z "$NSIS_PATH"; then - { echo "$as_me:$LINENO: WARNING: NSIS not found, no self contained installer will be build." >&5 -echo "$as_me: WARNING: NSIS not found, no self contained installer will be build." >&2;} + { $as_echo "$as_me:$LINENO: WARNING: NSIS not found, no self contained installer will be build." >&5 +$as_echo "$as_me: WARNING: NSIS not found, no self contained installer will be build." >&2;} echo "NSIS not found, no self contained installer will be build." >> warn else NSIS_PATH=`cygpath -d "$NSIS_PATH"` NSIS_PATH=`cygpath -u "$NSIS_PATH"` - echo "$as_me:$LINENO: result: found ($NSIS_PATH)" >&5 -echo "${ECHO_T}found ($NSIS_PATH)" >&6 + { $as_echo "$as_me:$LINENO: result: found ($NSIS_PATH)" >&5 +$as_echo "found ($NSIS_PATH)" >&6; } fi fi # Extract the first word of "bison", so it can be a program name with args. set dummy bison; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_BISON+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $BISON in [\\/]* | ?:[\\/]*) @@ -21961,58 +24479,59 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_BISON="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi BISON=$ac_cv_path_BISON - if test -n "$BISON"; then - echo "$as_me:$LINENO: result: $BISON" >&5 -echo "${ECHO_T}$BISON" >&6 + { $as_echo "$as_me:$LINENO: result: $BISON" >&5 +$as_echo "$BISON" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + if test -z "$BISON"; then - { { echo "$as_me:$LINENO: error: no bison found in \$PATH, install bison" >&5 -echo "$as_me: error: no bison found in \$PATH, install bison" >&2;} + { { $as_echo "$as_me:$LINENO: error: no bison found in \$PATH, install bison" >&5 +$as_echo "$as_me: error: no bison found in \$PATH, install bison" >&2;} { (exit 1); exit 1; }; } else - echo "$as_me:$LINENO: checking the bison version" >&5 -echo $ECHO_N "checking the bison version... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking the bison version" >&5 +$as_echo_n "checking the bison version... " >&6; } _bison_version=`$BISON --version | grep GNU | $SED -e 's@^[^0-9]*@@' -e 's@ .*@@' -e 's@,.*@@'`; _bison_longver=`echo $_bison_version | $AWK -F. '{ print \$1*1000+\$2}'` # Accept newer than 1.875 or older(equal) than 1.75 if test "$_bison_longver" -ge 1875 -o "$_bison_longver" -le 1075; then if test "$_bison_version" = "1.875" ; then - { echo "$as_me:$LINENO: WARNING: suspect ($BISON $_bison_version)" >&5 -echo "$as_me: WARNING: suspect ($BISON $_bison_version)" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: suspect ($BISON $_bison_version)" >&5 +$as_echo "$as_me: WARNING: suspect ($BISON $_bison_version)" >&2;} echo "Suspect ($BISON $_bison_version) suggest upgrade" >> warn else - echo "$as_me:$LINENO: result: checked ($BISON $_bison_version)" >&5 -echo "${ECHO_T}checked ($BISON $_bison_version)" >&6 + { $as_echo "$as_me:$LINENO: result: checked ($BISON $_bison_version)" >&5 +$as_echo "checked ($BISON $_bison_version)" >&6; } fi else - { { echo "$as_me:$LINENO: error: failed ($BISON $_bison_version need 1.875+ (or 1.75 and older))" >&5 -echo "$as_me: error: failed ($BISON $_bison_version need 1.875+ (or 1.75 and older))" >&2;} + { { $as_echo "$as_me:$LINENO: error: failed ($BISON $_bison_version need 1.875+ (or 1.75 and older))" >&5 +$as_echo "$as_me: error: failed ($BISON $_bison_version need 1.875+ (or 1.75 and older))" >&2;} { (exit 1); exit 1; }; } fi fi # Extract the first word of "flex", so it can be a program name with args. set dummy flex; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_FLEX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $FLEX in [\\/]* | ?:[\\/]*) @@ -22025,38 +24544,39 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_FLEX="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi FLEX=$ac_cv_path_FLEX - if test -n "$FLEX"; then - echo "$as_me:$LINENO: result: $FLEX" >&5 -echo "${ECHO_T}$FLEX" >&6 + { $as_echo "$as_me:$LINENO: result: $FLEX" >&5 +$as_echo "$FLEX" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + if test -z "$FLEX"; then - { { echo "$as_me:$LINENO: error: no flex found in \$PATH, install flex" >&5 -echo "$as_me: error: no flex found in \$PATH, install flex" >&2;} + { { $as_echo "$as_me:$LINENO: error: no flex found in \$PATH, install flex" >&5 +$as_echo "$as_me: error: no flex found in \$PATH, install flex" >&2;} { (exit 1); exit 1; }; } fi # Extract the first word of "patch", so it can be a program name with args. set dummy patch; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_PATCH+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $PATCH in [\\/]* | ?:[\\/]*) @@ -22069,30 +24589,31 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PATCH="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi PATCH=$ac_cv_path_PATCH - if test -n "$PATCH"; then - echo "$as_me:$LINENO: result: $PATCH" >&5 -echo "${ECHO_T}$PATCH" >&6 + { $as_echo "$as_me:$LINENO: result: $PATCH" >&5 +$as_echo "$PATCH" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + if test -z "$PATCH"; then - { { echo "$as_me:$LINENO: error: \\"patch\\" not found in \$PATH, install the development tool named\\"patch\"\" >&5 -echo "$as_me: error: \\"patch\\" not found in \$PATH, install the development tool named\\"patch\"\" >&2;} + { { $as_echo "$as_me:$LINENO: error: \\"patch\\" not found in \$PATH, install the development tool named\\"patch\"\" >&5 +$as_echo "$as_me: error: \\"patch\\" not found in \$PATH, install the development tool named\\"patch\"\" >&2;} { (exit 1); exit 1; }; } fi @@ -22103,20 +24624,20 @@ if test "$_os" = "SunOS" -o "$_os" = "FreeBSD" -o "$_os" = "Darwin"; then if test -x "$with_gnu_patch"; then GNUPATCH=$with_gnu_patch else - { { echo "$as_me:$LINENO: error: --with-gnu-patch did not point to an executable" >&5 -echo "$as_me: error: --with-gnu-patch did not point to an executable" >&2;} + { { $as_echo "$as_me:$LINENO: error: --with-gnu-patch did not point to an executable" >&5 +$as_echo "$as_me: error: --with-gnu-patch did not point to an executable" >&2;} { (exit 1); exit 1; }; } fi fi - echo "$as_me:$LINENO: checking whether $GNUPATCH is GNU patch" >&5 -echo $ECHO_N "checking whether $GNUPATCH is GNU patch... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking whether $GNUPATCH is GNU patch" >&5 +$as_echo_n "checking whether $GNUPATCH is GNU patch... " >&6; } if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/dev/null; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else - { { echo "$as_me:$LINENO: error: no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it" >&5 -echo "$as_me: error: no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it" >&2;} + { { $as_echo "$as_me:$LINENO: error: no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it" >&5 +$as_echo "$as_me: error: no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it" >&2;} { (exit 1); exit 1; }; } fi @@ -22126,10 +24647,10 @@ echo "$as_me: error: no, GNU patch needed. install or specify with --with-gnu-pa do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_GNUCP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $GNUCP in [\\/]* | ?:[\\/]*) @@ -22142,62 +24663,63 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GNUCP="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi GNUCP=$ac_cv_path_GNUCP - if test -n "$GNUCP"; then - echo "$as_me:$LINENO: result: $GNUCP" >&5 -echo "${ECHO_T}$GNUCP" >&6 + { $as_echo "$as_me:$LINENO: result: $GNUCP" >&5 +$as_echo "$GNUCP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + test -n "$GNUCP" && break done if test -z $GNUCP; then - { { echo "$as_me:$LINENO: error: Neither gnucp nor cp found. Install GNU cp and/or specify --with-gnu-cp=/path/to/it" >&5 -echo "$as_me: error: Neither gnucp nor cp found. Install GNU cp and/or specify --with-gnu-cp=/path/to/it" >&2;} + { { $as_echo "$as_me:$LINENO: error: Neither gnucp nor cp found. Install GNU cp and/or specify --with-gnu-cp=/path/to/it" >&5 +$as_echo "$as_me: error: Neither gnucp nor cp found. Install GNU cp and/or specify --with-gnu-cp=/path/to/it" >&2;} { (exit 1); exit 1; }; } fi else if test -x "$with_gnu_cp"; then GNUCP=$with_gnu_cp else - { { echo "$as_me:$LINENO: error: --with-gnu-cp did not point to an executable" >&5 -echo "$as_me: error: --with-gnu-cp did not point to an executable" >&2;} + { { $as_echo "$as_me:$LINENO: error: --with-gnu-cp did not point to an executable" >&5 +$as_echo "$as_me: error: --with-gnu-cp did not point to an executable" >&2;} { (exit 1); exit 1; }; } fi fi - echo "$as_me:$LINENO: checking whether $GNUCP is GNU cp" >&5 -echo $ECHO_N "checking whether $GNUCP is GNU cp... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking whether $GNUCP is GNU cp" >&5 +$as_echo_n "checking whether $GNUCP is GNU cp... " >&6; } if $GNUCP --version 2>/dev/null | grep "Free Software Foundation" >/dev/null 2>/dev/null; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else if $GNUCP --version 2>/dev/null | grep "GNU fileutils" >/dev/null 2>/dev/null; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else if test "$_os" = "Darwin"; then GNUCP='' - echo "$as_me:$LINENO: result: no gnucp found - using the system's cp command" >&5 -echo "${ECHO_T}no gnucp found - using the system's cp command" >&6 + { $as_echo "$as_me:$LINENO: result: no gnucp found - using the system's cp command" >&5 +$as_echo "no gnucp found - using the system's cp command" >&6; } else - { { echo "$as_me:$LINENO: error: no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it" >&5 -echo "$as_me: error: no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it" >&2;} + { { $as_echo "$as_me:$LINENO: error: no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it" >&5 +$as_echo "$as_me: error: no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it" >&2;} { (exit 1); exit 1; }; } fi fi @@ -22211,10 +24733,10 @@ if test "$_os" = "WINNT"; then CYGWIN_PATH="" # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_CYGWIN_PATH+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $CYGWIN_PATH in [\\/]* | ?:[\\/]*) @@ -22227,27 +24749,28 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_CYGWIN_PATH="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi CYGWIN_PATH=$ac_cv_path_CYGWIN_PATH - if test -n "$CYGWIN_PATH"; then - echo "$as_me:$LINENO: result: $CYGWIN_PATH" >&5 -echo "${ECHO_T}$CYGWIN_PATH" >&6 + { $as_echo "$as_me:$LINENO: result: $CYGWIN_PATH" >&5 +$as_echo "$CYGWIN_PATH" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + CYGWIN_PATH=`dirname "$CYGWIN_PATH"` fi if test -z "$CYGWIN_PATH"; then @@ -22256,18 +24779,18 @@ fi if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then - echo "$as_me:$LINENO: checking ml.exe assembler path" >&5 -echo $ECHO_N "checking ml.exe assembler path... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking ml.exe assembler path" >&5 +$as_echo_n "checking ml.exe assembler path... " >&6; } if test -n "$with_asm_home"; then with_asm_home=`cygpath -u "$with_asm_home"` fi if test ! -x "$with_asm_home/ml.exe"; then # Extract the first word of "ml.exe", so it can be a program name with args. set dummy ml.exe; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_ML_EXE+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $ML_EXE in [\\/]* | ?:[\\/]*) @@ -22280,35 +24803,36 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ML_EXE="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi ML_EXE=$ac_cv_path_ML_EXE - if test -n "$ML_EXE"; then - echo "$as_me:$LINENO: result: $ML_EXE" >&5 -echo "${ECHO_T}$ML_EXE" >&6 + { $as_echo "$as_me:$LINENO: result: $ML_EXE" >&5 +$as_echo "$ML_EXE" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + if test -z "$ML_EXE"; then if test -x "$with_cl_home/bin/ml.exe"; then with_asm_home=$with_cl_home/bin - echo "$as_me:$LINENO: result: found ($with_asm_home)" >&5 -echo "${ECHO_T}found ($with_asm_home)" >&6 + { $as_echo "$as_me:$LINENO: result: found ($with_asm_home)" >&5 +$as_echo "found ($with_asm_home)" >&6; } else - { { echo "$as_me:$LINENO: error: Configure did not find ml.exe assembler." >&5 -echo "$as_me: error: Configure did not find ml.exe assembler." >&2;} + { { $as_echo "$as_me:$LINENO: error: Configure did not find ml.exe assembler." >&5 +$as_echo "$as_me: error: Configure did not find ml.exe assembler." >&2;} { (exit 1); exit 1; }; } fi else @@ -22320,8 +24844,8 @@ else fi ASM_HOME="$with_asm_home" if test -n "$ASM_HOME"; then - echo "$as_me:$LINENO: result: $ASM_HOME" >&5 -echo "${ECHO_T}$ASM_HOME" >&6 + { $as_echo "$as_me:$LINENO: result: $ASM_HOME" >&5 +$as_echo "$ASM_HOME" >&6; } fi @@ -22338,10 +24862,10 @@ if test -n "$with_zip_home" ; then else # Extract the first word of "zip", so it can be a program name with args. set dummy zip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_ZIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $ZIP in [\\/]* | ?:[\\/]*) @@ -22354,33 +24878,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ZIP="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi ZIP=$ac_cv_path_ZIP - if test -n "$ZIP"; then - echo "$as_me:$LINENO: result: $ZIP" >&5 -echo "${ECHO_T}$ZIP" >&6 + { $as_echo "$as_me:$LINENO: result: $ZIP" >&5 +$as_echo "$ZIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + # Extract the first word of "unzip", so it can be a program name with args. set dummy unzip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_UNZIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $UNZIP in [\\/]* | ?:[\\/]*) @@ -22393,48 +24918,49 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_UNZIP="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi UNZIP=$ac_cv_path_UNZIP - if test -n "$UNZIP"; then - echo "$as_me:$LINENO: result: $UNZIP" >&5 -echo "${ECHO_T}$UNZIP" >&6 + { $as_echo "$as_me:$LINENO: result: $UNZIP" >&5 +$as_echo "$UNZIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + ZIP_HOME=`dirname "$ZIP"` fi if test -z "$ZIP" -o -z "$UNZIP"; then - { { echo "$as_me:$LINENO: error: Zip/Unzip are required to build, please install or use --with-zip-home" >&5 -echo "$as_me: error: Zip/Unzip are required to build, please install or use --with-zip-home" >&2;} + { { $as_echo "$as_me:$LINENO: error: Zip/Unzip are required to build, please install or use --with-zip-home" >&5 +$as_echo "$as_me: error: Zip/Unzip are required to build, please install or use --with-zip-home" >&2;} { (exit 1); exit 1; }; } fi if test "$_os" = "WINNT"; then if test "$with_use_shell" = "4nt" ; then if test -z "`$ZIP -h | grep -i WinNT`" ; then -{ { echo "$as_me:$LINENO: error: $ZIP found in the path is not the required native Windows Version 2.3 of Info-ZIPs zip.exe. +{ { $as_echo "$as_me:$LINENO: error: $ZIP found in the path is not the required native Windows Version 2.3 of Info-ZIPs zip.exe. Probably there is a cygwin version in the path." >&5 -echo "$as_me: error: $ZIP found in the path is not the required native Windows Version 2.3 of Info-ZIPs zip.exe. +$as_echo "$as_me: error: $ZIP found in the path is not the required native Windows Version 2.3 of Info-ZIPs zip.exe. Probably there is a cygwin version in the path." >&2;} { (exit 1); exit 1; }; } fi else if test -n "`$ZIP -h | grep -i WinNT`" ; then -{ { echo "$as_me:$LINENO: error: $ZIP found in the path is not the required cygwin version of Info-ZIPs zip.exe." >&5 -echo "$as_me: error: $ZIP found in the path is not the required cygwin version of Info-ZIPs zip.exe." >&2;} +{ { $as_echo "$as_me:$LINENO: error: $ZIP found in the path is not the required cygwin version of Info-ZIPs zip.exe." >&5 +$as_echo "$as_me: error: $ZIP found in the path is not the required cygwin version of Info-ZIPs zip.exe." >&2;} { (exit 1); exit 1; }; } fi fi @@ -22442,18 +24968,18 @@ fi if test "$_os" = "WINNT"; then - echo "$as_me:$LINENO: checking for unicows.dll" >&5 -echo $ECHO_N "checking for unicows.dll... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for unicows.dll" >&5 +$as_echo_n "checking for unicows.dll... " >&6; } if test -x ./external/unicows/unicows.dll; then - echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6 + { $as_echo "$as_me:$LINENO: result: found" >&5 +$as_echo "found" >&6; } else - { { echo "$as_me:$LINENO: error: The Microsoft Layer for Unicode (unicows.dll) is missing in external/unicows/. + { { $as_echo "$as_me:$LINENO: error: The Microsoft Layer for Unicode (unicows.dll) is missing in external/unicows/. Get it from the Microsoft site and put it into external/unicows. (Note: Microsoft seems to enjoy changing the exact location of this file. You may have to search Microsoft's website.) Last time it was seen at: ." >&5 -echo "$as_me: error: The Microsoft Layer for Unicode (unicows.dll) is missing in external/unicows/. +$as_echo "$as_me: error: The Microsoft Layer for Unicode (unicows.dll) is missing in external/unicows/. Get it from the Microsoft site and put it into external/unicows. (Note: Microsoft seems to enjoy changing the exact location of this file. You may have to search Microsoft's website.) Last time it was seen at: @@ -22463,18 +24989,18 @@ may have to search Microsoft's website.) Last time it was seen at: fi if test "$_os" = "WINNT"; then - echo "$as_me:$LINENO: checking for dbghelp.dll" >&5 -echo $ECHO_N "checking for dbghelp.dll... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for dbghelp.dll" >&5 +$as_echo_n "checking for dbghelp.dll... " >&6; } if test -x ./external/dbghelp/dbghelp.dll; then - echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6 + { $as_echo "$as_me:$LINENO: result: found" >&5 +$as_echo "found" >&6; } else - { { echo "$as_me:$LINENO: error: dbghelp.dll is missing in external/dbghelp/. + { { $as_echo "$as_me:$LINENO: error: dbghelp.dll is missing in external/dbghelp/. Get it from the Microsoft site and put it into external/dbghelp. (Note: Microsoft seems to enjoy changing the exact location of this file. You may have to search Microsoft's website.) Last time it was seen at: ." >&5 -echo "$as_me: error: dbghelp.dll is missing in external/dbghelp/. +$as_echo "$as_me: error: dbghelp.dll is missing in external/dbghelp/. Get it from the Microsoft site and put it into external/dbghelp. (Note: Microsoft seems to enjoy changing the exact location of this file. You may have to search Microsoft's website.) Last time it was seen at: @@ -22487,24 +25013,24 @@ if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then if ./oowintool --msvc-copy-dlls ./external/msvcp ; then : else - { { echo "$as_me:$LINENO: error: oowintool failed to copy CRT" >&5 -echo "$as_me: error: oowintool failed to copy CRT" >&2;} + { { $as_echo "$as_me:$LINENO: error: oowintool failed to copy CRT" >&5 +$as_echo "$as_me: error: oowintool failed to copy CRT" >&2;} { (exit 1); exit 1; }; } fi fi if test "$_os" = "WINNT"; then - echo "$as_me:$LINENO: checking for gdiplus.dll" >&5 -echo $ECHO_N "checking for gdiplus.dll... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for gdiplus.dll" >&5 +$as_echo_n "checking for gdiplus.dll... " >&6; } if test -x ./external/gdiplus/gdiplus.dll; then - echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6 + { $as_echo "$as_me:$LINENO: result: found" >&5 +$as_echo "found" >&6; } else - { { echo "$as_me:$LINENO: error: gdiplus.dll is missing in external/gdiplus/. + { { $as_echo "$as_me:$LINENO: error: gdiplus.dll is missing in external/gdiplus/. Get it from the Microsoft site and put it into external/gdiplus. You may have to search Microsoft's website. Last time it was seen at: ." >&5 -echo "$as_me: error: gdiplus.dll is missing in external/gdiplus/. +$as_echo "$as_me: error: gdiplus.dll is missing in external/gdiplus/. Get it from the Microsoft site and put it into external/gdiplus. You may have to search Microsoft's website. Last time it was seen at: ." >&2;} @@ -22518,11 +25044,11 @@ fi if test "$_os" = "WINNT"; then if test "$WITH_MINGWIN" = "yes" || test "$COMEX" -ge "10"; then - echo "$as_me:$LINENO: checking for instmsia.exe/instmsiw.exe" >&5 -echo $ECHO_N "checking for instmsia.exe/instmsiw.exe... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for instmsia.exe/instmsiw.exe" >&5 +$as_echo_n "checking for instmsia.exe/instmsiw.exe... " >&6; } if test -x ./external/msi/instmsia.exe -a -x ./external/msi/instmsiw.exe; then - echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6 + { $as_echo "$as_me:$LINENO: result: found" >&5 +$as_echo "found" >&6; } else MSIAPATH=`/bin/find "$COMPATH/../.." -iname instmsia.exe | head -n 1` MSIWPATH=`/bin/find "$COMPATH/../.." -iname instmsiw.exe | head -n 1` @@ -22531,36 +25057,36 @@ echo "${ECHO_T}found" >&6 cp "$MSIWPATH" ./external/msi/ && chmod +x ./external/msi/instmsiw.exe && MSIWCOPY="OK" fi if test -z "$MSIACOPY" -o -z "$MSIWCOPY"; then - { { echo "$as_me:$LINENO: error: instmsia.exe and/or instmsiw.exe are/is missing in the default location. + { { $as_echo "$as_me:$LINENO: error: instmsia.exe and/or instmsiw.exe are/is missing in the default location. These programs are part of the Visual Studio installation and should be found in a directory similar to: \"c:\\Program Files\\Microsoft Visual Studio .NET 2003\\Common7\\Tools\\Deployment\\MsiRedist\\\" As the automatic detection fails please copy the files to external/msi/." >&5 -echo "$as_me: error: instmsia.exe and/or instmsiw.exe are/is missing in the default location. +$as_echo "$as_me: error: instmsia.exe and/or instmsiw.exe are/is missing in the default location. These programs are part of the Visual Studio installation and should be found in a directory similar to: \"c:\\Program Files\\Microsoft Visual Studio .NET 2003\\Common7\\Tools\\Deployment\\MsiRedist\\\" As the automatic detection fails please copy the files to external/msi/." >&2;} { (exit 1); exit 1; }; } else - echo "$as_me:$LINENO: result: found and copied" >&5 -echo "${ECHO_T}found and copied" >&6 + { $as_echo "$as_me:$LINENO: result: found and copied" >&5 +$as_echo "found and copied" >&6; } fi fi fi fi -echo "$as_me:$LINENO: checking which polygon clipping code to use" >&5 -echo $ECHO_N "checking which polygon clipping code to use... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking which polygon clipping code to use" >&5 +$as_echo_n "checking which polygon clipping code to use... " >&6; } WITH_GPC=NO if test "$with_gpc" != "no" && test "$without_gpc" != "yes"; then WITH_GPC=YES - echo "$as_me:$LINENO: result: GPC" >&5 -echo "${ECHO_T}GPC" >&6 + { $as_echo "$as_me:$LINENO: result: GPC" >&5 +$as_echo "GPC" >&6; } - echo "$as_me:$LINENO: checking for GPC files" >&5 -echo $ECHO_N "checking for GPC files... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for GPC files" >&5 +$as_echo_n "checking for GPC files... " >&6; } if test -f ./external/gpc/gpc.h; then HAVE_GPC_H="yes" else @@ -22573,25 +25099,25 @@ echo $ECHO_N "checking for GPC files... $ECHO_C" >&6 fi if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then - echo "$as_me:$LINENO: result: GPC files found" >&5 -echo "${ECHO_T}GPC files found" >&6 + { $as_echo "$as_me:$LINENO: result: GPC files found" >&5 +$as_echo "GPC files found" >&6; } else - { { echo "$as_me:$LINENO: error: GPC files not found + { { $as_echo "$as_me:$LINENO: error: GPC files not found ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z and untar in external/gpc, or use basegfx' implementation using --without-gpc" >&5 -echo "$as_me: error: GPC files not found +$as_echo "$as_me: error: GPC files not found ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z and untar in external/gpc, or use basegfx' implementation using --without-gpc" >&2;} { (exit 1); exit 1; }; } fi else - echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6 + { $as_echo "$as_me:$LINENO: result: internal" >&5 +$as_echo "internal" >&6; } fi -echo "$as_me:$LINENO: checking which VCLplugs shall be built" >&5 -echo $ECHO_N "checking which VCLplugs shall be built... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking which VCLplugs shall be built" >&5 +$as_echo_n "checking which VCLplugs shall be built... " >&6; } ENABLE_GTK="" if test "x$enable_gtk" = "xyes"; then ENABLE_GTK="TRUE" @@ -22614,31 +25140,31 @@ fi if test -z "$R"; then - echo "$as_me:$LINENO: result: none" >&5 -echo "${ECHO_T}none" >&6 + { $as_echo "$as_me:$LINENO: result: none" >&5 +$as_echo "none" >&6; } else - echo "$as_me:$LINENO: result: $R" >&5 -echo "${ECHO_T}$R" >&6 + { $as_echo "$as_me:$LINENO: result: $R" >&5 +$as_echo "$R" >&6; } fi ENABLE_GCONF="" -echo "$as_me:$LINENO: checking whether to enable GConf support" >&5 -echo $ECHO_N "checking whether to enable GConf support... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to enable GConf support" >&5 +$as_echo_n "checking whether to enable GConf support... " >&6; } if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$_os" != "OS2" -a "$enable_gconf" = "yes"; then ENABLE_GCONF="TRUE" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } succeeded=no if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -22651,28 +25177,29 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test "$PKG_CONFIG" = "no" ; then @@ -22683,25 +25210,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for gconf-2.0 " >&5 -echo $ECHO_N "checking for gconf-2.0 ... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for gconf-2.0 " >&5 +$as_echo_n "checking for gconf-2.0 ... " >&6; } if $PKG_CONFIG --exists "gconf-2.0 " ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } succeeded=yes - echo "$as_me:$LINENO: checking GCONF_CFLAGS" >&5 -echo $ECHO_N "checking GCONF_CFLAGS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking GCONF_CFLAGS" >&5 +$as_echo_n "checking GCONF_CFLAGS... " >&6; } GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 "` - echo "$as_me:$LINENO: result: $GCONF_CFLAGS" >&5 -echo "${ECHO_T}$GCONF_CFLAGS" >&6 + { $as_echo "$as_me:$LINENO: result: $GCONF_CFLAGS" >&5 +$as_echo "$GCONF_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking GCONF_LIBS" >&5 -echo $ECHO_N "checking GCONF_LIBS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking GCONF_LIBS" >&5 +$as_echo_n "checking GCONF_LIBS... " >&6; } GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0 "` - echo "$as_me:$LINENO: result: $GCONF_LIBS" >&5 -echo "${ECHO_T}$GCONF_LIBS" >&6 + { $as_echo "$as_me:$LINENO: result: $GCONF_LIBS" >&5 +$as_echo "$GCONF_LIBS" >&6; } else GCONF_CFLAGS="" GCONF_LIBS="" @@ -22722,35 +25249,35 @@ echo "${ECHO_T}$GCONF_LIBS" >&6 if test $succeeded = yes; then : else - { { echo "$as_me:$LINENO: error: Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -echo "$as_me: error: Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { { $as_echo "$as_me:$LINENO: error: Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +$as_echo "$as_me: error: Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi ENABLE_GNOMEVFS="" -echo "$as_me:$LINENO: checking whether to enable GNOME VFS support" >&5 -echo $ECHO_N "checking whether to enable GNOME VFS support... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to enable GNOME VFS support" >&5 +$as_echo_n "checking whether to enable GNOME VFS support... " >&6; } if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gnome_vfs" = "yes"; then ENABLE_GNOMEVFS="TRUE" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } succeeded=no if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -22763,28 +25290,29 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test "$PKG_CONFIG" = "no" ; then @@ -22795,25 +25323,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for gnome-vfs-2.0 >= 2.6.0 " >&5 -echo $ECHO_N "checking for gnome-vfs-2.0 >= 2.6.0 ... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for gnome-vfs-2.0 >= 2.6.0 " >&5 +$as_echo_n "checking for gnome-vfs-2.0 >= 2.6.0 ... " >&6; } if $PKG_CONFIG --exists "gnome-vfs-2.0 >= 2.6.0 " ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } succeeded=yes - echo "$as_me:$LINENO: checking GNOMEVFS_CFLAGS" >&5 -echo $ECHO_N "checking GNOMEVFS_CFLAGS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking GNOMEVFS_CFLAGS" >&5 +$as_echo_n "checking GNOMEVFS_CFLAGS... " >&6; } GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= 2.6.0 "` - echo "$as_me:$LINENO: result: $GNOMEVFS_CFLAGS" >&5 -echo "${ECHO_T}$GNOMEVFS_CFLAGS" >&6 + { $as_echo "$as_me:$LINENO: result: $GNOMEVFS_CFLAGS" >&5 +$as_echo "$GNOMEVFS_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking GNOMEVFS_LIBS" >&5 -echo $ECHO_N "checking GNOMEVFS_LIBS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking GNOMEVFS_LIBS" >&5 +$as_echo_n "checking GNOMEVFS_LIBS... " >&6; } GNOMEVFS_LIBS=`$PKG_CONFIG --libs "gnome-vfs-2.0 >= 2.6.0 "` - echo "$as_me:$LINENO: result: $GNOMEVFS_LIBS" >&5 -echo "${ECHO_T}$GNOMEVFS_LIBS" >&6 + { $as_echo "$as_me:$LINENO: result: $GNOMEVFS_LIBS" >&5 +$as_echo "$GNOMEVFS_LIBS" >&6; } else GNOMEVFS_CFLAGS="" GNOMEVFS_LIBS="" @@ -22834,8 +25362,8 @@ echo "${ECHO_T}$GNOMEVFS_LIBS" >&6 if test $succeeded = yes; then : else - { { echo "$as_me:$LINENO: error: Library requirements (gnome-vfs-2.0 >= 2.6.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -echo "$as_me: error: Library requirements (gnome-vfs-2.0 >= 2.6.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { { $as_echo "$as_me:$LINENO: error: Library requirements (gnome-vfs-2.0 >= 2.6.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +$as_echo "$as_me: error: Library requirements (gnome-vfs-2.0 >= 2.6.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi @@ -22846,10 +25374,10 @@ echo "$as_me: error: Library requirements (gnome-vfs-2.0 >= 2.6.0 ) not met; con if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -22862,28 +25390,29 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test "$PKG_CONFIG" = "no" ; then @@ -22894,25 +25423,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for gconf-2.0 " >&5 -echo $ECHO_N "checking for gconf-2.0 ... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for gconf-2.0 " >&5 +$as_echo_n "checking for gconf-2.0 ... " >&6; } if $PKG_CONFIG --exists "gconf-2.0 " ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } succeeded=yes - echo "$as_me:$LINENO: checking GCONF_CFLAGS" >&5 -echo $ECHO_N "checking GCONF_CFLAGS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking GCONF_CFLAGS" >&5 +$as_echo_n "checking GCONF_CFLAGS... " >&6; } GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 "` - echo "$as_me:$LINENO: result: $GCONF_CFLAGS" >&5 -echo "${ECHO_T}$GCONF_CFLAGS" >&6 + { $as_echo "$as_me:$LINENO: result: $GCONF_CFLAGS" >&5 +$as_echo "$GCONF_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking GCONF_LIBS" >&5 -echo $ECHO_N "checking GCONF_LIBS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking GCONF_LIBS" >&5 +$as_echo_n "checking GCONF_LIBS... " >&6; } GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0 "` - echo "$as_me:$LINENO: result: $GCONF_LIBS" >&5 -echo "${ECHO_T}$GCONF_LIBS" >&6 + { $as_echo "$as_me:$LINENO: result: $GCONF_LIBS" >&5 +$as_echo "$GCONF_LIBS" >&6; } else GCONF_CFLAGS="" GCONF_LIBS="" @@ -22933,15 +25462,15 @@ echo "${ECHO_T}$GCONF_LIBS" >&6 if test $succeeded = yes; then : else - { { echo "$as_me:$LINENO: error: Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -echo "$as_me: error: Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { { $as_echo "$as_me:$LINENO: error: Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +$as_echo "$as_me: error: Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -22959,10 +25488,10 @@ if test "$test_gtk" = "yes"; then if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -22975,28 +25504,29 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test "$PKG_CONFIG" = "no" ; then @@ -23007,25 +25537,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 " >&5 -echo $ECHO_N "checking for gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 ... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 " >&5 +$as_echo_n "checking for gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 ... " >&6; } if $PKG_CONFIG --exists "gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 " ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } succeeded=yes - echo "$as_me:$LINENO: checking GTK_CFLAGS" >&5 -echo $ECHO_N "checking GTK_CFLAGS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking GTK_CFLAGS" >&5 +$as_echo_n "checking GTK_CFLAGS... " >&6; } GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 "` - echo "$as_me:$LINENO: result: $GTK_CFLAGS" >&5 -echo "${ECHO_T}$GTK_CFLAGS" >&6 + { $as_echo "$as_me:$LINENO: result: $GTK_CFLAGS" >&5 +$as_echo "$GTK_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking GTK_LIBS" >&5 -echo $ECHO_N "checking GTK_LIBS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking GTK_LIBS" >&5 +$as_echo_n "checking GTK_LIBS... " >&6; } GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 "` - echo "$as_me:$LINENO: result: $GTK_LIBS" >&5 -echo "${ECHO_T}$GTK_LIBS" >&6 + { $as_echo "$as_me:$LINENO: result: $GTK_LIBS" >&5 +$as_echo "$GTK_LIBS" >&6; } else GTK_CFLAGS="" GTK_LIBS="" @@ -23046,8 +25576,8 @@ echo "${ECHO_T}$GTK_LIBS" >&6 if test $succeeded = yes; then : else - { { echo "$as_me:$LINENO: error: requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages" >&5 -echo "$as_me: error: requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages" >&2;} + { { $as_echo "$as_me:$LINENO: error: requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages" >&5 +$as_echo "$as_me: error: requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages" >&2;} { (exit 1); exit 1; }; } fi @@ -23058,22 +25588,22 @@ echo "$as_me: error: requirements to build the gtk-plugin not met. Use --disable BUILD_TYPE="$BUILD_TYPE SYSTRAY_GTK" fi - echo "$as_me:$LINENO: checking whether to enable DBUS support" >&5 -echo $ECHO_N "checking whether to enable DBUS support... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking whether to enable DBUS support" >&5 +$as_echo_n "checking whether to enable DBUS support... " >&6; } if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_dbus" = "yes"; then ENABLE_DBUS="TRUE" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } succeeded=no if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -23086,28 +25616,29 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test "$PKG_CONFIG" = "no" ; then @@ -23118,25 +25649,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for dbus-glib-1 >= 0.70 " >&5 -echo $ECHO_N "checking for dbus-glib-1 >= 0.70 ... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for dbus-glib-1 >= 0.70 " >&5 +$as_echo_n "checking for dbus-glib-1 >= 0.70 ... " >&6; } if $PKG_CONFIG --exists "dbus-glib-1 >= 0.70 " ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } succeeded=yes - echo "$as_me:$LINENO: checking DBUS_CFLAGS" >&5 -echo $ECHO_N "checking DBUS_CFLAGS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking DBUS_CFLAGS" >&5 +$as_echo_n "checking DBUS_CFLAGS... " >&6; } DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= 0.70 "` - echo "$as_me:$LINENO: result: $DBUS_CFLAGS" >&5 -echo "${ECHO_T}$DBUS_CFLAGS" >&6 + { $as_echo "$as_me:$LINENO: result: $DBUS_CFLAGS" >&5 +$as_echo "$DBUS_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking DBUS_LIBS" >&5 -echo $ECHO_N "checking DBUS_LIBS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking DBUS_LIBS" >&5 +$as_echo_n "checking DBUS_LIBS... " >&6; } DBUS_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= 0.70 "` - echo "$as_me:$LINENO: result: $DBUS_LIBS" >&5 -echo "${ECHO_T}$DBUS_LIBS" >&6 + { $as_echo "$as_me:$LINENO: result: $DBUS_LIBS" >&5 +$as_echo "$DBUS_LIBS" >&6; } else DBUS_CFLAGS="" DBUS_LIBS="" @@ -23157,37 +25688,37 @@ echo "${ECHO_T}$DBUS_LIBS" >&6 if test $succeeded = yes; then : else - { { echo "$as_me:$LINENO: error: Library requirements (dbus-glib-1 >= 0.70 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -echo "$as_me: error: Library requirements (dbus-glib-1 >= 0.70 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { { $as_echo "$as_me:$LINENO: error: Library requirements (dbus-glib-1 >= 0.70 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +$as_echo "$as_me: error: Library requirements (dbus-glib-1 >= 0.70 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi - echo "$as_me:$LINENO: checking whether to enable GIO support" >&5 -echo $ECHO_N "checking whether to enable GIO support... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking whether to enable GIO support" >&5 +$as_echo_n "checking whether to enable GIO support... " >&6; } if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gio" = "yes"; then if test "$ENABLE_GNOMEVFS" = "TRUE" ; then - { { echo "$as_me:$LINENO: error: please use --enable-gio only together with --disable-gnome-vfs." >&5 -echo "$as_me: error: please use --enable-gio only together with --disable-gnome-vfs." >&2;} + { { $as_echo "$as_me:$LINENO: error: please use --enable-gio only together with --disable-gnome-vfs." >&5 +$as_echo "$as_me: error: please use --enable-gio only together with --disable-gnome-vfs." >&2;} { (exit 1); exit 1; }; } fi ENABLE_GIO="TRUE" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } succeeded=no if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -23200,28 +25731,29 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test "$PKG_CONFIG" = "no" ; then @@ -23232,25 +25764,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for gio-2.0 " >&5 -echo $ECHO_N "checking for gio-2.0 ... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for gio-2.0 " >&5 +$as_echo_n "checking for gio-2.0 ... " >&6; } if $PKG_CONFIG --exists "gio-2.0 " ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } succeeded=yes - echo "$as_me:$LINENO: checking GIO_CFLAGS" >&5 -echo $ECHO_N "checking GIO_CFLAGS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking GIO_CFLAGS" >&5 +$as_echo_n "checking GIO_CFLAGS... " >&6; } GIO_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 "` - echo "$as_me:$LINENO: result: $GIO_CFLAGS" >&5 -echo "${ECHO_T}$GIO_CFLAGS" >&6 + { $as_echo "$as_me:$LINENO: result: $GIO_CFLAGS" >&5 +$as_echo "$GIO_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking GIO_LIBS" >&5 -echo $ECHO_N "checking GIO_LIBS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking GIO_LIBS" >&5 +$as_echo_n "checking GIO_LIBS... " >&6; } GIO_LIBS=`$PKG_CONFIG --libs "gio-2.0 "` - echo "$as_me:$LINENO: result: $GIO_LIBS" >&5 -echo "${ECHO_T}$GIO_LIBS" >&6 + { $as_echo "$as_me:$LINENO: result: $GIO_LIBS" >&5 +$as_echo "$GIO_LIBS" >&6; } else GIO_CFLAGS="" GIO_LIBS="" @@ -23271,14 +25803,14 @@ echo "${ECHO_T}$GIO_LIBS" >&6 if test $succeeded = yes; then : else - { { echo "$as_me:$LINENO: error: Library requirements (gio-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -echo "$as_me: error: Library requirements (gio-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { { $as_echo "$as_me:$LINENO: error: Library requirements (gio-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +$as_echo "$as_me: error: Library requirements (gio-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi fi @@ -23297,18 +25829,18 @@ SYSTEM_CAIRO="" if test "$test_cairo" = "yes"; then - echo "$as_me:$LINENO: checking whether to use cairo" >&5 -echo $ECHO_N "checking whether to use cairo... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking whether to use cairo" >&5 +$as_echo_n "checking whether to use cairo... " >&6; } if test "x$enable_cairo" != "xno" ; then ENABLE_CAIRO="TRUE" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - echo "$as_me:$LINENO: checking which cairo to use" >&5 -echo $ECHO_N "checking which cairo to use... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + { $as_echo "$as_me:$LINENO: checking which cairo to use" >&5 +$as_echo_n "checking which cairo to use... " >&6; } if test -n "$with_system_cairo" -o -n "$with_system_libs" && \ test "$with_system_cairo" != "no"; then - echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6 + { $as_echo "$as_me:$LINENO: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_CAIRO=YES @@ -23317,10 +25849,10 @@ echo "${ECHO_T}external" >&6 if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -23333,28 +25865,29 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test "$PKG_CONFIG" = "no" ; then @@ -23365,25 +25898,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for cairo >= 1.0.2 " >&5 -echo $ECHO_N "checking for cairo >= 1.0.2 ... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for cairo >= 1.0.2 " >&5 +$as_echo_n "checking for cairo >= 1.0.2 ... " >&6; } if $PKG_CONFIG --exists "cairo >= 1.0.2 " ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } succeeded=yes - echo "$as_me:$LINENO: checking CAIRO_CFLAGS" >&5 -echo $ECHO_N "checking CAIRO_CFLAGS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking CAIRO_CFLAGS" >&5 +$as_echo_n "checking CAIRO_CFLAGS... " >&6; } CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= 1.0.2 "` - echo "$as_me:$LINENO: result: $CAIRO_CFLAGS" >&5 -echo "${ECHO_T}$CAIRO_CFLAGS" >&6 + { $as_echo "$as_me:$LINENO: result: $CAIRO_CFLAGS" >&5 +$as_echo "$CAIRO_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking CAIRO_LIBS" >&5 -echo $ECHO_N "checking CAIRO_LIBS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking CAIRO_LIBS" >&5 +$as_echo_n "checking CAIRO_LIBS... " >&6; } CAIRO_LIBS=`$PKG_CONFIG --libs "cairo >= 1.0.2 "` - echo "$as_me:$LINENO: result: $CAIRO_LIBS" >&5 -echo "${ECHO_T}$CAIRO_LIBS" >&6 + { $as_echo "$as_me:$LINENO: result: $CAIRO_LIBS" >&5 +$as_echo "$CAIRO_LIBS" >&6; } else CAIRO_CFLAGS="" CAIRO_LIBS="" @@ -23404,28 +25937,29 @@ echo "${ECHO_T}$CAIRO_LIBS" >&6 if test $succeeded = yes; then : else - { { echo "$as_me:$LINENO: error: Library requirements (cairo >= 1.0.2 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -echo "$as_me: error: Library requirements (cairo >= 1.0.2 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { { $as_echo "$as_me:$LINENO: error: Library requirements (cairo >= 1.0.2 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +$as_echo "$as_me: error: Library requirements (cairo >= 1.0.2 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$ENABLE_FONTCONFIG" != "TRUE" ; then - { { echo "$as_me:$LINENO: error: Cairo library requires fontconfig." >&5 -echo "$as_me: error: Cairo library requires fontconfig." >&2;} + { { $as_echo "$as_me:$LINENO: error: Cairo library requires fontconfig." >&5 +$as_echo "$as_me: error: Cairo library requires fontconfig." >&2;} { (exit 1); exit 1; }; } fi if test "$with_system_xrender_headers" = "yes"; then - echo "$as_me:$LINENO: checking whether Xrender.h defines PictStandardA8" >&5 -echo $ECHO_N "checking whether Xrender.h defines PictStandardA8... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking whether Xrender.h defines PictStandardA8" >&5 +$as_echo_n "checking whether Xrender.h defines PictStandardA8... " >&6; } if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run test program while cross compiling +$as_echo "$as_me: error: cannot run test program while cross compiling See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -23444,42 +25978,56 @@ int main(int argc, char **argv) { _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: no, X headers too old." >&5 -echo "$as_me: error: no, X headers too old." >&2;} +{ { $as_echo "$as_me:$LINENO: error: no, X headers too old." >&5 +$as_echo "$as_me: error: no, X headers too old." >&2;} { (exit 1); exit 1; }; } fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + fi else BUILD_TYPE="$BUILD_TYPE CAIRO" if test "$build_cpu" != "x86_64"; then BUILD_PIXMAN=YES fi - echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6 + { $as_echo "$as_me:$LINENO: result: internal" >&5 +$as_echo "internal" >&6; } fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi fi @@ -23490,27 +26038,26 @@ fi -echo "$as_me:$LINENO: checking whether to build the OpenGL Transitions component" >&5 -echo $ECHO_N "checking whether to build the OpenGL Transitions component... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to build the OpenGL Transitions component" >&5 +$as_echo_n "checking whether to build the OpenGL Transitions component... " >&6; } ENABLE_OPENGL= if test "x$enable_opengl" != "xno" ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } if test "${ac_cv_header_GL_gl_h+set}" = set; then - echo "$as_me:$LINENO: checking for GL/gl.h" >&5 -echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for GL/gl.h" >&5 +$as_echo_n "checking for GL/gl.h... " >&6; } if test "${ac_cv_header_GL_gl_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5 -echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5 +$as_echo "$ac_cv_header_GL_gl_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking GL/gl.h usability" >&5 -echo $ECHO_N "checking GL/gl.h usability... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking GL/gl.h usability" >&5 +$as_echo_n "checking GL/gl.h usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -23520,33 +26067,39 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking GL/gl.h presence" >&5 -echo $ECHO_N "checking GL/gl.h presence... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking GL/gl.h presence" >&5 +$as_echo_n "checking GL/gl.h presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -23554,97 +26107,89 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) - { echo "$as_me:$LINENO: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: GL/gl.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) - { echo "$as_me:$LINENO: WARNING: GL/gl.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: GL/gl.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: GL/gl.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: GL/gl.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: GL/gl.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: GL/gl.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: GL/gl.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: GL/gl.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&2;} + ;; esac -echo "$as_me:$LINENO: checking for GL/gl.h" >&5 -echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for GL/gl.h" >&5 +$as_echo_n "checking for GL/gl.h... " >&6; } if test "${ac_cv_header_GL_gl_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_cv_header_GL_gl_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5 -echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5 +$as_echo "$ac_cv_header_GL_gl_h" >&6; } fi -if test $ac_cv_header_GL_gl_h = yes; then +if test "x$ac_cv_header_GL_gl_h" = x""yes; then : else - { { echo "$as_me:$LINENO: error: OpenGL headers not found" >&5 -echo "$as_me: error: OpenGL headers not found" >&2;} + { { $as_echo "$as_me:$LINENO: error: OpenGL headers not found" >&5 +$as_echo "$as_me: error: OpenGL headers not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:$LINENO: checking for main in -lGL" >&5 -echo $ECHO_N "checking for main in -lGL... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for main in -lGL" >&5 +$as_echo_n "checking for main in -lGL... " >&6; } if test "${ac_cv_lib_GL_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lGL $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -23655,36 +26200,48 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -main (); +return main (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_GL_main=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_GL_main=no + ac_cv_lib_GL_main=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_GL_main" >&5 -echo "${ECHO_T}$ac_cv_lib_GL_main" >&6 -if test $ac_cv_lib_GL_main = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_GL_main" >&5 +$as_echo "$ac_cv_lib_GL_main" >&6; } +if test "x$ac_cv_lib_GL_main" = x""yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBGL 1 _ACEOF @@ -23692,21 +26249,20 @@ _ACEOF LIBS="-lGL $LIBS" else - { { echo "$as_me:$LINENO: error: libGL not installed or functional" >&5 -echo "$as_me: error: libGL not installed or functional" >&2;} + { { $as_echo "$as_me:$LINENO: error: libGL not installed or functional" >&5 +$as_echo "$as_me: error: libGL not installed or functional" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:$LINENO: checking for main in -lGLU" >&5 -echo $ECHO_N "checking for main in -lGLU... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for main in -lGLU" >&5 +$as_echo_n "checking for main in -lGLU... " >&6; } if test "${ac_cv_lib_GLU_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lGLU $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -23717,36 +26273,48 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -main (); +return main (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_GLU_main=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_GLU_main=no + ac_cv_lib_GLU_main=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_GLU_main" >&5 -echo "${ECHO_T}$ac_cv_lib_GLU_main" >&6 -if test $ac_cv_lib_GLU_main = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_GLU_main" >&5 +$as_echo "$ac_cv_lib_GLU_main" >&6; } +if test "x$ac_cv_lib_GLU_main" = x""yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBGLU 1 _ACEOF @@ -23754,58 +26322,58 @@ _ACEOF LIBS="-lGLU $LIBS" else - { { echo "$as_me:$LINENO: error: libGLU not installed or functional" >&5 -echo "$as_me: error: libGLU not installed or functional" >&2;} + { { $as_echo "$as_me:$LINENO: error: libGLU not installed or functional" >&5 +$as_echo "$as_me: error: libGLU not installed or functional" >&2;} { (exit 1); exit 1; }; } fi ENABLE_OPENGL=TRUE else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi -echo "$as_me:$LINENO: checking whether to build the Presentation Minimizer extension" >&5 -echo $ECHO_N "checking whether to build the Presentation Minimizer extension... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to build the Presentation Minimizer extension" >&5 +$as_echo_n "checking whether to build the Presentation Minimizer extension... " >&6; } if test -n "$enable_minimizer" -a "$enable_minimizer" != "no"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } ENABLE_MINIMIZER=YES else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } ENABLE_MINIMIZER=NO fi -echo "$as_me:$LINENO: checking whether to build the Presenter Screen extension" >&5 -echo $ECHO_N "checking whether to build the Presenter Screen extension... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to build the Presenter Screen extension" >&5 +$as_echo_n "checking whether to build the Presenter Screen extension... " >&6; } if test -n "$enable_presenter_console" -a "$enable_presenter_screen" != "no"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } ENABLE_PRESENTER_SCREEN=YES else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } ENABLE_PRESENTER_SCREEN=NO fi -echo "$as_me:$LINENO: checking whether to build the PDF Import extension" >&5 -echo $ECHO_N "checking whether to build the PDF Import extension... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to build the PDF Import extension" >&5 +$as_echo_n "checking whether to build the PDF Import extension... " >&6; } if test -n "$enable_pdfimport" -a "$enable_pdfimport" != "no"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } ENABLE_PDFIMPORT=YES - echo "$as_me:$LINENO: checking which pdf backend to use" >&5 -echo $ECHO_N "checking which pdf backend to use... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking which pdf backend to use" >&5 +$as_echo_n "checking which pdf backend to use... " >&6; } if test -n "$with_system_poppler" -o -n "$with_system_libs" && \ test "$with_system_poppler" != "no"; then - echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6 + { $as_echo "$as_me:$LINENO: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_POPPLER=YES succeeded=no @@ -23813,10 +26381,10 @@ echo "${ECHO_T}external" >&6 if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -23829,28 +26397,29 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test "$PKG_CONFIG" = "no" ; then @@ -23861,25 +26430,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for poppler >= 0.8.0 " >&5 -echo $ECHO_N "checking for poppler >= 0.8.0 ... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for poppler >= 0.8.0 " >&5 +$as_echo_n "checking for poppler >= 0.8.0 ... " >&6; } if $PKG_CONFIG --exists "poppler >= 0.8.0 " ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } succeeded=yes - echo "$as_me:$LINENO: checking POPPLER_CFLAGS" >&5 -echo $ECHO_N "checking POPPLER_CFLAGS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking POPPLER_CFLAGS" >&5 +$as_echo_n "checking POPPLER_CFLAGS... " >&6; } POPPLER_CFLAGS=`$PKG_CONFIG --cflags "poppler >= 0.8.0 "` - echo "$as_me:$LINENO: result: $POPPLER_CFLAGS" >&5 -echo "${ECHO_T}$POPPLER_CFLAGS" >&6 + { $as_echo "$as_me:$LINENO: result: $POPPLER_CFLAGS" >&5 +$as_echo "$POPPLER_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking POPPLER_LIBS" >&5 -echo $ECHO_N "checking POPPLER_LIBS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking POPPLER_LIBS" >&5 +$as_echo_n "checking POPPLER_LIBS... " >&6; } POPPLER_LIBS=`$PKG_CONFIG --libs "poppler >= 0.8.0 "` - echo "$as_me:$LINENO: result: $POPPLER_LIBS" >&5 -echo "${ECHO_T}$POPPLER_LIBS" >&6 + { $as_echo "$as_me:$LINENO: result: $POPPLER_LIBS" >&5 +$as_echo "$POPPLER_LIBS" >&6; } else POPPLER_CFLAGS="" POPPLER_LIBS="" @@ -23900,30 +26469,30 @@ echo "${ECHO_T}$POPPLER_LIBS" >&6 if test $succeeded = yes; then : else - { { echo "$as_me:$LINENO: error: Library requirements (poppler >= 0.8.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -echo "$as_me: error: Library requirements (poppler >= 0.8.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { { $as_echo "$as_me:$LINENO: error: Library requirements (poppler >= 0.8.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +$as_echo "$as_me: error: Library requirements (poppler >= 0.8.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi else - echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6 + { $as_echo "$as_me:$LINENO: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_POPPLER=NO BUILD_TYPE="$BUILD_TYPE XPDF" - echo "$as_me:$LINENO: checking for xpdf module" >&5 -echo $ECHO_N "checking for xpdf module... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for xpdf module" >&5 +$as_echo_n "checking for xpdf module... " >&6; } if test -d ./xpdf; then - echo "$as_me:$LINENO: result: OK" >&5 -echo "${ECHO_T}OK" >&6 + { $as_echo "$as_me:$LINENO: result: OK" >&5 +$as_echo "OK" >&6; } else - { { echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5 -echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;} + { { $as_echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5 +$as_echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;} { (exit 1); exit 1; }; } fi fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } ENABLE_PDFIMPORT=NO fi @@ -23932,62 +26501,62 @@ fi if test "$ENABLE_PRESENTER_SCREEN" = "YES" -o "$ENABLE_MINIMIZER" = "YES" -o "$ENABLE_PDFIMPORT" = "YES"; then - echo "$as_me:$LINENO: checking for sdext module" >&5 -echo $ECHO_N "checking for sdext module... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for sdext module" >&5 +$as_echo_n "checking for sdext module... " >&6; } if test -d ./sdext; then - echo "$as_me:$LINENO: result: OK" >&5 -echo "${ECHO_T}OK" >&6 + { $as_echo "$as_me:$LINENO: result: OK" >&5 +$as_echo "OK" >&6; } else - { { echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5 -echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;} + { { $as_echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5 +$as_echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;} { (exit 1); exit 1; }; } fi BUILD_TYPE="$BUILD_TYPE SDEXT" fi -echo "$as_me:$LINENO: checking whether to build the Wiki Publisher extension" >&5 -echo $ECHO_N "checking whether to build the Wiki Publisher extension... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to build the Wiki Publisher extension" >&5 +$as_echo_n "checking whether to build the Wiki Publisher extension... " >&6; } if test -n "$enable_wiki_publisher" -a "$enable_wiki_publisher" != "no" && test "$WITH_JAVA" != "no"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - echo "$as_me:$LINENO: checking for swext module" >&5 -echo $ECHO_N "checking for swext module... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + { $as_echo "$as_me:$LINENO: checking for swext module" >&5 +$as_echo_n "checking for swext module... " >&6; } if test -d ./swext; then - echo "$as_me:$LINENO: result: OK" >&5 -echo "${ECHO_T}OK" >&6 + { $as_echo "$as_me:$LINENO: result: OK" >&5 +$as_echo "OK" >&6; } else - { { echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5 -echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;} + { { $as_echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5 +$as_echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;} { (exit 1); exit 1; }; } fi ENABLE_MEDIAWIKI=YES BUILD_TYPE="$BUILD_TYPE SWEXT" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } ENABLE_MEDIAWIKI=NO fi if test "$ENABLE_MEDIAWIKI" == "YES"; then - echo "$as_me:$LINENO: checking which Servlet API Jar to use" >&5 -echo $ECHO_N "checking which Servlet API Jar to use... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking which Servlet API Jar to use" >&5 +$as_echo_n "checking which Servlet API Jar to use... " >&6; } if test -n "$with_system_servlet_api"; then - echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6 + { $as_echo "$as_me:$LINENO: result: external" >&5 +$as_echo "external" >&6; } SYSTEM_SERVLETAPI=YES if test -z "$SERVLETAPI_JAR"; then SERVLETAPI_JAR=/usr/share/java/servlet-api.jar fi - as_ac_File=`echo "ac_cv_file_$SERVLETAPI_JAR" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $SERVLETAPI_JAR" >&5 -echo $ECHO_N "checking for $SERVLETAPI_JAR... $ECHO_C" >&6 -if eval "test \"\${$as_ac_File+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_File=`$as_echo "ac_cv_file_$SERVLETAPI_JAR" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $SERVLETAPI_JAR" >&5 +$as_echo_n "checking for $SERVLETAPI_JAR... " >&6; } +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$SERVLETAPI_JAR"; then eval "$as_ac_File=yes" @@ -23995,19 +26564,23 @@ else eval "$as_ac_File=no" fi fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 -if test `eval echo '${'$as_ac_File'}'` = yes; then +ac_res=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then : else - { { echo "$as_me:$LINENO: error: servlet-api.jar not found." >&5 -echo "$as_me: error: servlet-api.jar not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: servlet-api.jar not found." >&5 +$as_echo "$as_me: error: servlet-api.jar not found." >&2;} { (exit 1); exit 1; }; } fi else - echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6 + { $as_echo "$as_me:$LINENO: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_SERVLETAPI=NO BUILD_TYPE="$BUILD_TYPE TOMCAT" fi @@ -24015,40 +26588,40 @@ fi -echo "$as_me:$LINENO: checking whether to build the Report Builder extension" >&5 -echo $ECHO_N "checking whether to build the Report Builder extension... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to build the Report Builder extension" >&5 +$as_echo_n "checking whether to build the Report Builder extension... " >&6; } if test -n "$enable_report_builder" -a "$enable_report_builder" != "no" && test "$WITH_JAVA" != "no"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } ENABLE_REPORTBUILDER=YES - echo "$as_me:$LINENO: checking for reportbuilder module" >&5 -echo $ECHO_N "checking for reportbuilder module... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for reportbuilder module" >&5 +$as_echo_n "checking for reportbuilder module... " >&6; } if test -d ./reportbuilder; then - echo "$as_me:$LINENO: result: OK" >&5 -echo "${ECHO_T}OK" >&6 + { $as_echo "$as_me:$LINENO: result: OK" >&5 +$as_echo "OK" >&6; } else - { { echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5 -echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;} + { { $as_echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5 +$as_echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;} { (exit 1); exit 1; }; } fi - echo "$as_me:$LINENO: checking which jfreereport libs to use" >&5 -echo $ECHO_N "checking which jfreereport libs to use... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking which jfreereport libs to use" >&5 +$as_echo_n "checking which jfreereport libs to use... " >&6; } if test "$with_system_jfreereport" == "yes"; then SYSTEM_JFREEREPORT=YES - echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6 + { $as_echo "$as_me:$LINENO: result: external" >&5 +$as_echo "external" >&6; } if test -z $SAC_JAR; then SAC_JAR=/usr/share/java/sac.jar fi - as_ac_File=`echo "ac_cv_file_$SAC_JAR" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $SAC_JAR" >&5 -echo $ECHO_N "checking for $SAC_JAR... $ECHO_C" >&6 -if eval "test \"\${$as_ac_File+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_File=`$as_echo "ac_cv_file_$SAC_JAR" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $SAC_JAR" >&5 +$as_echo_n "checking for $SAC_JAR... " >&6; } +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$SAC_JAR"; then eval "$as_ac_File=yes" @@ -24056,26 +26629,30 @@ else eval "$as_ac_File=no" fi fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 -if test `eval echo '${'$as_ac_File'}'` = yes; then +ac_res=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then : else - { { echo "$as_me:$LINENO: error: sac.jar not found." >&5 -echo "$as_me: error: sac.jar not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: sac.jar not found." >&5 +$as_echo "$as_me: error: sac.jar not found." >&2;} { (exit 1); exit 1; }; } fi if test -z $LIBXML_JAR; then - echo "$as_me:$LINENO: checking for /usr/share/java/libxml-1.0.0.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/libxml-1.0.0.jar... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libxml-1.0.0.jar" >&5 +$as_echo_n "checking for /usr/share/java/libxml-1.0.0.jar... " >&6; } if test "${ac_cv_file__usr_share_java_libxml_1_0_0_jar+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/libxml-1.0.0.jar"; then ac_cv_file__usr_share_java_libxml_1_0_0_jar=yes @@ -24083,20 +26660,20 @@ else ac_cv_file__usr_share_java_libxml_1_0_0_jar=no fi fi -echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libxml_1_0_0_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_libxml_1_0_0_jar" >&6 -if test $ac_cv_file__usr_share_java_libxml_1_0_0_jar = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libxml_1_0_0_jar" >&5 +$as_echo "$ac_cv_file__usr_share_java_libxml_1_0_0_jar" >&6; } +if test "x$ac_cv_file__usr_share_java_libxml_1_0_0_jar" = x""yes; then LIBXML_JAR=/usr/share/java/libxml-1.0.0.jar else - echo "$as_me:$LINENO: checking for /usr/share/java/libxml.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/libxml.jar... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libxml.jar" >&5 +$as_echo_n "checking for /usr/share/java/libxml.jar... " >&6; } if test "${ac_cv_file__usr_share_java_libxml_jar+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/libxml.jar"; then ac_cv_file__usr_share_java_libxml_jar=yes @@ -24104,13 +26681,13 @@ else ac_cv_file__usr_share_java_libxml_jar=no fi fi -echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libxml_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_libxml_jar" >&6 -if test $ac_cv_file__usr_share_java_libxml_jar = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libxml_jar" >&5 +$as_echo "$ac_cv_file__usr_share_java_libxml_jar" >&6; } +if test "x$ac_cv_file__usr_share_java_libxml_jar" = x""yes; then LIBXML_JAR=/usr/share/java/libxml.jar else - { { echo "$as_me:$LINENO: error: libxml.jar replacement not found." >&5 -echo "$as_me: error: libxml.jar replacement not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: libxml.jar replacement not found." >&5 +$as_echo "$as_me: error: libxml.jar replacement not found." >&2;} { (exit 1); exit 1; }; } fi @@ -24120,15 +26697,15 @@ fi fi else - as_ac_File=`echo "ac_cv_file_$LIBXML_JAR" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $LIBXML_JAR" >&5 -echo $ECHO_N "checking for $LIBXML_JAR... $ECHO_C" >&6 -if eval "test \"\${$as_ac_File+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_File=`$as_echo "ac_cv_file_$LIBXML_JAR" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $LIBXML_JAR" >&5 +$as_echo_n "checking for $LIBXML_JAR... " >&6; } +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$LIBXML_JAR"; then eval "$as_ac_File=yes" @@ -24136,27 +26713,31 @@ else eval "$as_ac_File=no" fi fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 -if test `eval echo '${'$as_ac_File'}'` = yes; then +ac_res=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then : else - { { echo "$as_me:$LINENO: error: libxml.jar not found." >&5 -echo "$as_me: error: libxml.jar not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: libxml.jar not found." >&5 +$as_echo "$as_me: error: libxml.jar not found." >&2;} { (exit 1); exit 1; }; } fi fi if test -z $FLUTE_JAR; then - echo "$as_me:$LINENO: checking for /usr/share/java/flute-1.3.0.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/flute-1.3.0.jar... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for /usr/share/java/flute-1.3.0.jar" >&5 +$as_echo_n "checking for /usr/share/java/flute-1.3.0.jar... " >&6; } if test "${ac_cv_file__usr_share_java_flute_1_3_0_jar+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/flute-1.3.0.jar"; then ac_cv_file__usr_share_java_flute_1_3_0_jar=yes @@ -24164,20 +26745,20 @@ else ac_cv_file__usr_share_java_flute_1_3_0_jar=no fi fi -echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flute_1_3_0_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_flute_1_3_0_jar" >&6 -if test $ac_cv_file__usr_share_java_flute_1_3_0_jar = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flute_1_3_0_jar" >&5 +$as_echo "$ac_cv_file__usr_share_java_flute_1_3_0_jar" >&6; } +if test "x$ac_cv_file__usr_share_java_flute_1_3_0_jar" = x""yes; then FLUTE_JAR=/usr/share/java/flute-1.3.0.jar else - echo "$as_me:$LINENO: checking for /usr/share/java/flute.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/flute.jar... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for /usr/share/java/flute.jar" >&5 +$as_echo_n "checking for /usr/share/java/flute.jar... " >&6; } if test "${ac_cv_file__usr_share_java_flute_jar+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/flute.jar"; then ac_cv_file__usr_share_java_flute_jar=yes @@ -24185,13 +26766,13 @@ else ac_cv_file__usr_share_java_flute_jar=no fi fi -echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flute_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_flute_jar" >&6 -if test $ac_cv_file__usr_share_java_flute_jar = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flute_jar" >&5 +$as_echo "$ac_cv_file__usr_share_java_flute_jar" >&6; } +if test "x$ac_cv_file__usr_share_java_flute_jar" = x""yes; then FLUTE_JAR=/usr/share/java/flute.jar else - { { echo "$as_me:$LINENO: error: flute-1.3.0.jar replacement not found." >&5 -echo "$as_me: error: flute-1.3.0.jar replacement not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: flute-1.3.0.jar replacement not found." >&5 +$as_echo "$as_me: error: flute-1.3.0.jar replacement not found." >&2;} { (exit 1); exit 1; }; } fi @@ -24201,15 +26782,15 @@ fi fi else - as_ac_File=`echo "ac_cv_file_$FLUTE_JAR" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $FLUTE_JAR" >&5 -echo $ECHO_N "checking for $FLUTE_JAR... $ECHO_C" >&6 -if eval "test \"\${$as_ac_File+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_File=`$as_echo "ac_cv_file_$FLUTE_JAR" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $FLUTE_JAR" >&5 +$as_echo_n "checking for $FLUTE_JAR... " >&6; } +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$FLUTE_JAR"; then eval "$as_ac_File=yes" @@ -24217,27 +26798,31 @@ else eval "$as_ac_File=no" fi fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 -if test `eval echo '${'$as_ac_File'}'` = yes; then +ac_res=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then : else - { { echo "$as_me:$LINENO: error: flute-1.3.0.jar not found." >&5 -echo "$as_me: error: flute-1.3.0.jar not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: flute-1.3.0.jar not found." >&5 +$as_echo "$as_me: error: flute-1.3.0.jar not found." >&2;} { (exit 1); exit 1; }; } fi fi if test -z $JFREEREPORT_JAR; then - echo "$as_me:$LINENO: checking for /usr/share/java/flow-engine-0.9.2.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/flow-engine-0.9.2.jar... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for /usr/share/java/flow-engine-0.9.2.jar" >&5 +$as_echo_n "checking for /usr/share/java/flow-engine-0.9.2.jar... " >&6; } if test "${ac_cv_file__usr_share_java_flow_engine_0_9_2_jar+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/flow-engine-0.9.2.jar"; then ac_cv_file__usr_share_java_flow_engine_0_9_2_jar=yes @@ -24245,20 +26830,20 @@ else ac_cv_file__usr_share_java_flow_engine_0_9_2_jar=no fi fi -echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flow_engine_0_9_2_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_flow_engine_0_9_2_jar" >&6 -if test $ac_cv_file__usr_share_java_flow_engine_0_9_2_jar = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flow_engine_0_9_2_jar" >&5 +$as_echo "$ac_cv_file__usr_share_java_flow_engine_0_9_2_jar" >&6; } +if test "x$ac_cv_file__usr_share_java_flow_engine_0_9_2_jar" = x""yes; then JFREEREPORT_JAR=/usr/share/java/flow-engine-0.9.2.jar else - echo "$as_me:$LINENO: checking for /usr/share/java/flow-engine.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/flow-engine.jar... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for /usr/share/java/flow-engine.jar" >&5 +$as_echo_n "checking for /usr/share/java/flow-engine.jar... " >&6; } if test "${ac_cv_file__usr_share_java_flow_engine_jar+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/flow-engine.jar"; then ac_cv_file__usr_share_java_flow_engine_jar=yes @@ -24266,13 +26851,13 @@ else ac_cv_file__usr_share_java_flow_engine_jar=no fi fi -echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flow_engine_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_flow_engine_jar" >&6 -if test $ac_cv_file__usr_share_java_flow_engine_jar = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flow_engine_jar" >&5 +$as_echo "$ac_cv_file__usr_share_java_flow_engine_jar" >&6; } +if test "x$ac_cv_file__usr_share_java_flow_engine_jar" = x""yes; then JFREEREPORT_JAR=/usr/share/java/flow-engine.jar else - { { echo "$as_me:$LINENO: error: jfreereport.jar replacement not found." >&5 -echo "$as_me: error: jfreereport.jar replacement not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: jfreereport.jar replacement not found." >&5 +$as_echo "$as_me: error: jfreereport.jar replacement not found." >&2;} { (exit 1); exit 1; }; } fi @@ -24282,15 +26867,15 @@ fi fi else - as_ac_File=`echo "ac_cv_file_$JFREEREPORT_JAR" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $JFREEREPORT_JAR" >&5 -echo $ECHO_N "checking for $JFREEREPORT_JAR... $ECHO_C" >&6 -if eval "test \"\${$as_ac_File+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_File=`$as_echo "ac_cv_file_$JFREEREPORT_JAR" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $JFREEREPORT_JAR" >&5 +$as_echo_n "checking for $JFREEREPORT_JAR... " >&6; } +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$JFREEREPORT_JAR"; then eval "$as_ac_File=yes" @@ -24298,27 +26883,31 @@ else eval "$as_ac_File=no" fi fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 -if test `eval echo '${'$as_ac_File'}'` = yes; then +ac_res=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then : else - { { echo "$as_me:$LINENO: error: jfreereport.jar not found." >&5 -echo "$as_me: error: jfreereport.jar not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: jfreereport.jar not found." >&5 +$as_echo "$as_me: error: jfreereport.jar not found." >&2;} { (exit 1); exit 1; }; } fi fi if test -z $LIBLAYOUT_JAR; then - echo "$as_me:$LINENO: checking for /usr/share/java/liblayout-0.2.9.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/liblayout-0.2.9.jar... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for /usr/share/java/liblayout-0.2.9.jar" >&5 +$as_echo_n "checking for /usr/share/java/liblayout-0.2.9.jar... " >&6; } if test "${ac_cv_file__usr_share_java_liblayout_0_2_9_jar+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/liblayout-0.2.9.jar"; then ac_cv_file__usr_share_java_liblayout_0_2_9_jar=yes @@ -24326,20 +26915,20 @@ else ac_cv_file__usr_share_java_liblayout_0_2_9_jar=no fi fi -echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_liblayout_0_2_9_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_liblayout_0_2_9_jar" >&6 -if test $ac_cv_file__usr_share_java_liblayout_0_2_9_jar = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_liblayout_0_2_9_jar" >&5 +$as_echo "$ac_cv_file__usr_share_java_liblayout_0_2_9_jar" >&6; } +if test "x$ac_cv_file__usr_share_java_liblayout_0_2_9_jar" = x""yes; then LIBLAYOUT_JAR=/usr/share/java/liblayout-0.2.9.jar else - echo "$as_me:$LINENO: checking for /usr/share/java/liblayout.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/liblayout.jar... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for /usr/share/java/liblayout.jar" >&5 +$as_echo_n "checking for /usr/share/java/liblayout.jar... " >&6; } if test "${ac_cv_file__usr_share_java_liblayout_jar+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/liblayout.jar"; then ac_cv_file__usr_share_java_liblayout_jar=yes @@ -24347,13 +26936,13 @@ else ac_cv_file__usr_share_java_liblayout_jar=no fi fi -echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_liblayout_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_liblayout_jar" >&6 -if test $ac_cv_file__usr_share_java_liblayout_jar = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_liblayout_jar" >&5 +$as_echo "$ac_cv_file__usr_share_java_liblayout_jar" >&6; } +if test "x$ac_cv_file__usr_share_java_liblayout_jar" = x""yes; then LIBLAYOUT_JAR=/usr/share/java/liblayout.jar else - { { echo "$as_me:$LINENO: error: liblayout.jar replacement not found." >&5 -echo "$as_me: error: liblayout.jar replacement not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: liblayout.jar replacement not found." >&5 +$as_echo "$as_me: error: liblayout.jar replacement not found." >&2;} { (exit 1); exit 1; }; } fi @@ -24363,15 +26952,15 @@ fi fi else - as_ac_File=`echo "ac_cv_file_$LIBLAYOUT_JAR" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $LIBLAYOUT_JAR" >&5 -echo $ECHO_N "checking for $LIBLAYOUT_JAR... $ECHO_C" >&6 -if eval "test \"\${$as_ac_File+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_File=`$as_echo "ac_cv_file_$LIBLAYOUT_JAR" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $LIBLAYOUT_JAR" >&5 +$as_echo_n "checking for $LIBLAYOUT_JAR... " >&6; } +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$LIBLAYOUT_JAR"; then eval "$as_ac_File=yes" @@ -24379,27 +26968,31 @@ else eval "$as_ac_File=no" fi fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 -if test `eval echo '${'$as_ac_File'}'` = yes; then +ac_res=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then : else - { { echo "$as_me:$LINENO: error: liblayout.jar not found." >&5 -echo "$as_me: error: liblayout.jar not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: liblayout.jar not found." >&5 +$as_echo "$as_me: error: liblayout.jar not found." >&2;} { (exit 1); exit 1; }; } fi fi if test -z $LIBLOADER_JAR; then - echo "$as_me:$LINENO: checking for /usr/share/java/libloader-1.0.0.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/libloader-1.0.0.jar... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libloader-1.0.0.jar" >&5 +$as_echo_n "checking for /usr/share/java/libloader-1.0.0.jar... " >&6; } if test "${ac_cv_file__usr_share_java_libloader_1_0_0_jar+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/libloader-1.0.0.jar"; then ac_cv_file__usr_share_java_libloader_1_0_0_jar=yes @@ -24407,20 +27000,20 @@ else ac_cv_file__usr_share_java_libloader_1_0_0_jar=no fi fi -echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libloader_1_0_0_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_libloader_1_0_0_jar" >&6 -if test $ac_cv_file__usr_share_java_libloader_1_0_0_jar = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libloader_1_0_0_jar" >&5 +$as_echo "$ac_cv_file__usr_share_java_libloader_1_0_0_jar" >&6; } +if test "x$ac_cv_file__usr_share_java_libloader_1_0_0_jar" = x""yes; then LIBLOADER_JAR=/usr/share/java/libloader-1.0.0.jar else - echo "$as_me:$LINENO: checking for /usr/share/java/libloader.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/libloader.jar... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libloader.jar" >&5 +$as_echo_n "checking for /usr/share/java/libloader.jar... " >&6; } if test "${ac_cv_file__usr_share_java_libloader_jar+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/libloader.jar"; then ac_cv_file__usr_share_java_libloader_jar=yes @@ -24428,13 +27021,13 @@ else ac_cv_file__usr_share_java_libloader_jar=no fi fi -echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libloader_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_libloader_jar" >&6 -if test $ac_cv_file__usr_share_java_libloader_jar = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libloader_jar" >&5 +$as_echo "$ac_cv_file__usr_share_java_libloader_jar" >&6; } +if test "x$ac_cv_file__usr_share_java_libloader_jar" = x""yes; then LIBLOADER_JAR=/usr/share/java/libloader.jar else - { { echo "$as_me:$LINENO: error: libloader.jar replacement not found." >&5 -echo "$as_me: error: libloader.jar replacement not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: libloader.jar replacement not found." >&5 +$as_echo "$as_me: error: libloader.jar replacement not found." >&2;} { (exit 1); exit 1; }; } fi @@ -24444,15 +27037,15 @@ fi fi else - as_ac_File=`echo "ac_cv_file_$LIBLOADER_JAR" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $LIBLOADER_JAR" >&5 -echo $ECHO_N "checking for $LIBLOADER_JAR... $ECHO_C" >&6 -if eval "test \"\${$as_ac_File+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_File=`$as_echo "ac_cv_file_$LIBLOADER_JAR" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $LIBLOADER_JAR" >&5 +$as_echo_n "checking for $LIBLOADER_JAR... " >&6; } +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$LIBLOADER_JAR"; then eval "$as_ac_File=yes" @@ -24460,27 +27053,31 @@ else eval "$as_ac_File=no" fi fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 -if test `eval echo '${'$as_ac_File'}'` = yes; then +ac_res=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then : else - { { echo "$as_me:$LINENO: error: libloader.jar not found." >&5 -echo "$as_me: error: libloader.jar not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: libloader.jar not found." >&5 +$as_echo "$as_me: error: libloader.jar not found." >&2;} { (exit 1); exit 1; }; } fi fi if test -z $LIBFORMULA_JAR; then - echo "$as_me:$LINENO: checking for /usr/share/java/libformula-0.2.0.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/libformula-0.2.0.jar... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libformula-0.2.0.jar" >&5 +$as_echo_n "checking for /usr/share/java/libformula-0.2.0.jar... " >&6; } if test "${ac_cv_file__usr_share_java_libformula_0_2_0_jar+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/libformula-0.2.0.jar"; then ac_cv_file__usr_share_java_libformula_0_2_0_jar=yes @@ -24488,20 +27085,20 @@ else ac_cv_file__usr_share_java_libformula_0_2_0_jar=no fi fi -echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libformula_0_2_0_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_libformula_0_2_0_jar" >&6 -if test $ac_cv_file__usr_share_java_libformula_0_2_0_jar = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libformula_0_2_0_jar" >&5 +$as_echo "$ac_cv_file__usr_share_java_libformula_0_2_0_jar" >&6; } +if test "x$ac_cv_file__usr_share_java_libformula_0_2_0_jar" = x""yes; then LIBFORMULA_JAR=/usr/share/java/libformula-0.2.0.jar else - echo "$as_me:$LINENO: checking for /usr/share/java/libformula.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/libformula.jar... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libformula.jar" >&5 +$as_echo_n "checking for /usr/share/java/libformula.jar... " >&6; } if test "${ac_cv_file__usr_share_java_libformula_jar+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/libformula.jar"; then ac_cv_file__usr_share_java_libformula_jar=yes @@ -24509,13 +27106,13 @@ else ac_cv_file__usr_share_java_libformula_jar=no fi fi -echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libformula_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_libformula_jar" >&6 -if test $ac_cv_file__usr_share_java_libformula_jar = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libformula_jar" >&5 +$as_echo "$ac_cv_file__usr_share_java_libformula_jar" >&6; } +if test "x$ac_cv_file__usr_share_java_libformula_jar" = x""yes; then LIBFORMULA_JAR=/usr/share/java/libformula.jar else - { { echo "$as_me:$LINENO: error: libformula.jar replacement not found." >&5 -echo "$as_me: error: libformula.jar replacement not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: libformula.jar replacement not found." >&5 +$as_echo "$as_me: error: libformula.jar replacement not found." >&2;} { (exit 1); exit 1; }; } fi @@ -24525,15 +27122,15 @@ fi fi else - as_ac_File=`echo "ac_cv_file_$LIBFORMULA_JAR" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $LIBFORMULA_JAR" >&5 -echo $ECHO_N "checking for $LIBFORMULA_JAR... $ECHO_C" >&6 -if eval "test \"\${$as_ac_File+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_File=`$as_echo "ac_cv_file_$LIBFORMULA_JAR" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $LIBFORMULA_JAR" >&5 +$as_echo_n "checking for $LIBFORMULA_JAR... " >&6; } +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$LIBFORMULA_JAR"; then eval "$as_ac_File=yes" @@ -24541,27 +27138,31 @@ else eval "$as_ac_File=no" fi fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 -if test `eval echo '${'$as_ac_File'}'` = yes; then +ac_res=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then : else - { { echo "$as_me:$LINENO: error: libformula.jar not found." >&5 -echo "$as_me: error: libformula.jar not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: libformula.jar not found." >&5 +$as_echo "$as_me: error: libformula.jar not found." >&2;} { (exit 1); exit 1; }; } fi fi if test -z $LIBREPOSITORY_JAR; then - echo "$as_me:$LINENO: checking for /usr/share/java/librepository-1.0.0.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/librepository-1.0.0.jar... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for /usr/share/java/librepository-1.0.0.jar" >&5 +$as_echo_n "checking for /usr/share/java/librepository-1.0.0.jar... " >&6; } if test "${ac_cv_file__usr_share_java_librepository_1_0_0_jar+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/librepository-1.0.0.jar"; then ac_cv_file__usr_share_java_librepository_1_0_0_jar=yes @@ -24569,20 +27170,20 @@ else ac_cv_file__usr_share_java_librepository_1_0_0_jar=no fi fi -echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_librepository_1_0_0_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_librepository_1_0_0_jar" >&6 -if test $ac_cv_file__usr_share_java_librepository_1_0_0_jar = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_librepository_1_0_0_jar" >&5 +$as_echo "$ac_cv_file__usr_share_java_librepository_1_0_0_jar" >&6; } +if test "x$ac_cv_file__usr_share_java_librepository_1_0_0_jar" = x""yes; then LIBREPOSITORY_JAR=/usr/share/java/librepository-1.0.0.jar else - echo "$as_me:$LINENO: checking for /usr/share/java/librepository.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/librepository.jar... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for /usr/share/java/librepository.jar" >&5 +$as_echo_n "checking for /usr/share/java/librepository.jar... " >&6; } if test "${ac_cv_file__usr_share_java_librepository_jar+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/librepository.jar"; then ac_cv_file__usr_share_java_librepository_jar=yes @@ -24590,13 +27191,13 @@ else ac_cv_file__usr_share_java_librepository_jar=no fi fi -echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_librepository_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_librepository_jar" >&6 -if test $ac_cv_file__usr_share_java_librepository_jar = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_librepository_jar" >&5 +$as_echo "$ac_cv_file__usr_share_java_librepository_jar" >&6; } +if test "x$ac_cv_file__usr_share_java_librepository_jar" = x""yes; then LIBREPOSITORY_JAR=/usr/share/java/librepository.jar else - { { echo "$as_me:$LINENO: error: librepository.jar replacement not found." >&5 -echo "$as_me: error: librepository.jar replacement not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: librepository.jar replacement not found." >&5 +$as_echo "$as_me: error: librepository.jar replacement not found." >&2;} { (exit 1); exit 1; }; } fi @@ -24606,15 +27207,15 @@ fi fi else - as_ac_File=`echo "ac_cv_file_$LIBREPOSITORY_JAR" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $LIBREPOSITORY_JAR" >&5 -echo $ECHO_N "checking for $LIBREPOSITORY_JAR... $ECHO_C" >&6 -if eval "test \"\${$as_ac_File+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_File=`$as_echo "ac_cv_file_$LIBREPOSITORY_JAR" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $LIBREPOSITORY_JAR" >&5 +$as_echo_n "checking for $LIBREPOSITORY_JAR... " >&6; } +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$LIBREPOSITORY_JAR"; then eval "$as_ac_File=yes" @@ -24622,27 +27223,31 @@ else eval "$as_ac_File=no" fi fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 -if test `eval echo '${'$as_ac_File'}'` = yes; then +ac_res=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then : else - { { echo "$as_me:$LINENO: error: librepository.jar not found." >&5 -echo "$as_me: error: librepository.jar not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: librepository.jar not found." >&5 +$as_echo "$as_me: error: librepository.jar not found." >&2;} { (exit 1); exit 1; }; } fi fi if test -z $LIBFONTS_JAR; then - echo "$as_me:$LINENO: checking for /usr/share/java/libfonts-1.0.0.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/libfonts-1.0.0.jar... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libfonts-1.0.0.jar" >&5 +$as_echo_n "checking for /usr/share/java/libfonts-1.0.0.jar... " >&6; } if test "${ac_cv_file__usr_share_java_libfonts_1_0_0_jar+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/libfonts-1.0.0.jar"; then ac_cv_file__usr_share_java_libfonts_1_0_0_jar=yes @@ -24650,20 +27255,20 @@ else ac_cv_file__usr_share_java_libfonts_1_0_0_jar=no fi fi -echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libfonts_1_0_0_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_libfonts_1_0_0_jar" >&6 -if test $ac_cv_file__usr_share_java_libfonts_1_0_0_jar = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libfonts_1_0_0_jar" >&5 +$as_echo "$ac_cv_file__usr_share_java_libfonts_1_0_0_jar" >&6; } +if test "x$ac_cv_file__usr_share_java_libfonts_1_0_0_jar" = x""yes; then LIBFONTS_JAR=/usr/share/java/libfonts-1.0.0.jar else - echo "$as_me:$LINENO: checking for /usr/share/java/libfonts.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/libfonts.jar... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libfonts.jar" >&5 +$as_echo_n "checking for /usr/share/java/libfonts.jar... " >&6; } if test "${ac_cv_file__usr_share_java_libfonts_jar+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/libfonts.jar"; then ac_cv_file__usr_share_java_libfonts_jar=yes @@ -24671,13 +27276,13 @@ else ac_cv_file__usr_share_java_libfonts_jar=no fi fi -echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libfonts_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_libfonts_jar" >&6 -if test $ac_cv_file__usr_share_java_libfonts_jar = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libfonts_jar" >&5 +$as_echo "$ac_cv_file__usr_share_java_libfonts_jar" >&6; } +if test "x$ac_cv_file__usr_share_java_libfonts_jar" = x""yes; then LIBFONTS_JAR=/usr/share/java/libfonts.jar else - { { echo "$as_me:$LINENO: error: libfonts.jar replacement not found." >&5 -echo "$as_me: error: libfonts.jar replacement not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: libfonts.jar replacement not found." >&5 +$as_echo "$as_me: error: libfonts.jar replacement not found." >&2;} { (exit 1); exit 1; }; } fi @@ -24687,15 +27292,15 @@ fi fi else - as_ac_File=`echo "ac_cv_file_$LIBFONTS_JAR" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $LIBFONTS_JAR" >&5 -echo $ECHO_N "checking for $LIBFONTS_JAR... $ECHO_C" >&6 -if eval "test \"\${$as_ac_File+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_File=`$as_echo "ac_cv_file_$LIBFONTS_JAR" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $LIBFONTS_JAR" >&5 +$as_echo_n "checking for $LIBFONTS_JAR... " >&6; } +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$LIBFONTS_JAR"; then eval "$as_ac_File=yes" @@ -24703,27 +27308,31 @@ else eval "$as_ac_File=no" fi fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 -if test `eval echo '${'$as_ac_File'}'` = yes; then +ac_res=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then : else - { { echo "$as_me:$LINENO: error: libfonts.jar not found." >&5 -echo "$as_me: error: libfonts.jar not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: libfonts.jar not found." >&5 +$as_echo "$as_me: error: libfonts.jar not found." >&2;} { (exit 1); exit 1; }; } fi fi if test -z $LIBSERIALIZER_JAR; then - echo "$as_me:$LINENO: checking for /usr/share/java/libserializer-1.0.0.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/libserializer-1.0.0.jar... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libserializer-1.0.0.jar" >&5 +$as_echo_n "checking for /usr/share/java/libserializer-1.0.0.jar... " >&6; } if test "${ac_cv_file__usr_share_java_libserializer_1_0_0_jar+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/libserializer-1.0.0.jar"; then ac_cv_file__usr_share_java_libserializer_1_0_0_jar=yes @@ -24731,20 +27340,20 @@ else ac_cv_file__usr_share_java_libserializer_1_0_0_jar=no fi fi -echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libserializer_1_0_0_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_libserializer_1_0_0_jar" >&6 -if test $ac_cv_file__usr_share_java_libserializer_1_0_0_jar = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libserializer_1_0_0_jar" >&5 +$as_echo "$ac_cv_file__usr_share_java_libserializer_1_0_0_jar" >&6; } +if test "x$ac_cv_file__usr_share_java_libserializer_1_0_0_jar" = x""yes; then LIBSERIALIZER_JAR=/usr/share/java/libserializer-1.0.0.jar else - echo "$as_me:$LINENO: checking for /usr/share/java/libserializer.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/libserializer.jar... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libserializer.jar" >&5 +$as_echo_n "checking for /usr/share/java/libserializer.jar... " >&6; } if test "${ac_cv_file__usr_share_java_libserializer_jar+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/libserializer.jar"; then ac_cv_file__usr_share_java_libserializer_jar=yes @@ -24752,13 +27361,13 @@ else ac_cv_file__usr_share_java_libserializer_jar=no fi fi -echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libserializer_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_libserializer_jar" >&6 -if test $ac_cv_file__usr_share_java_libserializer_jar = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libserializer_jar" >&5 +$as_echo "$ac_cv_file__usr_share_java_libserializer_jar" >&6; } +if test "x$ac_cv_file__usr_share_java_libserializer_jar" = x""yes; then LIBSERIALIZER_JAR=/usr/share/java/libserializer.jar else - { { echo "$as_me:$LINENO: error: libserializer.jar replacement not found." >&5 -echo "$as_me: error: libserializer.jar replacement not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: libserializer.jar replacement not found." >&5 +$as_echo "$as_me: error: libserializer.jar replacement not found." >&2;} { (exit 1); exit 1; }; } fi @@ -24768,15 +27377,15 @@ fi fi else - as_ac_File=`echo "ac_cv_file_$LIBSERIALIZER_JAR" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $LIBSERIALIZER_JAR" >&5 -echo $ECHO_N "checking for $LIBSERIALIZER_JAR... $ECHO_C" >&6 -if eval "test \"\${$as_ac_File+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_File=`$as_echo "ac_cv_file_$LIBSERIALIZER_JAR" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $LIBSERIALIZER_JAR" >&5 +$as_echo_n "checking for $LIBSERIALIZER_JAR... " >&6; } +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$LIBSERIALIZER_JAR"; then eval "$as_ac_File=yes" @@ -24784,13 +27393,17 @@ else eval "$as_ac_File=no" fi fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 -if test `eval echo '${'$as_ac_File'}'` = yes; then +ac_res=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then : else - { { echo "$as_me:$LINENO: error: libserializer.jar not found." >&5 -echo "$as_me: error: libserializer.jar not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: libserializer.jar not found." >&5 +$as_echo "$as_me: error: libserializer.jar not found." >&2;} { (exit 1); exit 1; }; } fi @@ -24798,14 +27411,14 @@ fi if test -z $LIBBASE_JAR; then - echo "$as_me:$LINENO: checking for /usr/share/java/libbase-1.0.0.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/libbase-1.0.0.jar... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libbase-1.0.0.jar" >&5 +$as_echo_n "checking for /usr/share/java/libbase-1.0.0.jar... " >&6; } if test "${ac_cv_file__usr_share_java_libbase_1_0_0_jar+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/libbase-1.0.0.jar"; then ac_cv_file__usr_share_java_libbase_1_0_0_jar=yes @@ -24813,20 +27426,20 @@ else ac_cv_file__usr_share_java_libbase_1_0_0_jar=no fi fi -echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libbase_1_0_0_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_libbase_1_0_0_jar" >&6 -if test $ac_cv_file__usr_share_java_libbase_1_0_0_jar = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libbase_1_0_0_jar" >&5 +$as_echo "$ac_cv_file__usr_share_java_libbase_1_0_0_jar" >&6; } +if test "x$ac_cv_file__usr_share_java_libbase_1_0_0_jar" = x""yes; then LIBBASE_JAR=/usr/share/java/libbase-1.0.0.jar else - echo "$as_me:$LINENO: checking for /usr/share/java/libbase.jar" >&5 -echo $ECHO_N "checking for /usr/share/java/libbase.jar... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for /usr/share/java/libbase.jar" >&5 +$as_echo_n "checking for /usr/share/java/libbase.jar... " >&6; } if test "${ac_cv_file__usr_share_java_libbase_jar+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "/usr/share/java/libbase.jar"; then ac_cv_file__usr_share_java_libbase_jar=yes @@ -24834,13 +27447,13 @@ else ac_cv_file__usr_share_java_libbase_jar=no fi fi -echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libbase_jar" >&5 -echo "${ECHO_T}$ac_cv_file__usr_share_java_libbase_jar" >&6 -if test $ac_cv_file__usr_share_java_libbase_jar = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libbase_jar" >&5 +$as_echo "$ac_cv_file__usr_share_java_libbase_jar" >&6; } +if test "x$ac_cv_file__usr_share_java_libbase_jar" = x""yes; then LIBBASE_JAR=/usr/share/java/libbase.jar else - { { echo "$as_me:$LINENO: error: libbase.jar replacement not found." >&5 -echo "$as_me: error: libbase.jar replacement not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: libbase.jar replacement not found." >&5 +$as_echo "$as_me: error: libbase.jar replacement not found." >&2;} { (exit 1); exit 1; }; } fi @@ -24850,15 +27463,15 @@ fi fi else - as_ac_File=`echo "ac_cv_file_$LIBBASE_JAR" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $LIBBASE_JAR" >&5 -echo $ECHO_N "checking for $LIBBASE_JAR... $ECHO_C" >&6 -if eval "test \"\${$as_ac_File+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_File=`$as_echo "ac_cv_file_$LIBBASE_JAR" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $LIBBASE_JAR" >&5 +$as_echo_n "checking for $LIBBASE_JAR... " >&6; } +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$LIBBASE_JAR"; then eval "$as_ac_File=yes" @@ -24866,29 +27479,33 @@ else eval "$as_ac_File=no" fi fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 -if test `eval echo '${'$as_ac_File'}'` = yes; then +ac_res=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then : else - { { echo "$as_me:$LINENO: error: libbase.jar not found." >&5 -echo "$as_me: error: libbase.jar not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: libbase.jar not found." >&5 +$as_echo "$as_me: error: libbase.jar not found." >&2;} { (exit 1); exit 1; }; } fi fi else - echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6 - echo "$as_me:$LINENO: checking for jfreereport module" >&5 -echo $ECHO_N "checking for jfreereport module... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: result: internal" >&5 +$as_echo "internal" >&6; } + { $as_echo "$as_me:$LINENO: checking for jfreereport module" >&5 +$as_echo_n "checking for jfreereport module... " >&6; } if test -d ./jfreereport; then - echo "$as_me:$LINENO: result: OK" >&5 -echo "${ECHO_T}OK" >&6 + { $as_echo "$as_me:$LINENO: result: OK" >&5 +$as_echo "OK" >&6; } else - { { echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5 -echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;} + { { $as_echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5 +$as_echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;} { (exit 1); exit 1; }; } fi SYSTEM_JFREEREPORT=NO @@ -24896,8 +27513,8 @@ echo "$as_me: error: not existing. get it (did you get the -extensions tarball?) fi BUILD_TYPE="$BUILD_TYPE REPORTBUILDER" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } ENABLE_REPORTBUILDER=NO SYSTEM_JFREEREPORT=NO fi @@ -24918,25 +27535,25 @@ fi # this has to be here because both the wiki publisher and the SRB use # commons-logging if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then - echo "$as_me:$LINENO: checking which Apache commons-* libs to use" >&5 -echo $ECHO_N "checking which Apache commons-* libs to use... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking which Apache commons-* libs to use" >&5 +$as_echo_n "checking which Apache commons-* libs to use... " >&6; } if test "$with_system_apache_commons" = "yes"; then SYSTEM_APACHE_COMMONS=YES - echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6 + { $as_echo "$as_me:$LINENO: result: external" >&5 +$as_echo "external" >&6; } if test "$ENABLE_MEDIAWIKI" = "YES"; then if test -z "$COMMONS_CODEC_JAR"; then COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar fi - as_ac_File=`echo "ac_cv_file_$COMMONS_CODEC_JAR" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $COMMONS_CODEC_JAR" >&5 -echo $ECHO_N "checking for $COMMONS_CODEC_JAR... $ECHO_C" >&6 -if eval "test \"\${$as_ac_File+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_File=`$as_echo "ac_cv_file_$COMMONS_CODEC_JAR" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $COMMONS_CODEC_JAR" >&5 +$as_echo_n "checking for $COMMONS_CODEC_JAR... " >&6; } +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$COMMONS_CODEC_JAR"; then eval "$as_ac_File=yes" @@ -24944,28 +27561,32 @@ else eval "$as_ac_File=no" fi fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 -if test `eval echo '${'$as_ac_File'}'` = yes; then +ac_res=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then : else - { { echo "$as_me:$LINENO: error: commons-codec.jar not found." >&5 -echo "$as_me: error: commons-codec.jar not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: commons-codec.jar not found." >&5 +$as_echo "$as_me: error: commons-codec.jar not found." >&2;} { (exit 1); exit 1; }; } fi if test -z "$COMMONS_LANG_JAR"; then COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.3.jar fi - as_ac_File=`echo "ac_cv_file_$COMMONS_LANG_JAR" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $COMMONS_LANG_JAR" >&5 -echo $ECHO_N "checking for $COMMONS_LANG_JAR... $ECHO_C" >&6 -if eval "test \"\${$as_ac_File+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_File=`$as_echo "ac_cv_file_$COMMONS_LANG_JAR" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $COMMONS_LANG_JAR" >&5 +$as_echo_n "checking for $COMMONS_LANG_JAR... " >&6; } +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$COMMONS_LANG_JAR"; then eval "$as_ac_File=yes" @@ -24973,28 +27594,32 @@ else eval "$as_ac_File=no" fi fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 -if test `eval echo '${'$as_ac_File'}'` = yes; then +ac_res=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then : else - { { echo "$as_me:$LINENO: error: commons-lang.jar not found." >&5 -echo "$as_me: error: commons-lang.jar not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: commons-lang.jar not found." >&5 +$as_echo "$as_me: error: commons-lang.jar not found." >&2;} { (exit 1); exit 1; }; } fi if test -z "$COMMONS_HTTPCLIENT_JAR"; then COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient-3.1.jar fi - as_ac_File=`echo "ac_cv_file_$COMMONS_HTTPCLIENT_JAR" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $COMMONS_HTTPCLIENT_JAR" >&5 -echo $ECHO_N "checking for $COMMONS_HTTPCLIENT_JAR... $ECHO_C" >&6 -if eval "test \"\${$as_ac_File+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_File=`$as_echo "ac_cv_file_$COMMONS_HTTPCLIENT_JAR" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $COMMONS_HTTPCLIENT_JAR" >&5 +$as_echo_n "checking for $COMMONS_HTTPCLIENT_JAR... " >&6; } +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$COMMONS_HTTPCLIENT_JAR"; then eval "$as_ac_File=yes" @@ -25002,13 +27627,17 @@ else eval "$as_ac_File=no" fi fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 -if test `eval echo '${'$as_ac_File'}'` = yes; then +ac_res=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then : else - { { echo "$as_me:$LINENO: error: commons-httpclient.jar not found." >&5 -echo "$as_me: error: commons-httpclient.jar not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: commons-httpclient.jar not found." >&5 +$as_echo "$as_me: error: commons-httpclient.jar not found." >&2;} { (exit 1); exit 1; }; } fi @@ -25017,15 +27646,15 @@ fi if test -z "$COMMONS_LOGGING_JAR"; then COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar fi - as_ac_File=`echo "ac_cv_file_$COMMONS_LOGGING_JAR" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $COMMONS_LOGGING_JAR" >&5 -echo $ECHO_N "checking for $COMMONS_LOGGING_JAR... $ECHO_C" >&6 -if eval "test \"\${$as_ac_File+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_ac_File=`$as_echo "ac_cv_file_$COMMONS_LOGGING_JAR" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $COMMONS_LOGGING_JAR" >&5 +$as_echo_n "checking for $COMMONS_LOGGING_JAR... " >&6; } +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r "$COMMONS_LOGGING_JAR"; then eval "$as_ac_File=yes" @@ -25033,21 +27662,25 @@ else eval "$as_ac_File=no" fi fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 -if test `eval echo '${'$as_ac_File'}'` = yes; then +ac_res=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_File'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then : else - { { echo "$as_me:$LINENO: error: commons-logging.jar not found." >&5 -echo "$as_me: error: commons-logging.jar not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: commons-logging.jar not found." >&5 +$as_echo "$as_me: error: commons-logging.jar not found." >&2;} { (exit 1); exit 1; }; } fi fi else - echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6 + { $as_echo "$as_me:$LINENO: result: internal" >&5 +$as_echo "internal" >&6; } SYSTEM_APACHE_COMMONS=NO BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT" fi @@ -25099,8 +27732,8 @@ if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE" ; then kde_test_include="ksharedptr.h" kde_test_library="libkdeui.so" - echo "$as_me:$LINENO: checking for Qt headers" >&5 -echo $ECHO_N "checking for Qt headers... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for Qt headers" >&5 +$as_echo_n "checking for Qt headers... " >&6; } qt_incdir="no" for kde_check in $qt_incdirs ; do if test -r "$kde_check/$qt_test_include" ; then @@ -25108,18 +27741,18 @@ echo $ECHO_N "checking for Qt headers... $ECHO_C" >&6 break fi done - echo "$as_me:$LINENO: result: $qt_incdir" >&5 -echo "${ECHO_T}$qt_incdir" >&6 + { $as_echo "$as_me:$LINENO: result: $qt_incdir" >&5 +$as_echo "$qt_incdir" >&6; } if test "x$qt_incdir" = "xno" ; then - { { echo "$as_me:$LINENO: error: Qt headers not found. Please specify the root of + { { $as_echo "$as_me:$LINENO: error: Qt headers not found. Please specify the root of your Qt installation by exporting QTDIR before running \"configure\"." >&5 -echo "$as_me: error: Qt headers not found. Please specify the root of +$as_echo "$as_me: error: Qt headers not found. Please specify the root of your Qt installation by exporting QTDIR before running \"configure\"." >&2;} { (exit 1); exit 1; }; } fi - echo "$as_me:$LINENO: checking for Qt libraries" >&5 -echo $ECHO_N "checking for Qt libraries... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for Qt libraries" >&5 +$as_echo_n "checking for Qt libraries... " >&6; } qt_libdir="no" for qt_check in $qt_libdirs ; do if test -r "$qt_check/$qt_test_library" ; then @@ -25127,22 +27760,22 @@ echo $ECHO_N "checking for Qt libraries... $ECHO_C" >&6 break fi done - echo "$as_me:$LINENO: result: $qt_libdir" >&5 -echo "${ECHO_T}$qt_libdir" >&6 + { $as_echo "$as_me:$LINENO: result: $qt_libdir" >&5 +$as_echo "$qt_libdir" >&6; } if test "x$qt_libdir" = "xno" ; then - { { echo "$as_me:$LINENO: error: Qt libraries not found. Please specify the root of + { { $as_echo "$as_me:$LINENO: error: Qt libraries not found. Please specify the root of your Qt installation by exporting QTDIR before running \"configure\"." >&5 -echo "$as_me: error: Qt libraries not found. Please specify the root of +$as_echo "$as_me: error: Qt libraries not found. Please specify the root of your Qt installation by exporting QTDIR before running \"configure\"." >&2;} { (exit 1); exit 1; }; } fi # Extract the first word of "moc", so it can be a program name with args. set dummy moc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_MOC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $MOC in [\\/]* | ?:[\\/]*) @@ -25156,38 +27789,39 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_MOC="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_MOC" && ac_cv_path_MOC="no" ;; esac fi MOC=$ac_cv_path_MOC - if test -n "$MOC"; then - echo "$as_me:$LINENO: result: $MOC" >&5 -echo "${ECHO_T}$MOC" >&6 + { $as_echo "$as_me:$LINENO: result: $MOC" >&5 +$as_echo "$MOC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + if test "$MOC" = "no" ; then - { { echo "$as_me:$LINENO: error: Qt Meta Object Compiler not found. Please specify + { { $as_echo "$as_me:$LINENO: error: Qt Meta Object Compiler not found. Please specify the root of your Qt installation by exporting QTDIR before running \"configure\"." >&5 -echo "$as_me: error: Qt Meta Object Compiler not found. Please specify +$as_echo "$as_me: error: Qt Meta Object Compiler not found. Please specify the root of your Qt installation by exporting QTDIR before running \"configure\"." >&2;} { (exit 1); exit 1; }; } fi - echo "$as_me:$LINENO: checking for KDE headers" >&5 -echo $ECHO_N "checking for KDE headers... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for KDE headers" >&5 +$as_echo_n "checking for KDE headers... " >&6; } kde_incdir="no" for kde_check in $kde_incdirs ; do if test -r "$kde_check/$kde_test_include" ; then @@ -25195,18 +27829,18 @@ echo $ECHO_N "checking for KDE headers... $ECHO_C" >&6 break fi done - echo "$as_me:$LINENO: result: $kde_incdir" >&5 -echo "${ECHO_T}$kde_incdir" >&6 + { $as_echo "$as_me:$LINENO: result: $kde_incdir" >&5 +$as_echo "$kde_incdir" >&6; } if test "x$kde_incdir" = "xno" ; then - { { echo "$as_me:$LINENO: error: KDE headers not found. Please specify the root of + { { $as_echo "$as_me:$LINENO: error: KDE headers not found. Please specify the root of your KDE installation by exporting KDEDIR before running \"configure\"." >&5 -echo "$as_me: error: KDE headers not found. Please specify the root of +$as_echo "$as_me: error: KDE headers not found. Please specify the root of your KDE installation by exporting KDEDIR before running \"configure\"." >&2;} { (exit 1); exit 1; }; } fi - echo "$as_me:$LINENO: checking for KDE libraries" >&5 -echo $ECHO_N "checking for KDE libraries... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for KDE libraries" >&5 +$as_echo_n "checking for KDE libraries... " >&6; } kde_libdir="no" for kde_check in $kde_libdirs ; do if test -r "$kde_check/$kde_test_library" ; then @@ -25214,12 +27848,12 @@ echo $ECHO_N "checking for KDE libraries... $ECHO_C" >&6 break fi done - echo "$as_me:$LINENO: result: $kde_libdir" >&5 -echo "${ECHO_T}$kde_libdir" >&6 + { $as_echo "$as_me:$LINENO: result: $kde_libdir" >&5 +$as_echo "$kde_libdir" >&6; } if test "x$kde_libdir" = "xno" ; then - { { echo "$as_me:$LINENO: error: KDE libraries not found. Please specify the root of + { { $as_echo "$as_me:$LINENO: error: KDE libraries not found. Please specify the root of your KDE installation by exporting KDEDIR before running \"configure\"." >&5 -echo "$as_me: error: KDE libraries not found. Please specify the root of +$as_echo "$as_me: error: KDE libraries not found. Please specify the root of your KDE installation by exporting KDEDIR before running \"configure\"." >&2;} { (exit 1); exit 1; }; } fi @@ -25252,8 +27886,8 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then kde_test_include="ksharedptr.h" kde_test_library="libkdeui.so" - echo "$as_me:$LINENO: checking for Qt4 headers" >&5 -echo $ECHO_N "checking for Qt4 headers... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for Qt4 headers" >&5 +$as_echo_n "checking for Qt4 headers... " >&6; } qt_header_dir="no" for inc_dir in $qt_incdirs ; do if test -r "$inc_dir/$qt_test_include" ; then @@ -25262,16 +27896,16 @@ echo $ECHO_N "checking for Qt4 headers... $ECHO_C" >&6 fi done - echo "$as_me:$LINENO: result: $qt_header_dir" >&5 -echo "${ECHO_T}$qt_header_dir" >&6 + { $as_echo "$as_me:$LINENO: result: $qt_header_dir" >&5 +$as_echo "$qt_header_dir" >&6; } if test "x$qt_header_dir" = "xno" ; then - { { echo "$as_me:$LINENO: error: Qt4 headers not found. Please specify the root of your Qt4 installation by exporting QTDIR before running \"configure\"." >&5 -echo "$as_me: error: Qt4 headers not found. Please specify the root of your Qt4 installation by exporting QTDIR before running \"configure\"." >&2;} + { { $as_echo "$as_me:$LINENO: error: Qt4 headers not found. Please specify the root of your Qt4 installation by exporting QTDIR before running \"configure\"." >&5 +$as_echo "$as_me: error: Qt4 headers not found. Please specify the root of your Qt4 installation by exporting QTDIR before running \"configure\"." >&2;} { (exit 1); exit 1; }; } fi - echo "$as_me:$LINENO: checking for Qt4 libraries" >&5 -echo $ECHO_N "checking for Qt4 libraries... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for Qt4 libraries" >&5 +$as_echo_n "checking for Qt4 libraries... " >&6; } qt_lib_dir="no" for lib_dir in $qt_libdirs ; do if test -r "$lib_dir/$qt_test_library" ; then @@ -25280,21 +27914,21 @@ echo $ECHO_N "checking for Qt4 libraries... $ECHO_C" >&6 fi done - echo "$as_me:$LINENO: result: $qt_lib_dir" >&5 -echo "${ECHO_T}$qt_lib_dir" >&6 + { $as_echo "$as_me:$LINENO: result: $qt_lib_dir" >&5 +$as_echo "$qt_lib_dir" >&6; } if test "x$qt_lib_dir" = "xno" ; then - { { echo "$as_me:$LINENO: error: Qt4 libraries not found. Please specify the root of your Qt4 installation by exporting QTDIR before running \"configure\"." >&5 -echo "$as_me: error: Qt4 libraries not found. Please specify the root of your Qt4 installation by exporting QTDIR before running \"configure\"." >&2;} + { { $as_echo "$as_me:$LINENO: error: Qt4 libraries not found. Please specify the root of your Qt4 installation by exporting QTDIR before running \"configure\"." >&5 +$as_echo "$as_me: error: Qt4 libraries not found. Please specify the root of your Qt4 installation by exporting QTDIR before running \"configure\"." >&2;} { (exit 1); exit 1; }; } fi # Extract the first word of "moc", so it can be a program name with args. set dummy moc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_MOC4+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $MOC4 in [\\/]* | ?:[\\/]*) @@ -25308,38 +27942,39 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_MOC4="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_MOC4" && ac_cv_path_MOC4="no" ;; esac fi MOC4=$ac_cv_path_MOC4 - if test -n "$MOC4"; then - echo "$as_me:$LINENO: result: $MOC4" >&5 -echo "${ECHO_T}$MOC4" >&6 + { $as_echo "$as_me:$LINENO: result: $MOC4" >&5 +$as_echo "$MOC4" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + if test "$MOC4" = "no" ; then - { { echo "$as_me:$LINENO: error: Qt Meta Object Compiler not found. Please specify + { { $as_echo "$as_me:$LINENO: error: Qt Meta Object Compiler not found. Please specify the root of your Qt installation by exporting QTDIR before running \"configure\"." >&5 -echo "$as_me: error: Qt Meta Object Compiler not found. Please specify +$as_echo "$as_me: error: Qt Meta Object Compiler not found. Please specify the root of your Qt installation by exporting QTDIR before running \"configure\"." >&2;} { (exit 1); exit 1; }; } fi - echo "$as_me:$LINENO: checking for KDE4 headers" >&5 -echo $ECHO_N "checking for KDE4 headers... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for KDE4 headers" >&5 +$as_echo_n "checking for KDE4 headers... " >&6; } kde_incdir="no" for kde_check in $kde_incdirs ; do if test -r "$kde_check/$kde_test_include" ; then @@ -25347,16 +27982,16 @@ echo $ECHO_N "checking for KDE4 headers... $ECHO_C" >&6 break fi done - echo "$as_me:$LINENO: result: $kde_incdir" >&5 -echo "${ECHO_T}$kde_incdir" >&6 + { $as_echo "$as_me:$LINENO: result: $kde_incdir" >&5 +$as_echo "$kde_incdir" >&6; } if test "x$kde_incdir" = "xno" ; then - { { echo "$as_me:$LINENO: error: KDE4 headers not found. Please specify the root of your KDE4 installation by exporting KDEDIR before running \"configure\"." >&5 -echo "$as_me: error: KDE4 headers not found. Please specify the root of your KDE4 installation by exporting KDEDIR before running \"configure\"." >&2;} + { { $as_echo "$as_me:$LINENO: error: KDE4 headers not found. Please specify the root of your KDE4 installation by exporting KDEDIR before running \"configure\"." >&5 +$as_echo "$as_me: error: KDE4 headers not found. Please specify the root of your KDE4 installation by exporting KDEDIR before running \"configure\"." >&2;} { (exit 1); exit 1; }; } fi - echo "$as_me:$LINENO: checking for KDE4 libraries" >&5 -echo $ECHO_N "checking for KDE4 libraries... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for KDE4 libraries" >&5 +$as_echo_n "checking for KDE4 libraries... " >&6; } kde_libdir="no" for kde_check in $kde_libdirs ; do if test -r "$kde_check/$kde_test_library" ; then @@ -25365,11 +28000,11 @@ echo $ECHO_N "checking for KDE4 libraries... $ECHO_C" >&6 fi done - echo "$as_me:$LINENO: result: $kde_libdir" >&5 -echo "${ECHO_T}$kde_libdir" >&6 + { $as_echo "$as_me:$LINENO: result: $kde_libdir" >&5 +$as_echo "$kde_libdir" >&6; } if test "x$kde_libdir" = "xno" ; then - { { echo "$as_me:$LINENO: error: KDE4 libraries not found. Please specify the root of your KDE4 installation by exporting KDEDIR before running \"configure\"." >&5 -echo "$as_me: error: KDE4 libraries not found. Please specify the root of your KDE4 installation by exporting KDEDIR before running \"configure\"." >&2;} + { { $as_echo "$as_me:$LINENO: error: KDE4 libraries not found. Please specify the root of your KDE4 installation by exporting KDEDIR before running \"configure\"." >&5 +$as_echo "$as_me: error: KDE4 libraries not found. Please specify the root of your KDE4 installation by exporting KDEDIR before running \"configure\"." >&2;} { (exit 1); exit 1; }; } fi @@ -25380,34 +28015,34 @@ fi -echo "$as_me:$LINENO: checking whether to enable the lockdown pieces" >&5 -echo $ECHO_N "checking whether to enable the lockdown pieces... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to enable the lockdown pieces" >&5 +$as_echo_n "checking whether to enable the lockdown pieces... " >&6; } ENABLE_LOCKDOWN="" if test -n "$enable_lockdown" && test "$enable_lockdown" != "no"; then ENABLE_LOCKDOWN=YES - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi -echo "$as_me:$LINENO: checking whether to enable evolution 2 support" >&5 -echo $ECHO_N "checking whether to enable evolution 2 support... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to enable evolution 2 support" >&5 +$as_echo_n "checking whether to enable evolution 2 support... " >&6; } if test "$enable_evolution2" = "yes" -o "$enable_evolution2" = "TRUE"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } succeeded=no if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -25420,28 +28055,29 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test "$PKG_CONFIG" = "no" ; then @@ -25452,25 +28088,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for gobject-2.0" >&5 -echo $ECHO_N "checking for gobject-2.0... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for gobject-2.0" >&5 +$as_echo_n "checking for gobject-2.0... " >&6; } if $PKG_CONFIG --exists "gobject-2.0" ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } succeeded=yes - echo "$as_me:$LINENO: checking GOBJECT_CFLAGS" >&5 -echo $ECHO_N "checking GOBJECT_CFLAGS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking GOBJECT_CFLAGS" >&5 +$as_echo_n "checking GOBJECT_CFLAGS... " >&6; } GOBJECT_CFLAGS=`$PKG_CONFIG --cflags "gobject-2.0"` - echo "$as_me:$LINENO: result: $GOBJECT_CFLAGS" >&5 -echo "${ECHO_T}$GOBJECT_CFLAGS" >&6 + { $as_echo "$as_me:$LINENO: result: $GOBJECT_CFLAGS" >&5 +$as_echo "$GOBJECT_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking GOBJECT_LIBS" >&5 -echo $ECHO_N "checking GOBJECT_LIBS... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking GOBJECT_LIBS" >&5 +$as_echo_n "checking GOBJECT_LIBS... " >&6; } GOBJECT_LIBS=`$PKG_CONFIG --libs "gobject-2.0"` - echo "$as_me:$LINENO: result: $GOBJECT_LIBS" >&5 -echo "${ECHO_T}$GOBJECT_LIBS" >&6 + { $as_echo "$as_me:$LINENO: result: $GOBJECT_LIBS" >&5 +$as_echo "$GOBJECT_LIBS" >&6; } else GOBJECT_CFLAGS="" GOBJECT_LIBS="" @@ -25491,27 +28127,27 @@ echo "${ECHO_T}$GOBJECT_LIBS" >&6 if test $succeeded = yes; then : else - { { echo "$as_me:$LINENO: error: Library requirements (gobject-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -echo "$as_me: error: Library requirements (gobject-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { { $as_echo "$as_me:$LINENO: error: Library requirements (gobject-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +$as_echo "$as_me: error: Library requirements (gobject-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi ENABLE_EVOAB2="TRUE" else ENABLE_EVOAB2="" - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi -echo "$as_me:$LINENO: checking whether to enable KDE address book support" >&5 -echo $ECHO_N "checking whether to enable KDE address book support... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to enable KDE address book support" >&5 +$as_echo_n "checking whether to enable KDE address book support... " >&6; } if test "$enable_kdeab" = "yes" && test "$enable_kde" = "yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - ac_ext=cc + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -25519,17 +28155,18 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu save_CXXFLAGS=$CXXFLAGS CXXFLAGS="$CXXFLAGS $KDE_CFLAGS" - echo "$as_me:$LINENO: checking whether KDE is between 3.2 and 3.6" >&5 -echo $ECHO_N "checking whether KDE is between 3.2 and 3.6... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking whether KDE is between 3.2 and 3.6" >&5 +$as_echo_n "checking whether KDE is between 3.2 and 3.6... " >&6; } if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run test program while cross compiling +$as_echo "$as_me: error: cannot run test program while cross compiling See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -25545,30 +28182,44 @@ int main(int argc, char **argv) { _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: KDE version too old or too recent, please use another version of KDE or disable KDE address book support" >&5 -echo "$as_me: error: KDE version too old or too recent, please use another version of KDE or disable KDE address book support" >&2;} +{ { $as_echo "$as_me:$LINENO: error: KDE version too old or too recent, please use another version of KDE or disable KDE address book support" >&5 +$as_echo "$as_me: error: KDE version too old or too recent, please use another version of KDE or disable KDE address book support" >&2;} { (exit 1); exit 1; }; } fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + CXXFLAGS=$save_CXXFLAGS ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -25578,56 +28229,55 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ENABLE_KAB=TRUE else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } ENABLE_KAB= fi -echo "$as_me:$LINENO: checking whether to include FontOOo" >&5 -echo $ECHO_N "checking whether to include FontOOo... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to include FontOOo" >&5 +$as_echo_n "checking whether to include FontOOo... " >&6; } if test -n "$enable_fontooo"; then if test "$enable_fontooo" = "no"; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } WITH_FONTOOO=NO SCPDEFS="$SCPDEFS -DWITHOUT_FONTOOO" else - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } WITH_FONTOOO=YES BUILD_TYPE="$BUILD_TYPE MSFONTEXTRACT" fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } WITH_FONTOOO=NO SCPDEFS="$SCPDEFS -DWITHOUT_FONTOOO" fi if test "$WITH_FONTOOO" = "YES"; then - echo "$as_me:$LINENO: checking whether to use system libmspack" >&5 -echo $ECHO_N "checking whether to use system libmspack... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking whether to use system libmspack" >&5 +$as_echo_n "checking whether to use system libmspack... " >&6; } if test -n "$with_system_mspack" -o -n "$with_system_libs" && \ test "$with_system_mspack" != "no"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } SYSTEM_MSPACK=YES if test "${ac_cv_header_mspack_h+set}" = set; then - echo "$as_me:$LINENO: checking for mspack.h" >&5 -echo $ECHO_N "checking for mspack.h... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for mspack.h" >&5 +$as_echo_n "checking for mspack.h... " >&6; } if test "${ac_cv_header_mspack_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_mspack_h" >&5 -echo "${ECHO_T}$ac_cv_header_mspack_h" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_mspack_h" >&5 +$as_echo "$ac_cv_header_mspack_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking mspack.h usability" >&5 -echo $ECHO_N "checking mspack.h usability... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking mspack.h usability" >&5 +$as_echo_n "checking mspack.h usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -25637,33 +28287,39 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking mspack.h presence" >&5 -echo $ECHO_N "checking mspack.h presence... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking mspack.h presence" >&5 +$as_echo_n "checking mspack.h presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -25671,143 +28327,147 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) - { echo "$as_me:$LINENO: WARNING: mspack.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: mspack.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: mspack.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: mspack.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: mspack.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: mspack.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: mspack.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: mspack.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) - { echo "$as_me:$LINENO: WARNING: mspack.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: mspack.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: mspack.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: mspack.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: mspack.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: mspack.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: mspack.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: mspack.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: mspack.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: mspack.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: mspack.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: mspack.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: mspack.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: mspack.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: mspack.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: mspack.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: mspack.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: mspack.h: in the future, the compiler will take precedence" >&2;} + ;; esac -echo "$as_me:$LINENO: checking for mspack.h" >&5 -echo $ECHO_N "checking for mspack.h... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for mspack.h" >&5 +$as_echo_n "checking for mspack.h... " >&6; } if test "${ac_cv_header_mspack_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_cv_header_mspack_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_mspack_h" >&5 -echo "${ECHO_T}$ac_cv_header_mspack_h" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_mspack_h" >&5 +$as_echo "$ac_cv_header_mspack_h" >&6; } fi -if test $ac_cv_header_mspack_h = yes; then +if test "x$ac_cv_header_mspack_h" = x""yes; then : else - { { echo "$as_me:$LINENO: error: mspack.h not found, install libmspack" >&5 -echo "$as_me: error: mspack.h not found, install libmspack" >&2;} + { { $as_echo "$as_me:$LINENO: error: mspack.h not found, install libmspack" >&5 +$as_echo "$as_me: error: mspack.h not found, install libmspack" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:$LINENO: checking for mspack_create_cab_decompressor in -lmspack" >&5 -echo $ECHO_N "checking for mspack_create_cab_decompressor in -lmspack... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for mspack_create_cab_decompressor in -lmspack" >&5 +$as_echo_n "checking for mspack_create_cab_decompressor in -lmspack... " >&6; } if test "${ac_cv_lib_mspack_mspack_create_cab_decompressor+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lmspack $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char mspack_create_cab_decompressor (); int main () { -mspack_create_cab_decompressor (); +return mspack_create_cab_decompressor (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_mspack_mspack_create_cab_decompressor=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_mspack_mspack_create_cab_decompressor=no + ac_cv_lib_mspack_mspack_create_cab_decompressor=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_mspack_mspack_create_cab_decompressor" >&5 -echo "${ECHO_T}$ac_cv_lib_mspack_mspack_create_cab_decompressor" >&6 -if test $ac_cv_lib_mspack_mspack_create_cab_decompressor = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mspack_mspack_create_cab_decompressor" >&5 +$as_echo "$ac_cv_lib_mspack_mspack_create_cab_decompressor" >&6; } +if test "x$ac_cv_lib_mspack_mspack_create_cab_decompressor" = x""yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBMSPACK 1 _ACEOF @@ -25815,73 +28475,73 @@ _ACEOF LIBS="-lmspack $LIBS" else - { { echo "$as_me:$LINENO: error: libmspack not installed or functional" >&5 -echo "$as_me: error: libmspack not installed or functional" >&2;} + { { $as_echo "$as_me:$LINENO: error: libmspack not installed or functional" >&5 +$as_echo "$as_me: error: libmspack not installed or functional" >&2;} { (exit 1); exit 1; }; } fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } SYSTEM_MSPACK=NO fi fi -echo "$as_me:$LINENO: checking whether to include MathMLDTD" >&5 -echo $ECHO_N "checking whether to include MathMLDTD... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to include MathMLDTD" >&5 +$as_echo_n "checking whether to include MathMLDTD... " >&6; } if test -n "$enable_mathmldtd"; then if test "$enable_mathmldtd" = "no"; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } SCPDEFS="$SCPDEFS -DWITHOUT_MATHMLDTD" else - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } BUILD_TYPE="$BUILD_TYPE MATHMLDTD" fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } SCPDEFS="$SCPDEFS -DWITHOUT_MATHMLDTD" fi -echo "$as_me:$LINENO: checking whether to include Bitstream Vera fonts" >&5 -echo $ECHO_N "checking whether to include Bitstream Vera fonts... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to include Bitstream Vera fonts" >&5 +$as_echo_n "checking whether to include Bitstream Vera fonts... " >&6; } if test "$with_fonts" != "no" ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } WITH_FONTS=YES BUILD_TYPE="$BUILD_TYPE BITSTREAM_VERA_FONTS" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } WITH_FONTS=NO SCPDEFS="$SCPDEFS -DWITHOUT_FONTS" fi -echo "$as_me:$LINENO: checking whether to include PPDs" >&5 -echo $ECHO_N "checking whether to include PPDs... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to include PPDs" >&5 +$as_echo_n "checking whether to include PPDs... " >&6; } if test "$with_ppds" != "no"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } WITHOUT_PPDS=YES SCPDEFS="$SCPDEFS -DWITHOUT_PPDS" fi -echo "$as_me:$LINENO: checking whether to include AFMs" >&5 -echo $ECHO_N "checking whether to include AFMs... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to include AFMs" >&5 +$as_echo_n "checking whether to include AFMs... " >&6; } if test "$with_afms" != "no"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } WITHOUT_AFMS=YES SCPDEFS="$SCPDEFS -DWITHOUT_AFMS" fi @@ -25889,13 +28549,13 @@ fi -echo "$as_me:$LINENO: checking whether and how to use Xinerama" >&5 -echo $ECHO_N "checking whether and how to use Xinerama... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether and how to use Xinerama" >&5 +$as_echo_n "checking whether and how to use Xinerama... " >&6; } if test "$_os" = "Darwin"; then USE_XINERAMA=YES XINERAMA_LINK=dynamic - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } elif test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then if test -e "$XLIB/libXinerama.so" -a -e "$XLIB/libXinerama.a"; then # we have both versions, let the user decide but use the dynamic one @@ -25925,22 +28585,21 @@ elif test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then XINERAMA_LINK=none fi if test "$USE_XINERAMA" = "YES"; then - echo "$as_me:$LINENO: result: yes, with $XINERAMA_LINK linking" >&5 -echo "${ECHO_T}yes, with $XINERAMA_LINK linking" >&6 + { $as_echo "$as_me:$LINENO: result: yes, with $XINERAMA_LINK linking" >&5 +$as_echo "yes, with $XINERAMA_LINK linking" >&6; } if test "${ac_cv_header_X11_extensions_Xinerama_h+set}" = set; then - echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5 -echo $ECHO_N "checking for X11/extensions/Xinerama.h... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5 +$as_echo_n "checking for X11/extensions/Xinerama.h... " >&6; } if test "${ac_cv_header_X11_extensions_Xinerama_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_extensions_Xinerama_h" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5 +$as_echo "$ac_cv_header_X11_extensions_Xinerama_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking X11/extensions/Xinerama.h usability" >&5 -echo $ECHO_N "checking X11/extensions/Xinerama.h usability... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking X11/extensions/Xinerama.h usability" >&5 +$as_echo_n "checking X11/extensions/Xinerama.h usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -25950,33 +28609,39 @@ $ac_includes_default #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking X11/extensions/Xinerama.h presence" >&5 -echo $ECHO_N "checking X11/extensions/Xinerama.h presence... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking X11/extensions/Xinerama.h presence" >&5 +$as_echo_n "checking X11/extensions/Xinerama.h presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -25984,83 +28649,76 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) - { echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: X11/extensions/Xinerama.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: X11/extensions/Xinerama.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: X11/extensions/Xinerama.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: X11/extensions/Xinerama.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) - { echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: X11/extensions/Xinerama.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: X11/extensions/Xinerama.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: X11/extensions/Xinerama.h: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: X11/extensions/Xinerama.h: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: X11/extensions/Xinerama.h: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: X11/extensions/Xinerama.h: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: X11/extensions/Xinerama.h: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: X11/extensions/Xinerama.h: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: X11/extensions/Xinerama.h: in the future, the compiler will take precedence" >&2;} + ;; esac -echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5 -echo $ECHO_N "checking for X11/extensions/Xinerama.h... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5 +$as_echo_n "checking for X11/extensions/Xinerama.h... " >&6; } if test "${ac_cv_header_X11_extensions_Xinerama_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_cv_header_X11_extensions_Xinerama_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_extensions_Xinerama_h" >&6 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5 +$as_echo "$ac_cv_header_X11_extensions_Xinerama_h" >&6; } fi -if test $ac_cv_header_X11_extensions_Xinerama_h = yes; then +if test "x$ac_cv_header_X11_extensions_Xinerama_h" = x""yes; then : else - { { echo "$as_me:$LINENO: error: Xinerama header not found." >&5 -echo "$as_me: error: Xinerama header not found." >&2;} + { { $as_echo "$as_me:$LINENO: error: Xinerama header not found." >&5 +$as_echo "$as_me: error: Xinerama header not found." >&2;} { (exit 1); exit 1; }; } fi @@ -26073,61 +28731,72 @@ fi XINERAMA_EXTRA_LIBS="$XINERAMA_EXTRA_LIBS -ldl" fi -echo "$as_me:$LINENO: checking for XineramaIsActive in -lXinerama" >&5 -echo $ECHO_N "checking for XineramaIsActive in -lXinerama... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for XineramaIsActive in -lXinerama" >&5 +$as_echo_n "checking for XineramaIsActive in -lXinerama... " >&6; } if test "${ac_cv_lib_Xinerama_XineramaIsActive+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lXinerama $XINERAMA_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char XineramaIsActive (); int main () { -XineramaIsActive (); +return XineramaIsActive (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_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 && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_Xinerama_XineramaIsActive=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xinerama_XineramaIsActive=no + ac_cv_lib_Xinerama_XineramaIsActive=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaIsActive" >&5 -echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaIsActive" >&6 -if test $ac_cv_lib_Xinerama_XineramaIsActive = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaIsActive" >&5 +$as_echo "$ac_cv_lib_Xinerama_XineramaIsActive" >&6; } +if test "x$ac_cv_lib_Xinerama_XineramaIsActive" = x""yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBXINERAMA 1 _ACEOF @@ -26135,18 +28804,18 @@ _ACEOF LIBS="-lXinerama $LIBS" else - { { echo "$as_me:$LINENO: error: Xinerama not functional?" >&5 -echo "$as_me: error: Xinerama not functional?" >&2;} + { { $as_echo "$as_me:$LINENO: error: Xinerama not functional?" >&5 +$as_echo "$as_me: error: Xinerama not functional?" >&2;} { (exit 1); exit 1; }; } fi else - echo "$as_me:$LINENO: result: no, libXinerama not found or wrong architecture." >&5 -echo "${ECHO_T}no, libXinerama not found or wrong architecture." >&6 + { $as_echo "$as_me:$LINENO: result: no, libXinerama not found or wrong architecture." >&5 +$as_echo "no, libXinerama not found or wrong architecture." >&6; } fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -26160,10 +28829,10 @@ if test -z "$with_ant_home"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_ANT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $ANT in [\\/]* | ?:[\\/]*) @@ -26176,27 +28845,28 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ANT="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi ANT=$ac_cv_path_ANT - if test -n "$ANT"; then - echo "$as_me:$LINENO: result: $ANT" >&5 -echo "${ECHO_T}$ANT" >&6 + { $as_echo "$as_me:$LINENO: result: $ANT" >&5 +$as_echo "$ANT" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + test -n "$ANT" && break done @@ -26208,10 +28878,10 @@ else do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_ANT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $ANT in [\\/]* | ?:[\\/]*) @@ -26225,27 +28895,28 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ANT="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi ANT=$ac_cv_path_ANT - if test -n "$ANT"; then - echo "$as_me:$LINENO: result: $ANT" >&5 -echo "${ECHO_T}$ANT" >&6 + { $as_echo "$as_me:$LINENO: result: $ANT" >&5 +$as_echo "$ANT" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + test -n "$ANT" && break done @@ -26254,8 +28925,8 @@ done fi if test -z "$ANT"; then - { { echo "$as_me:$LINENO: error: Ant not found - Make sure it's in the path or use --with-ant-home" >&5 -echo "$as_me: error: Ant not found - Make sure it's in the path or use --with-ant-home" >&2;} + { { $as_echo "$as_me:$LINENO: error: Ant not found - Make sure it's in the path or use --with-ant-home" >&5 +$as_echo "$as_me: error: Ant not found - Make sure it's in the path or use --with-ant-home" >&2;} { (exit 1); exit 1; }; } else # resolve relative or absolute symlink @@ -26281,8 +28952,8 @@ else fi ant_minminor1=`echo $ant_minver | cut -d"." -f2` - echo "$as_me:$LINENO: checking whether ant is >= $ant_minver" >&5 -echo $ECHO_N "checking whether ant is >= $ant_minver... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking whether ant is >= $ant_minver" >&5 +$as_echo_n "checking whether ant is >= $ant_minver... " >&6; } ant_version=`$ANT -version | $AWK '{ print $4; }'` ant_version_major=`echo $ant_version | cut -d. -f1` ant_version_minor=`echo $ant_version | cut -d. -f2` @@ -26290,18 +28961,18 @@ echo "configure: ant_version $ant_version " >&5 echo "configure: ant_version_major $ant_version_major " >&5 echo "configure: ant_version_minor $ant_version_minor " >&5 if test "$ant_version_major" -ge "2"; then - echo "$as_me:$LINENO: result: yes, $ant_version" >&5 -echo "${ECHO_T}yes, $ant_version" >&6 + { $as_echo "$as_me:$LINENO: result: yes, $ant_version" >&5 +$as_echo "yes, $ant_version" >&6; } elif test "$ant_version_major" = "1" && test "$ant_version_minor" -ge "$ant_minminor1"; then - echo "$as_me:$LINENO: result: yes, $ant_version" >&5 -echo "${ECHO_T}yes, $ant_version" >&6 + { $as_echo "$as_me:$LINENO: result: yes, $ant_version" >&5 +$as_echo "yes, $ant_version" >&6; } else - { { echo "$as_me:$LINENO: error: no, you need at least ant >= $ant_minver" >&5 -echo "$as_me: error: no, you need at least ant >= $ant_minver" >&2;} + { { $as_echo "$as_me:$LINENO: error: no, you need at least ant >= $ant_minver" >&5 +$as_echo "$as_me: error: no, you need at least ant >= $ant_minver" >&2;} { (exit 1); exit 1; }; } fi - echo "$as_me:$LINENO: checking if $ANT works" >&5 -echo $ECHO_N "checking if $ANT works... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking if $ANT works" >&5 +$as_echo_n "checking if $ANT works... " >&6; } cat > conftest.java << EOF public class conftest { int testmethod(int a, int b) { @@ -26328,11 +28999,11 @@ EOF { (eval echo "$as_me:$LINENO: \"$ant_cmd\"") >&5 (eval $ant_cmd) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } if test $? = 0 && test -f ./conftest.class ; then - echo "$as_me:$LINENO: result: Ant works" >&5 -echo "${ECHO_T}Ant works" >&6 + { $as_echo "$as_me:$LINENO: result: Ant works" >&5 +$as_echo "Ant works" >&6; } if test -z "$WITH_ANT_HOME"; then ANT_HOME=`$ANT -diagnostics | $EGREP "ant.home :" | $SED -e "s#ant.home : ##g"` if test -z "$ANT_HOME"; then @@ -26345,8 +29016,8 @@ echo "${ECHO_T}Ant works" >&6 echo "configure: Ant test failed" >&5 cat conftest.java >&5 cat conftest.xml >&5 - { echo "$as_me:$LINENO: WARNING: Ant does not work - Some Java projects will not build!" >&5 -echo "$as_me: WARNING: Ant does not work - Some Java projects will not build!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: Ant does not work - Some Java projects will not build!" >&5 +$as_echo "$as_me: WARNING: Ant does not work - Some Java projects will not build!" >&2;} ANT_HOME="" echo "Ant does not work - Some Java projects will not build!" >>warn fi @@ -26359,8 +29030,8 @@ fi if test "$ANT_HOME" != "NO_ANT_HOME"; then - echo "$as_me:$LINENO: checking Ant lib directory" >&5 -echo $ECHO_N "checking Ant lib directory... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking Ant lib directory" >&5 +$as_echo_n "checking Ant lib directory... " >&6; } if test -f $ANT_HOME/lib/ant.jar; then ANT_LIB="$ANT_HOME/lib" else @@ -26376,23 +29047,23 @@ echo $ECHO_N "checking Ant lib directory... $ECHO_C" >&6 if test -f $ANT_HOME/lib/ant/ant.jar; then ANT_LIB="$ANT_HOME/lib/ant" else - { { echo "$as_me:$LINENO: error: Ant libraries not found!" >&5 -echo "$as_me: error: Ant libraries not found!" >&2;} + { { $as_echo "$as_me:$LINENO: error: Ant libraries not found!" >&5 +$as_echo "$as_me: error: Ant libraries not found!" >&2;} { (exit 1); exit 1; }; } fi fi fi fi fi - echo "$as_me:$LINENO: result: Ant lib directory found." >&5 -echo "${ECHO_T}Ant lib directory found." >&6 + { $as_echo "$as_me:$LINENO: result: Ant lib directory found." >&5 +$as_echo "Ant lib directory found." >&6; } fi fi if test "$ENABLE_MEDIAWIKI" = "YES"; then -echo "$as_me:$LINENO: checking whether ant supports mapper type=\"regexp\"" >&5 -echo $ECHO_N "checking whether ant supports mapper type=\"regexp\"... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether ant supports mapper type=\"regexp\"" >&5 +$as_echo_n "checking whether ant supports mapper type=\"regexp\"... " >&6; } rm -rf confdir mkdir confdir cat > conftest.java << EOF @@ -26427,178 +29098,178 @@ EOF { (eval echo "$as_me:$LINENO: \"$ant_cmd\"") >&5 (eval $ant_cmd) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } if test $? = 0 && test -f ./conftest.class ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } rm -rf confdir else echo "configure: Ant test failed" >&5 cat conftest.java >&5 cat conftest.xml >&5 rm -rf confdir - { { echo "$as_me:$LINENO: error: no. Did you install ant-apache-regexp?" >&5 -echo "$as_me: error: no. Did you install ant-apache-regexp?" >&2;} + { { $as_echo "$as_me:$LINENO: error: no. Did you install ant-apache-regexp?" >&5 +$as_echo "$as_me: error: no. Did you install ant-apache-regexp?" >&2;} { (exit 1); exit 1; }; } fi fi rm -f conftest* core core.* *.core -echo "$as_me:$LINENO: checking which languages to be built" >&5 -echo $ECHO_N "checking which languages to be built... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking which languages to be built" >&5 +$as_echo_n "checking which languages to be built... " >&6; } WITH_LANG="$with_lang" if test -z "$WITH_LANG"; then - echo "$as_me:$LINENO: result: en-US" >&5 -echo "${ECHO_T}en-US" >&6 + { $as_echo "$as_me:$LINENO: result: en-US" >&5 +$as_echo "en-US" >&6; } else - echo "$as_me:$LINENO: result: $WITH_LANG" >&5 -echo "${ECHO_T}$WITH_LANG" >&6 + { $as_echo "$as_me:$LINENO: result: $WITH_LANG" >&5 +$as_echo "$WITH_LANG" >&6; } fi -echo "$as_me:$LINENO: checking which languages have poor help localizations" >&5 -echo $ECHO_N "checking which languages have poor help localizations... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking which languages have poor help localizations" >&5 +$as_echo_n "checking which languages have poor help localizations... " >&6; } WITH_POOR_HELP_LOCALIZATIONS="$with_poor_help_localizations" if test -z "$WITH_POOR_HELP_LOCALIZATIONS"; then - echo "$as_me:$LINENO: result: none" >&5 -echo "${ECHO_T}none" >&6 + { $as_echo "$as_me:$LINENO: result: none" >&5 +$as_echo "none" >&6; } else - echo "$as_me:$LINENO: result: $WITH_POOR_HELP_LOCALIZATIONS" >&5 -echo "${ECHO_T}$WITH_POOR_HELP_LOCALIZATIONS" >&6 + { $as_echo "$as_me:$LINENO: result: $WITH_POOR_HELP_LOCALIZATIONS" >&5 +$as_echo "$WITH_POOR_HELP_LOCALIZATIONS" >&6; } fi -echo "$as_me:$LINENO: checking which dictionaries to include" >&5 -echo $ECHO_N "checking which dictionaries to include... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking which dictionaries to include" >&5 +$as_echo_n "checking which dictionaries to include... " >&6; } if test -z "$with_dict"; then WITH_DICT=,ALL, - echo "$as_me:$LINENO: result: ALL" >&5 -echo "${ECHO_T}ALL" >&6 + { $as_echo "$as_me:$LINENO: result: ALL" >&5 +$as_echo "ALL" >&6; } else WITH_DICT=","$with_dict"," - echo "$as_me:$LINENO: result: $with_dict" >&5 -echo "${ECHO_T}$with_dict" >&6 + { $as_echo "$as_me:$LINENO: result: $with_dict" >&5 +$as_echo "$with_dict" >&6; } fi -echo "$as_me:$LINENO: checking for additional 'intro' bitmaps" >&5 -echo $ECHO_N "checking for additional 'intro' bitmaps... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for additional 'intro' bitmaps" >&5 +$as_echo_n "checking for additional 'intro' bitmaps... " >&6; } INTRO_BITMAPS= if test -z "$with_intro_bitmaps" -o "$with_intro_bitmaps" = "no" ; then INTRO_BITMAPS= - echo "$as_me:$LINENO: result: none" >&5 -echo "${ECHO_T}none" >&6 + { $as_echo "$as_me:$LINENO: result: none" >&5 +$as_echo "none" >&6; } else for bitmap in `echo $with_intro_bitmaps | tr ',' ' '` ; do case "$bitmap" in *.bmp) ;; - *) bitmap= ; { echo "$as_me:$LINENO: WARNING: Intro bitmaps should be .bmp files!" >&5 -echo "$as_me: WARNING: Intro bitmaps should be .bmp files!" >&2;} ;; + *) bitmap= ; { $as_echo "$as_me:$LINENO: WARNING: Intro bitmaps should be .bmp files!" >&5 +$as_echo "$as_me: WARNING: Intro bitmaps should be .bmp files!" >&2;} ;; esac if test -n "$bitmap" ; then INTRO_BITMAPS="$INTRO_BITMAPS $bitmap" fi done - echo "$as_me:$LINENO: result: $INTRO_BITMAPS" >&5 -echo "${ECHO_T}$INTRO_BITMAPS" >&6 + { $as_echo "$as_me:$LINENO: result: $INTRO_BITMAPS" >&5 +$as_echo "$INTRO_BITMAPS" >&6; } fi -echo "$as_me:$LINENO: checking for additional 'about' bitmaps" >&5 -echo $ECHO_N "checking for additional 'about' bitmaps... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for additional 'about' bitmaps" >&5 +$as_echo_n "checking for additional 'about' bitmaps... " >&6; } ABOUT_BITMAPS= if test -z "$with_about_bitmaps" -o "$with_about_bitmaps" = "no" ; then ABOUT_BITMAPS= - echo "$as_me:$LINENO: result: none" >&5 -echo "${ECHO_T}none" >&6 + { $as_echo "$as_me:$LINENO: result: none" >&5 +$as_echo "none" >&6; } else for bitmap in `echo $with_about_bitmaps | tr ',' ' '` ; do case "$bitmap" in *.bmp) ;; - *) bitmap= ; { echo "$as_me:$LINENO: WARNING: About bitmaps should be .bmp files!" >&5 -echo "$as_me: WARNING: About bitmaps should be .bmp files!" >&2;} ;; + *) bitmap= ; { $as_echo "$as_me:$LINENO: WARNING: About bitmaps should be .bmp files!" >&5 +$as_echo "$as_me: WARNING: About bitmaps should be .bmp files!" >&2;} ;; esac if test -n "$bitmap" ; then ABOUT_BITMAPS="$ABOUT_BITMAPS $bitmap" fi done - echo "$as_me:$LINENO: result: $ABOUT_BITMAPS" >&5 -echo "${ECHO_T}$ABOUT_BITMAPS" >&6 + { $as_echo "$as_me:$LINENO: result: $ABOUT_BITMAPS" >&5 +$as_echo "$ABOUT_BITMAPS" >&6; } fi OOO_VENDOR= -echo "$as_me:$LINENO: checking for vendor" >&5 -echo $ECHO_N "checking for vendor... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for vendor" >&5 +$as_echo_n "checking for vendor... " >&6; } if test -z "$with_vendor" -o "$with_vendor" = "no" ; then - echo "$as_me:$LINENO: result: not set" >&5 -echo "${ECHO_T}not set" >&6 + { $as_echo "$as_me:$LINENO: result: not set" >&5 +$as_echo "not set" >&6; } else OOO_VENDOR="$with_vendor" - echo "$as_me:$LINENO: result: $OOO_VENDOR" >&5 -echo "${ECHO_T}$OOO_VENDOR" >&6 + { $as_echo "$as_me:$LINENO: result: $OOO_VENDOR" >&5 +$as_echo "$OOO_VENDOR" >&6; } fi UNIXWRAPPERNAME= -echo "$as_me:$LINENO: checking for UNIX wrapper name" >&5 -echo $ECHO_N "checking for UNIX wrapper name... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking for UNIX wrapper name" >&5 +$as_echo_n "checking for UNIX wrapper name... " >&6; } if test -z "$with_unix_wrapper" -o "$with_unix_wrapper" = "no" -o "$with_unix_wrapper" = "yes" ; then - echo "$as_me:$LINENO: result: not set" >&5 -echo "${ECHO_T}not set" >&6 + { $as_echo "$as_me:$LINENO: result: not set" >&5 +$as_echo "not set" >&6; } else UNIXWRAPPERNAME="$with_unix_wrapper" - echo "$as_me:$LINENO: result: $UNIXWRAPPERNAME" >&5 -echo "${ECHO_T}$UNIXWRAPPERNAME" >&6 + { $as_echo "$as_me:$LINENO: result: $UNIXWRAPPERNAME" >&5 +$as_echo "$UNIXWRAPPERNAME" >&6; } fi -echo "$as_me:$LINENO: checking whether to statically link to Gtk" >&5 -echo $ECHO_N "checking whether to statically link to Gtk... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to statically link to Gtk" >&5 +$as_echo_n "checking whether to statically link to Gtk... " >&6; } if test -n "$enable_static_gtk" && test "$enable_static_gtk" != "no"; then ENABLE_STATIC_GTK="TRUE" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else ENABLE_STATIC_GTK="FALSE" - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi -echo "$as_me:$LINENO: checking whether to use layout dialogs" >&5 -echo $ECHO_N "checking whether to use layout dialogs... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking whether to use layout dialogs" >&5 +$as_echo_n "checking whether to use layout dialogs... " >&6; } if test -n "$enable_layout" && test "$enable_layout" != "no"; then ENABLE_LAYOUT="TRUE" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else ENABLE_LAYOUT="FALSE" - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi # =================================================================== # De- or increase default verbosity of build process # =================================================================== -echo "$as_me:$LINENO: checking build verbosity" >&5 -echo $ECHO_N "checking build verbosity... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking build verbosity" >&5 +$as_echo_n "checking build verbosity... " >&6; } if test -n "$enable_verbose"; then if test "$enable_verbose" == "yes"; then VERBOSE="TRUE" - echo "$as_me:$LINENO: result: high" >&5 -echo "${ECHO_T}high" >&6 + { $as_echo "$as_me:$LINENO: result: high" >&5 +$as_echo "high" >&6; } fi if test "$enable_verbose" == "no"; then VERBOSE="FALSE" - echo "$as_me:$LINENO: result: low" >&5 -echo "${ECHO_T}low" >&6 + { $as_echo "$as_me:$LINENO: result: low" >&5 +$as_echo "low" >&6; } fi else - echo "$as_me:$LINENO: result: not set" >&5 -echo "${ECHO_T}not set" >&6 + { $as_echo "$as_me:$LINENO: result: not set" >&5 +$as_echo "not set" >&6; } fi @@ -26609,22 +29280,22 @@ echo "* *" echo "********************************************************************" if test -z "$COMPATH"; then - { { echo "$as_me:$LINENO: error: No compiler found." >&5 -echo "$as_me: error: No compiler found." >&2;} + { { $as_echo "$as_me:$LINENO: error: No compiler found." >&5 +$as_echo "$as_me: error: No compiler found." >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:$LINENO: checking solver path" >&5 -echo $ECHO_N "checking solver path... $ECHO_C" >&6 +{ $as_echo "$as_me:$LINENO: checking solver path" >&5 +$as_echo_n "checking solver path... " >&6; } if test -z "$with_local_solver"; then LOCAL_SOLVER="DEFAULT" - echo "$as_me:$LINENO: result: default" >&5 -echo "${ECHO_T}default" >&6 + { $as_echo "$as_me:$LINENO: result: default" >&5 +$as_echo "default" >&6; } else LOCAL_SOLVER=$with_local_solver - echo "$as_me:$LINENO: result: $with_local_solver" >&5 -echo "${ECHO_T}$with_local_solver" >&6 + { $as_echo "$as_me:$LINENO: result: $with_local_solver" >&5 +$as_echo "$with_local_solver" >&6; } fi @@ -26633,7 +29304,8 @@ fi # make sure config.guess is +x; we execute config.guess, so it has to be so; chmod +x ./config.guess - ac_config_files="$ac_config_files set_soenv Makefile" +ac_config_files="$ac_config_files set_soenv Makefile" + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -26652,39 +29324,59 @@ _ACEOF # The following way of writing the cache mishandles newlines in values, # but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. +# So, we kill variables containing newlines. # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. -{ +( + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) $as_unset $ac_var ;; + esac ;; + esac + done + (set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote # substitution turns \\\\ into \\, and sed turns \\ into \). sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + ;; #( *) # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; - esac; -} | + esac | + sort +) | sed ' + /^ac_cv_env_/b end t clear - : clear + :clear s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ t end - /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - : end' >>confcache -if diff $cache_file confcache >/dev/null 2>&1; then :; else - if test -w $cache_file; then - test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + :end' >>confcache +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + test "x$cache_file" != "x/dev/null" && + { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 +$as_echo "$as_me: updating cache $cache_file" >&6;} cat confcache >$cache_file else - echo "not updating unwritable cache $cache_file" + { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -26693,63 +29385,54 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix # Let make expand exec_prefix. test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/; -s/:*\${srcdir}:*/:/; -s/:*@srcdir@:*/:/; -s/^\([^=]*=[ ]*\):*/\1/; -s/:*$//; -s/^[^=]*=[ ]*$//; -}' -fi - # Transform confdefs.h into DEFS. # Protect against shell expansion while executing Makefile rules. # Protect against Makefile macro expansion. # # If the first sed substitution is executed (which looks for macros that -# take arguments), then we branch to the quote section. Otherwise, +# take arguments), then branch to the quote section. Otherwise, # look for a macro that doesn't take arguments. -cat >confdef2opt.sed <<\_ACEOF +ac_script=' +:mline +/\\$/{ + N + s,\\\n,, + b mline +} t clear -: clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g +:clear +s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g t quote -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g +s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g t quote -d -: quote -s,[ `~#$^&*(){}\\|;'"<>?],\\&,g -s,\[,\\&,g -s,\],\\&,g -s,\$,$$,g -p -_ACEOF -# We use echo to avoid assuming a particular line-breaking character. -# The extra dot is to prevent the shell from consuming trailing -# line-breaks from the sub-command output. A line-break within -# single-quotes doesn't work because, if this script is created in a -# platform that uses two characters for line-breaks (e.g., DOS), tr -# would break. -ac_LF_and_DOT=`echo; echo .` -DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` -rm -f confdef2opt.sed +b any +:quote +s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g +s/\[/\\&/g +s/\]/\\&/g +s/\$/$$/g +H +:any +${ + g + s/^\n// + s/\n/ /g + p +} +' +DEFS=`sed -n "$ac_script" confdefs.h` ac_libobjs= ac_ltlibobjs= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. - ac_i=`echo "$ac_i" | - sed 's/\$U\././;s/\.o$//;s/\.obj$//'` - # 2. Add them. - ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' + ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. + ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' done LIBOBJS=$ac_libobjs @@ -26757,12 +29440,14 @@ LTLIBOBJS=$ac_ltlibobjs + : ${CONFIG_STATUS=./config.status} +ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF +{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. @@ -26775,57 +29460,141 @@ ac_cs_silent=false SHELL=\${CONFIG_SHELL-$SHELL} _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## -# Be Bourne compatible +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + + + +# PATH needs CR +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } fi # Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then as_unset=unset else as_unset=false fi +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi + # Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +done PS1='$ ' PS2='> ' PS4='+ ' # NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - $as_unset $as_var - fi -done +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE # Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then as_basename=basename else as_basename=false @@ -26833,200 +29602,168 @@ fi # Name of the executable. -as_me=`$as_basename "$0" || +as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` - -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi +# CDPATH. +$as_unset CDPATH - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 -echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in - /*) - if ("$as_dir/$as_base" -c ' as_lineno_1=$LINENO as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { # Create $as_me.lineno as a copy of $as_myself, but with $LINENO # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. + # line-number line after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, and appends + # trailing '-' during substitution so that $LINENO is not a special + # case at line end. # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | + # scripts with optimization help from Paolo Bonzini. Blame Lee + # E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ t loop - s,-$,, - s,^['$as_cr_digits']*\n,, + s/-\n.*// ' >$as_me.lineno && - chmod +x $as_me.lineno || - { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 -echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} + chmod +x "$as_me.lineno" || + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" # Exit status is that of the last command. exit } -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -esac +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi -if expr a : '\(a\)' >/dev/null 2>&1; then +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in +-n*) + case `echo 'x\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + *) ECHO_C='\c';; + esac;; +*) + ECHO_N='-n';; +esac +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi rm -f conf$$ conf$$.exe conf$$.file -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links - as_ln_s='cp -p' - else +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -p' fi -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln else as_ln_s='cp -p' fi -rm -f conf$$ conf$$.exe conf$$.file +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then as_mkdir_p=: else + test -d ./-p && rmdir ./-p as_mkdir_p=false fi -as_executable_p="test -f" +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" # Sed expression to map a string onto a valid variable name. -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" - - -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -# CDPATH. -$as_unset CDPATH exec 6>&1 -# Open the log real soon, to keep \$[0] and so on meaningful, and to +# Save the log message, to keep $[0] and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. Logging --version etc. is OK. -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX -} >&5 -cat >&5 <<_CSEOF - +# values after options handling. +ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.57. Invocation command line was +generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -27034,125 +29771,107 @@ generated by GNU Autoconf 2.57. Invocation command line was CONFIG_COMMANDS = $CONFIG_COMMANDS $ $0 $@ -_CSEOF -echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 -echo >&5 +on `(hostname || uname -n) 2>/dev/null | sed 1q` +" + _ACEOF -# Files that config.status was made for. -if test -n "$ac_config_files"; then - echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS -fi +case $ac_config_files in *" +"*) set x $ac_config_files; shift; ac_config_files=$*;; +esac -if test -n "$ac_config_headers"; then - echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS -fi -if test -n "$ac_config_links"; then - echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS -fi -if test -n "$ac_config_commands"; then - echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS -fi +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +# Files that config.status was made for. +config_files="$ac_config_files" -cat >>$CONFIG_STATUS <<\_ACEOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ \`$as_me' instantiates files from templates according to the current configuration. -Usage: $0 [OPTIONS] [FILE]... +Usage: $0 [OPTION]... [FILE]... -h, --help print this help, then exit - -V, --version print version number, then exit - -q, --quiet do not print progress messages + -V, --version print version number and configuration settings, then exit + -q, --quiet, --silent + do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] + --file=FILE[:TEMPLATE] instantiate the configuration file FILE Configuration files: $config_files Report bugs to ." -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.57, - with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" +configured by $0, generated by GNU Autoconf 2.63, + with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. +Copyright (C) 2008 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." -srcdir=$srcdir + +ac_pwd='$ac_pwd' +srcdir='$srcdir' +AWK='$AWK' +test -n "\$AWK" || AWK=awk _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -# If no file are specified by the user, then we need to provide default -# value. By we need to know if files were specified by the user. +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# The default lists apply if the user does not specify any file. ac_need_defaults=: while test $# != 0 do case $1 in --*=*) - ac_option=`expr "x$1" : 'x\([^=]*\)='` - ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; - -*) + *) ac_option=$1 ac_optarg=$2 ac_shift=shift ;; - *) # This is not an option, so the user has probably given explicit - # arguments. - ac_option=$1 - ac_need_defaults=false;; esac case $ac_option in # Handling of the options. -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; - --version | --vers* | -V ) - echo "$ac_cs_version"; exit 0 ;; - --he | --h) - # Conflict between --help and --header - { { echo "$as_me:$LINENO: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; };; - --help | --hel | -h ) - echo "$ac_cs_usage"; exit 0 ;; - --debug | --d* | -d ) + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + $as_echo "$ac_cs_version"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift - CONFIG_FILES="$CONFIG_FILES $ac_optarg" - ac_need_defaults=false;; - --header | --heade | --head | --hea ) - $ac_shift - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" ac_need_defaults=false;; + --he | --h | --help | --hel | -h ) + $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; # This is an error. - -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2;} + -*) { $as_echo "$as_me: error: unrecognized option: $1 +Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } ;; - *) ac_config_targets="$ac_config_targets $1" ;; + *) ac_config_targets="$ac_config_targets $1" + ac_need_defaults=false ;; esac shift @@ -27166,31 +29885,47 @@ if $ac_cs_silent; then fi _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + shift + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + CONFIG_SHELL='$SHELL' + export CONFIG_SHELL + exec "\$@" fi _ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX + $as_echo "$ac_log" +} >&5 +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - - -cat >>$CONFIG_STATUS <<\_ACEOF +# Handling of arguments. for ac_config_target in $ac_config_targets do - case "$ac_config_target" in - # Handling of arguments. - "set_soenv" ) CONFIG_FILES="$CONFIG_FILES set_soenv" ;; - "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + case $ac_config_target in + "set_soenv") CONFIG_FILES="$CONFIG_FILES set_soenv" ;; + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + + *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 +$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac done + # If the user did not use the arguments to specify the items to instantiate, # then the envvar interface is used. Set only those that are not. # We use the long form for the default assignment because of an extremely @@ -27200,622 +29935,464 @@ if $ac_need_defaults; then fi # Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason to put it here, and in addition, +# simply because there is no reason against having it here, and in addition, # creating and moving files from /tmp can sometimes cause problems. -# Create a temporary directory, and hook for its removal unless debugging. +# Hook for its removal unless debugging. +# Note that there is a small window in which the directory will not be cleaned: +# after its creation but before its name has been assigned to `$tmp'. $debug || { - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 + tmp= + trap 'exit_status=$? + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status +' 0 trap '{ (exit 1); exit 1; }' 1 2 13 15 } - # Create a (secure) tmp directory for tmp files. { - tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { - tmp=./confstat$$-$RANDOM - (umask 077 && mkdir $tmp) + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") } || { - echo "$me: cannot create a temporary directory in ." >&2 + $as_echo "$as_me: cannot create a temporary directory in ." >&2 { (exit 1); exit 1; } } -_ACEOF +# Set up the scripts for CONFIG_FILES section. +# No need to generate them if there are no CONFIG_FILES. +# This happens for instance with `./config.status config.h'. +if test -n "$CONFIG_FILES"; then -cat >>$CONFIG_STATUS <<_ACEOF -# -# CONFIG_FILES section. -# +ac_cr=' ' +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then + ac_cs_awk_cr='\\r' +else + ac_cs_awk_cr=$ac_cr +fi -# No need to generate the scripts if there are no CONFIG_FILES. -# This happens for instance when ./config.status config.h -if test -n "\$CONFIG_FILES"; then - # Protect against being on the right side of a sed subst in config.status. - sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; - s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF -s,@SHELL@,$SHELL,;t t -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t -s,@exec_prefix@,$exec_prefix,;t t -s,@prefix@,$prefix,;t t -s,@program_transform_name@,$program_transform_name,;t t -s,@bindir@,$bindir,;t t -s,@sbindir@,$sbindir,;t t -s,@libexecdir@,$libexecdir,;t t -s,@datadir@,$datadir,;t t -s,@sysconfdir@,$sysconfdir,;t t -s,@sharedstatedir@,$sharedstatedir,;t t -s,@localstatedir@,$localstatedir,;t t -s,@libdir@,$libdir,;t t -s,@includedir@,$includedir,;t t -s,@oldincludedir@,$oldincludedir,;t t -s,@infodir@,$infodir,;t t -s,@mandir@,$mandir,;t t -s,@build_alias@,$build_alias,;t t -s,@host_alias@,$host_alias,;t t -s,@target_alias@,$target_alias,;t t -s,@DEFS@,$DEFS,;t t -s,@ECHO_C@,$ECHO_C,;t t -s,@ECHO_N@,$ECHO_N,;t t -s,@ECHO_T@,$ECHO_T,;t t -s,@LIBS@,$LIBS,;t t -s,@EGREP@,$EGREP,;t t -s,@AWK@,$AWK,;t t -s,@SED@,$SED,;t t -s,@LOCAL_SOLENV@,$LOCAL_SOLENV,;t t -s,@_solenv@,$_solenv,;t t -s,@UPD@,$UPD,;t t -s,@SOURCEVERSION@,$SOURCEVERSION,;t t -s,@build@,$build,;t t -s,@build_cpu@,$build_cpu,;t t -s,@build_vendor@,$build_vendor,;t t -s,@build_os@,$build_os,;t t -s,@host@,$host,;t t -s,@host_cpu@,$host_cpu,;t t -s,@host_vendor@,$host_vendor,;t t -s,@host_os@,$host_os,;t t -s,@target@,$target,;t t -s,@target_cpu@,$target_cpu,;t t -s,@target_vendor@,$target_vendor,;t t -s,@target_os@,$target_os,;t t -s,@GNUTAR@,$GNUTAR,;t t -s,@OSVERSION@,$OSVERSION,;t t -s,@PTHREAD_CFLAGS@,$PTHREAD_CFLAGS,;t t -s,@PTHREAD_LIBS@,$PTHREAD_LIBS,;t t -s,@ENABLE_CRASHDUMP@,$ENABLE_CRASHDUMP,;t t -s,@VC_STANDARD@,$VC_STANDARD,;t t -s,@ENABLE_WERROR@,$ENABLE_WERROR,;t t -s,@ENABLE_DEBUG@,$ENABLE_DEBUG,;t t -s,@PRODUCT@,$PRODUCT,;t t -s,@PROFULLSWITCH@,$PROFULLSWITCH,;t t -s,@PROEXT@,$PROEXT,;t t -s,@ENABLE_SYMBOLS@,$ENABLE_SYMBOLS,;t t -s,@DISABLE_STRIP@,$DISABLE_STRIP,;t t -s,@ENABLE_CUPS@,$ENABLE_CUPS,;t t -s,@ENABLE_FONTCONFIG@,$ENABLE_FONTCONFIG,;t t -s,@WITH_BINFILTER@,$WITH_BINFILTER,;t t -s,@ENABLE_DIRECTX@,$ENABLE_DIRECTX,;t t -s,@DISABLE_ACTIVEX@,$DISABLE_ACTIVEX,;t t -s,@DISABLE_ATL@,$DISABLE_ATL,;t t -s,@ENABLE_RPATH@,$ENABLE_RPATH,;t t -s,@WITH_MYSPELL_DICTS@,$WITH_MYSPELL_DICTS,;t t -s,@SYSTEM_DICTS@,$SYSTEM_DICTS,;t t -s,@DICT_SYSTEM_DIR@,$DICT_SYSTEM_DIR,;t t -s,@HYPH_SYSTEM_DIR@,$HYPH_SYSTEM_DIR,;t t -s,@THES_SYSTEM_DIR@,$THES_SYSTEM_DIR,;t t -s,@USE_SHELL@,$USE_SHELL,;t t -s,@WITH_MINGWIN@,$WITH_MINGWIN,;t t -s,@SHELLPATH@,$SHELLPATH,;t t -s,@GCC_HOME@,$GCC_HOME,;t t -s,@CC@,$CC,;t t -s,@CFLAGS@,$CFLAGS,;t t -s,@LDFLAGS@,$LDFLAGS,;t t -s,@CPPFLAGS@,$CPPFLAGS,;t t -s,@ac_ct_CC@,$ac_ct_CC,;t t -s,@EXEEXT@,$EXEEXT,;t t -s,@OBJEXT@,$OBJEXT,;t t -s,@COMPATH@,$COMPATH,;t t -s,@GCCVER@,$GCCVER,;t t -s,@HAVE_LD_BSYMBOLIC_FUNCTIONS@,$HAVE_LD_BSYMBOLIC_FUNCTIONS,;t t -s,@ENABLE_PCH@,$ENABLE_PCH,;t t -s,@NO_HIDS@,$NO_HIDS,;t t -s,@GNUMAKE@,$GNUMAKE,;t t -s,@_cc@,$_cc,;t t -s,@HAVE_LD_HASH_STYLE@,$HAVE_LD_HASH_STYLE,;t t -s,@PERL@,$PERL,;t t -s,@MSPDB_PATH@,$MSPDB_PATH,;t t -s,@COMEX@,$COMEX,;t t -s,@USE_MINGW@,$USE_MINGW,;t t -s,@MIDL_PATH@,$MIDL_PATH,;t t -s,@CSC_PATH@,$CSC_PATH,;t t -s,@FRAME_HOME@,$FRAME_HOME,;t t -s,@CPP@,$CPP,;t t -s,@CXX@,$CXX,;t t -s,@CXXFLAGS@,$CXXFLAGS,;t t -s,@ac_ct_CXX@,$ac_ct_CXX,;t t -s,@CXXCPP@,$CXXCPP,;t t -s,@SIZEOF_LONG@,$SIZEOF_LONG,;t t -s,@WORDS_BIGENDIAN@,$WORDS_BIGENDIAN,;t t -s,@LFS_CFLAGS@,$LFS_CFLAGS,;t t -s,@ENABLE_VBA@,$ENABLE_VBA,;t t -s,@VBA_EXTENSION@,$VBA_EXTENSION,;t t -s,@PAM@,$PAM,;t t -s,@NEW_SHADOW_API@,$NEW_SHADOW_API,;t t -s,@PAM_LINK@,$PAM_LINK,;t t -s,@CRYPT_LINK@,$CRYPT_LINK,;t t -s,@GXX_INCLUDE_PATH@,$GXX_INCLUDE_PATH,;t t -s,@MINGW_LIB_INCLUDE_PATH@,$MINGW_LIB_INCLUDE_PATH,;t t -s,@STLPORT4@,$STLPORT4,;t t -s,@STLPORT_VER@,$STLPORT_VER,;t t -s,@USE_SYSTEM_STL@,$USE_SYSTEM_STL,;t t -s,@HAVE_GCC_VISIBILITY_FEATURE@,$HAVE_GCC_VISIBILITY_FEATURE,;t t -s,@ALLOC@,$ALLOC,;t t -s,@BUILD_VER_STRING@,$BUILD_VER_STRING,;t t -s,@SOLAR_JAVA@,$SOLAR_JAVA,;t t -s,@JAVAINTERPRETER@,$JAVAINTERPRETER,;t t -s,@JAVACOMPILER@,$JAVACOMPILER,;t t -s,@JAVACISGCJ@,$JAVACISGCJ,;t t -s,@JAVADOC@,$JAVADOC,;t t -s,@AWTLIB@,$AWTLIB,;t t -s,@JAVAAOTCOMPILER@,$JAVAAOTCOMPILER,;t t -s,@JAVA_HOME@,$JAVA_HOME,;t t -s,@JDK@,$JDK,;t t -s,@JAVAFLAGS@,$JAVAFLAGS,;t t -s,@DMAKE@,$DMAKE,;t t -s,@BUILD_DMAKE@,$BUILD_DMAKE,;t t -s,@EPM@,$EPM,;t t -s,@DPKG@,$DPKG,;t t -s,@PKGMK@,$PKGMK,;t t -s,@BUILD_EPM@,$BUILD_EPM,;t t -s,@PKGFORMAT@,$PKGFORMAT,;t t -s,@RPM@,$RPM,;t t -s,@GPERF@,$GPERF,;t t -s,@MINGWCXX@,$MINGWCXX,;t t -s,@ac_ct_MINGWCXX@,$ac_ct_MINGWCXX,;t t -s,@MINGWSTRIP@,$MINGWSTRIP,;t t -s,@ac_ct_MINGWSTRIP@,$ac_ct_MINGWSTRIP,;t t -s,@BUILD_UNOWINREG@,$BUILD_UNOWINREG,;t t -s,@BUILD_QADEVOOO@,$BUILD_QADEVOOO,;t t -s,@SYSTEM_STDLIBS@,$SYSTEM_STDLIBS,;t t -s,@SYSTEM_ZLIB@,$SYSTEM_ZLIB,;t t -s,@SYSTEM_JPEG@,$SYSTEM_JPEG,;t t -s,@SYSTEM_EXPAT@,$SYSTEM_EXPAT,;t t -s,@PKG_CONFIG@,$PKG_CONFIG,;t t -s,@LIBWPD_CFLAGS@,$LIBWPD_CFLAGS,;t t -s,@LIBWPD_LIBS@,$LIBWPD_LIBS,;t t -s,@SYSTEM_LIBWPD@,$SYSTEM_LIBWPD,;t t -s,@FREETYPE_CFLAGS@,$FREETYPE_CFLAGS,;t t -s,@FREETYPE_LIBS@,$FREETYPE_LIBS,;t t -s,@USE_FT_EMBOLDEN@,$USE_FT_EMBOLDEN,;t t -s,@LIBXSLT_CFLAGS@,$LIBXSLT_CFLAGS,;t t -s,@LIBXSLT_LIBS@,$LIBXSLT_LIBS,;t t -s,@XSLTPROC@,$XSLTPROC,;t t -s,@SYSTEM_LIBXSLT@,$SYSTEM_LIBXSLT,;t t -s,@LIBXML_CFLAGS@,$LIBXML_CFLAGS,;t t -s,@LIBXML_LIBS@,$LIBXML_LIBS,;t t -s,@SYSTEM_LIBXML@,$SYSTEM_LIBXML,;t t -s,@PYTHON@,$PYTHON,;t t -s,@PYTHON_VERSION@,$PYTHON_VERSION,;t t -s,@PYTHON_PREFIX@,$PYTHON_PREFIX,;t t -s,@PYTHON_EXEC_PREFIX@,$PYTHON_EXEC_PREFIX,;t t -s,@PYTHON_PLATFORM@,$PYTHON_PLATFORM,;t t -s,@pythondir@,$pythondir,;t t -s,@pkgpythondir@,$pkgpythondir,;t t -s,@pyexecdir@,$pyexecdir,;t t -s,@pkgpyexecdir@,$pkgpyexecdir,;t t -s,@BZIP2@,$BZIP2,;t t -s,@SYSTEM_PYTHON@,$SYSTEM_PYTHON,;t t -s,@PYTHON_CFLAGS@,$PYTHON_CFLAGS,;t t -s,@PYTHON_LIBS@,$PYTHON_LIBS,;t t -s,@HOME@,$HOME,;t t -s,@SYSTEM_DB@,$SYSTEM_DB,;t t -s,@DB_VERSION@,$DB_VERSION,;t t -s,@DB_INCLUDES@,$DB_INCLUDES,;t t -s,@DB_JAR@,$DB_JAR,;t t -s,@SYSTEM_LUCENE@,$SYSTEM_LUCENE,;t t -s,@LUCENE_CORE_JAR@,$LUCENE_CORE_JAR,;t t -s,@LUCENE_ANALYZERS_JAR@,$LUCENE_ANALYZERS_JAR,;t t -s,@SYSTEM_HSQLDB@,$SYSTEM_HSQLDB,;t t -s,@HSQLDB_JAR@,$HSQLDB_JAR,;t t -s,@SYSTEM_BSH@,$SYSTEM_BSH,;t t -s,@BSH_JAR@,$BSH_JAR,;t t -s,@SERIALIZER_JAR@,$SERIALIZER_JAR,;t t -s,@SYSTEM_SAXON@,$SYSTEM_SAXON,;t t -s,@SAXON_JAR@,$SAXON_JAR,;t t -s,@CURLCONFIG@,$CURLCONFIG,;t t -s,@SYSTEM_CURL@,$SYSTEM_CURL,;t t -s,@CURL_CFLAGS@,$CURL_CFLAGS,;t t -s,@CURL_LIBS@,$CURL_LIBS,;t t -s,@SYSTEM_BOOST@,$SYSTEM_BOOST,;t t -s,@SYSTEM_VIGRA@,$SYSTEM_VIGRA,;t t -s,@SYSTEM_ODBC_HEADERS@,$SYSTEM_ODBC_HEADERS,;t t -s,@WITH_MOZILLA@,$WITH_MOZILLA,;t t -s,@WITH_LDAP@,$WITH_LDAP,;t t -s,@WITH_OPENLDAP@,$WITH_OPENLDAP,;t t -s,@MOZ_NSS_CFLAGS@,$MOZ_NSS_CFLAGS,;t t -s,@MOZ_NSS_LIBS@,$MOZ_NSS_LIBS,;t t -s,@NSS_LIB@,$NSS_LIB,;t t -s,@MOZ_NSPR_CFLAGS@,$MOZ_NSPR_CFLAGS,;t t -s,@MOZ_NSPR_LIBS@,$MOZ_NSPR_LIBS,;t t -s,@NSPR_LIB@,$NSPR_LIB,;t t -s,@MOZILLAXPCOM_CFLAGS@,$MOZILLAXPCOM_CFLAGS,;t t -s,@MOZILLAXPCOM_LIBS@,$MOZILLAXPCOM_LIBS,;t t -s,@MOZILLA_VERSION@,$MOZILLA_VERSION,;t t -s,@MOZILLA_TOOLKIT@,$MOZILLA_TOOLKIT,;t t -s,@MOZGTK2_CFLAGS@,$MOZGTK2_CFLAGS,;t t -s,@MOZGTK2_LIBS@,$MOZGTK2_LIBS,;t t -s,@MOZLIBREQ_CFLAGS@,$MOZLIBREQ_CFLAGS,;t t -s,@MOZLIBREQ_LIBS@,$MOZLIBREQ_LIBS,;t t -s,@BUILD_MOZAB@,$BUILD_MOZAB,;t t -s,@SYSTEM_MOZILLA@,$SYSTEM_MOZILLA,;t t -s,@MOZ_FLAVOUR@,$MOZ_FLAVOUR,;t t -s,@MOZ_INC@,$MOZ_INC,;t t -s,@MOZ_LIB@,$MOZ_LIB,;t t -s,@MOZ_LIB_XPCOM@,$MOZ_LIB_XPCOM,;t t -s,@MOZ_LDAP_CFLAGS@,$MOZ_LDAP_CFLAGS,;t t -s,@SYSTEM_SANE_HEADER@,$SYSTEM_SANE_HEADER,;t t -s,@SYSTEM_GENBRK@,$SYSTEM_GENBRK,;t t -s,@SYSTEM_GENCCODE@,$SYSTEM_GENCCODE,;t t -s,@SYSTEM_GENCMN@,$SYSTEM_GENCMN,;t t -s,@SYSTEM_ICU@,$SYSTEM_ICU,;t t -s,@X_CFLAGS@,$X_CFLAGS,;t t -s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t -s,@X_LIBS@,$X_LIBS,;t t -s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t -s,@XINC@,$XINC,;t t -s,@XLIB@,$XLIB,;t t -s,@XAU_LIBS@,$XAU_LIBS,;t t -s,@DISABLE_XAW@,$DISABLE_XAW,;t t -s,@SYSTEM_XRENDER_HEADERS@,$SYSTEM_XRENDER_HEADERS,;t t -s,@XRENDER_LINK@,$XRENDER_LINK,;t t -s,@XRANDR_CFLAGS@,$XRANDR_CFLAGS,;t t -s,@XRANDR_LIBS@,$XRANDR_LIBS,;t t -s,@XRANDR_DLOPEN@,$XRANDR_DLOPEN,;t t -s,@ENABLE_RANDR@,$ENABLE_RANDR,;t t -s,@DISABLE_NEON@,$DISABLE_NEON,;t t -s,@NEON_CFLAGS@,$NEON_CFLAGS,;t t -s,@NEON_LIBS@,$NEON_LIBS,;t t -s,@OPENSSL_CFLAGS@,$OPENSSL_CFLAGS,;t t -s,@OPENSSL_LIBS@,$OPENSSL_LIBS,;t t -s,@SYSTEM_OPENSSL@,$SYSTEM_OPENSSL,;t t -s,@SYSTEM_NEON@,$SYSTEM_NEON,;t t -s,@NEON_VERSION@,$NEON_VERSION,;t t -s,@ENABLE_AGG@,$ENABLE_AGG,;t t -s,@AGG_CFLAGS@,$AGG_CFLAGS,;t t -s,@AGG_LIBS@,$AGG_LIBS,;t t -s,@SYSTEM_AGG@,$SYSTEM_AGG,;t t -s,@AGG_VERSION@,$AGG_VERSION,;t t -s,@REDLAND_CFLAGS@,$REDLAND_CFLAGS,;t t -s,@REDLAND_LIBS@,$REDLAND_LIBS,;t t -s,@SYSTEM_REDLAND@,$SYSTEM_REDLAND,;t t -s,@HUNSPELL_CFLAGS@,$HUNSPELL_CFLAGS,;t t -s,@HUNSPELL_LIBS@,$HUNSPELL_LIBS,;t t -s,@SYSTEM_HUNSPELL@,$SYSTEM_HUNSPELL,;t t -s,@SYSTEM_HYPH@,$SYSTEM_HYPH,;t t -s,@HYPHEN_LIB@,$HYPHEN_LIB,;t t -s,@SYSTEM_MYTHES@,$SYSTEM_MYTHES,;t t -s,@SYSTEM_LPSOLVE@,$SYSTEM_LPSOLVE,;t t -s,@PSDK_HOME@,$PSDK_HOME,;t t -s,@WINDOWS_VISTA_PSDK@,$WINDOWS_VISTA_PSDK,;t t -s,@DIRECTXSDK_HOME@,$DIRECTXSDK_HOME,;t t -s,@DIRECTXSDK_LIB@,$DIRECTXSDK_LIB,;t t -s,@NSIS_PATH@,$NSIS_PATH,;t t -s,@BISON@,$BISON,;t t -s,@FLEX@,$FLEX,;t t -s,@PATCH@,$PATCH,;t t -s,@GNUCP@,$GNUCP,;t t -s,@GNUPATCH@,$GNUPATCH,;t t -s,@CYGWIN_PATH@,$CYGWIN_PATH,;t t -s,@ML_EXE@,$ML_EXE,;t t -s,@ASM_HOME@,$ASM_HOME,;t t -s,@ZIP@,$ZIP,;t t -s,@UNZIP@,$UNZIP,;t t -s,@ZIP_HOME@,$ZIP_HOME,;t t -s,@WITH_GPC@,$WITH_GPC,;t t -s,@ENABLE_GTK@,$ENABLE_GTK,;t t -s,@ENABLE_KDE@,$ENABLE_KDE,;t t -s,@ENABLE_KDE4@,$ENABLE_KDE4,;t t -s,@GCONF_CFLAGS@,$GCONF_CFLAGS,;t t -s,@GCONF_LIBS@,$GCONF_LIBS,;t t -s,@ENABLE_GCONF@,$ENABLE_GCONF,;t t -s,@GNOMEVFS_CFLAGS@,$GNOMEVFS_CFLAGS,;t t -s,@GNOMEVFS_LIBS@,$GNOMEVFS_LIBS,;t t -s,@ENABLE_GNOMEVFS@,$ENABLE_GNOMEVFS,;t t -s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t -s,@GTK_LIBS@,$GTK_LIBS,;t t -s,@DBUS_CFLAGS@,$DBUS_CFLAGS,;t t -s,@DBUS_LIBS@,$DBUS_LIBS,;t t -s,@GIO_CFLAGS@,$GIO_CFLAGS,;t t -s,@GIO_LIBS@,$GIO_LIBS,;t t -s,@ENABLE_GIO@,$ENABLE_GIO,;t t -s,@ENABLE_DBUS@,$ENABLE_DBUS,;t t -s,@ENABLE_SYSTRAY_GTK@,$ENABLE_SYSTRAY_GTK,;t t -s,@CAIRO_CFLAGS@,$CAIRO_CFLAGS,;t t -s,@CAIRO_LIBS@,$CAIRO_LIBS,;t t -s,@ENABLE_CAIRO@,$ENABLE_CAIRO,;t t -s,@BUILD_PIXMAN@,$BUILD_PIXMAN,;t t -s,@SYSTEM_CAIRO@,$SYSTEM_CAIRO,;t t -s,@ENABLE_OPENGL@,$ENABLE_OPENGL,;t t -s,@ENABLE_MINIMIZER@,$ENABLE_MINIMIZER,;t t -s,@ENABLE_PRESENTER_SCREEN@,$ENABLE_PRESENTER_SCREEN,;t t -s,@POPPLER_CFLAGS@,$POPPLER_CFLAGS,;t t -s,@POPPLER_LIBS@,$POPPLER_LIBS,;t t -s,@ENABLE_PDFIMPORT@,$ENABLE_PDFIMPORT,;t t -s,@SYSTEM_POPPLER@,$SYSTEM_POPPLER,;t t -s,@ENABLE_MEDIAWIKI@,$ENABLE_MEDIAWIKI,;t t -s,@SYSTEM_SERVLETAPI@,$SYSTEM_SERVLETAPI,;t t -s,@SERVLETAPI_JAR@,$SERVLETAPI_JAR,;t t -s,@ENABLE_REPORTBUILDER@,$ENABLE_REPORTBUILDER,;t t -s,@SYSTEM_JFREEREPORT@,$SYSTEM_JFREEREPORT,;t t -s,@SAC_JAR@,$SAC_JAR,;t t -s,@LIBXML_JAR@,$LIBXML_JAR,;t t -s,@FLUTE_JAR@,$FLUTE_JAR,;t t -s,@JFREEREPORT_JAR@,$JFREEREPORT_JAR,;t t -s,@LIBBASE_JAR@,$LIBBASE_JAR,;t t -s,@LIBLAYOUT_JAR@,$LIBLAYOUT_JAR,;t t -s,@LIBLOADER_JAR@,$LIBLOADER_JAR,;t t -s,@LIBFORMULA_JAR@,$LIBFORMULA_JAR,;t t -s,@LIBREPOSITORY_JAR@,$LIBREPOSITORY_JAR,;t t -s,@LIBFONTS_JAR@,$LIBFONTS_JAR,;t t -s,@LIBSERIALIZER_JAR@,$LIBSERIALIZER_JAR,;t t -s,@SYSTEM_APACHE_COMMONS@,$SYSTEM_APACHE_COMMONS,;t t -s,@COMMONS_CODEC_JAR@,$COMMONS_CODEC_JAR,;t t -s,@COMMONS_LANG_JAR@,$COMMONS_LANG_JAR,;t t -s,@COMMONS_HTTPCLIENT_JAR@,$COMMONS_HTTPCLIENT_JAR,;t t -s,@COMMONS_LOGGING_JAR@,$COMMONS_LOGGING_JAR,;t t -s,@MOC@,$MOC,;t t -s,@KDE_CFLAGS@,$KDE_CFLAGS,;t t -s,@KDE_LIBS@,$KDE_LIBS,;t t -s,@MOC4@,$MOC4,;t t -s,@KDE4_CFLAGS@,$KDE4_CFLAGS,;t t -s,@KDE4_LIBS@,$KDE4_LIBS,;t t -s,@ENABLE_LOCKDOWN@,$ENABLE_LOCKDOWN,;t t -s,@GOBJECT_CFLAGS@,$GOBJECT_CFLAGS,;t t -s,@GOBJECT_LIBS@,$GOBJECT_LIBS,;t t -s,@ENABLE_EVOAB2@,$ENABLE_EVOAB2,;t t -s,@ENABLE_KAB@,$ENABLE_KAB,;t t -s,@WITH_FONTOOO@,$WITH_FONTOOO,;t t -s,@SYSTEM_MSPACK@,$SYSTEM_MSPACK,;t t -s,@WITH_FONTS@,$WITH_FONTS,;t t -s,@WITHOUT_PPDS@,$WITHOUT_PPDS,;t t -s,@WITHOUT_AFMS@,$WITHOUT_AFMS,;t t -s,@SCPDEFS@,$SCPDEFS,;t t -s,@USE_XINERAMA@,$USE_XINERAMA,;t t -s,@XINERAMA_LINK@,$XINERAMA_LINK,;t t -s,@ANT@,$ANT,;t t -s,@ANT_HOME@,$ANT_HOME,;t t -s,@ANT_LIB@,$ANT_LIB,;t t -s,@WITH_LANG@,$WITH_LANG,;t t -s,@WITH_POOR_HELP_LOCALIZATIONS@,$WITH_POOR_HELP_LOCALIZATIONS,;t t -s,@WITH_DICT@,$WITH_DICT,;t t -s,@INTRO_BITMAPS@,$INTRO_BITMAPS,;t t -s,@ABOUT_BITMAPS@,$ABOUT_BITMAPS,;t t -s,@OOO_VENDOR@,$OOO_VENDOR,;t t -s,@UNIXWRAPPERNAME@,$UNIXWRAPPERNAME,;t t -s,@ENABLE_STATIC_GTK@,$ENABLE_STATIC_GTK,;t t -s,@ENABLE_LAYOUT@,$ENABLE_LAYOUT,;t t -s,@VERBOSE@,$VERBOSE,;t t -s,@LOCAL_SOLVER@,$LOCAL_SOLVER,;t t -s,@BUILD_TYPE@,$BUILD_TYPE,;t t -s,@LIBOBJS@,$LIBOBJS,;t t -s,@LTLIBOBJS@,$LTLIBOBJS,;t t -CEOF - -_ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF - # Split the substitutions into bite-sized pieces for seds with - # small command number limits, like on Digital OSF/1 and HP-UX. - ac_max_sed_lines=48 - ac_sed_frag=1 # Number of current file. - ac_beg=1 # First line for current file. - ac_end=$ac_max_sed_lines # Line after last line for current file. - ac_more_lines=: - ac_sed_cmds= - while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - else - sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - fi - if test ! -s $tmp/subs.frag; then - ac_more_lines=false - else - # The purpose of the label and of the branching condition is to - # speed up the sed processing (if there are no `@' at all, there - # is no need to browse any of the substitutions). - # These are the two extra sed commands mentioned above. - (echo ':t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" - else - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" - fi - ac_sed_frag=`expr $ac_sed_frag + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_lines` - fi - done - if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat +echo 'BEGIN {' >"$tmp/subs1.awk" && +_ACEOF + + +{ + echo "cat >conf$$subs.awk <<_ACEOF" && + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" +} >conf$$subs.sh || + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } +ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + . ./conf$$subs.sh || + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` + if test $ac_delim_n = $ac_delim_num; then + break + elif $ac_last_try; then + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi -fi # test -n "$CONFIG_FILES" +done +rm -f conf$$subs.sh +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>"\$tmp/subs1.awk" <<\\_ACAWK && _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; +sed -n ' +h +s/^/S["/; s/!.*/"]=/ +p +g +s/^[^!]*!// +:repl +t repl +s/'"$ac_delim"'$// +t delim +:nl +h +s/\(.\{148\}\).*/\1/ +t more1 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ +p +n +b repl +:more1 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t nl +:delim +h +s/\(.\{148\}\).*/\1/ +t more2 +s/["\\]/\\&/g; s/^/"/; s/$/"/ +p +b +:more2 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t delim +' >$CONFIG_STATUS || ac_write_fail=1 +rm -f conf$$subs.awk +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +_ACAWK +cat >>"\$tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" + +} +{ + line = $ 0 + nfields = split(line, field, "@") + substed = 0 + len = length(field[1]) + for (i = 2; i < nfields; i++) { + key = field[i] + keylen = length(key) + if (S_is_set[key]) { + value = S[key] + line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) + len += length(value) + length(field[++i]) + substed = 1 + } else + len += 1 + keylen + } + + print line +} + +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" +else + cat +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ + || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 +$as_echo "$as_me: error: could not setup config files machinery" >&2;} + { (exit 1); exit 1; }; } +_ACEOF + +# VPATH may cause trouble with some makes, so we remove $(srcdir), +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty +# (actually we leave an empty line to preserve line numbers). +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=/{ +s/:*\$(srcdir):*/:/ +s/:*\${srcdir}:*/:/ +s/:*@srcdir@:*/:/ +s/^\([^=]*=[ ]*\):*/\1/ +s/:*$// +s/^[^=]*=[ ]*$// +}' +fi + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +fi # test -n "$CONFIG_FILES" + + +eval set X " :F $CONFIG_FILES " +shift +for ac_tag +do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; esac + case $ac_mode$ac_tag in + :[FHL]*:*);; + :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 +$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} + { (exit 1); exit 1; }; };; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac + ac_save_IFS=$IFS + IFS=: + set x $ac_tag + IFS=$ac_save_IFS + shift + ac_file=$1 + shift - # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`(dirname "$ac_file") 2>/dev/null || + case $ac_mode in + :L) ac_source=$1;; + :[FH]) + ac_file_inputs= + for ac_f + do + case $ac_f in + -) ac_f="$tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. + test -f "$ac_f" || + case $ac_f in + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || + { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 +$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} + { (exit 1); exit 1; }; };; + esac + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + ac_file_inputs="$ac_file_inputs '$ac_f'" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + configure_input='Generated from '` + $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + `' by configure.' + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" + { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 +$as_echo "$as_me: creating $ac_file" >&6;} + fi + # Neutralize special characters interpreted by sed in replacement strings. + case $configure_input in #( + *\&* | *\|* | *\\* ) + ac_sed_conf_input=`$as_echo "$configure_input" | + sed 's/[\\\\&|]/\\\\&/g'`;; #( + *) ac_sed_conf_input=$configure_input;; + esac + + case $ac_tag in + *:-:* | *:-) cat >"$tmp/stdin" \ + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +$as_echo "$as_me: error: could not create $ac_file" >&2;} + { (exit 1); exit 1; }; } ;; + esac + ;; + esac + + ac_dir=`$as_dirname -- "$ac_file" || $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + { as_dir="$ac_dir" + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} { (exit 1); exit 1; }; }; } - ac_builddir=. -if test "$ac_dir" != .; then - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix case $srcdir in - .) # No --srcdir option. We are building in place. + .) # We are building in place. ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be -# absolute. -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` - - - - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - configure_input= - else - configure_input="$ac_file. " - fi - configure_input=$configure_input"Generated from `echo $ac_file_in | - sed 's,.*/,,'` by configure." - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo $f;; - *) # Relative - if test -f "$f"; then - # Build tree - echo $f - elif test -f "$srcdir/$f"; then - # Source tree - echo $srcdir/$f - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + + case $ac_mode in + :F) + # + # CONFIG_FILE + # + +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# If the template does not know about datarootdir, expand it. +# FIXME: This hack should be removed a few years after 2.60. +ac_datarootdir_hack=; ac_datarootdir_seen= + +ac_sed_dataroot=' +/datarootdir/ { + p + q +} +/@datadir@/p +/@docdir@/p +/@infodir@/p +/@localedir@/p +/@mandir@/p +' +case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in +*datarootdir*) ac_datarootdir_seen=yes;; +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) + { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g + s&\\\${datarootdir}&$datarootdir&g' ;; +esac _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF - sed "$ac_vpsub + +# Neutralize VPATH when `$srcdir' = `.'. +# Shell code in configure.ac might set extrasub. +# FIXME: do we really want to maintain this feature? +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_sed_extra="$ac_vpsub $extrasub _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s,@configure_input@,$configure_input,;t t -s,@srcdir@,$ac_srcdir,;t t -s,@abs_srcdir@,$ac_abs_srcdir,;t t -s,@top_srcdir@,$ac_top_srcdir,;t t -s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t -s,@builddir@,$ac_builddir,;t t -s,@abs_builddir@,$ac_abs_builddir,;t t -s,@top_builddir@,$ac_top_builddir,;t t -s,@abs_top_builddir@,$ac_abs_top_builddir,;t t -" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out - rm -f $tmp/stdin - if test x"$ac_file" != x-; then - mv $tmp/out $ac_file - else - cat $tmp/out - rm -f $tmp/out - fi +s|@configure_input@|$ac_sed_conf_input|;t t +s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@top_build_prefix@&$ac_top_build_prefix&;t t +s&@srcdir@&$ac_srcdir&;t t +s&@abs_srcdir@&$ac_abs_srcdir&;t t +s&@top_srcdir@&$ac_top_srcdir&;t t +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t +s&@builddir@&$ac_builddir&;t t +s&@abs_builddir@&$ac_abs_builddir&;t t +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +$ac_datarootdir_hack +" +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +$as_echo "$as_me: error: could not create $ac_file" >&2;} + { (exit 1); exit 1; }; } + +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&5 +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&2;} + + rm -f "$tmp/stdin" + case $ac_file in + -) cat "$tmp/out" && rm -f "$tmp/out";; + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + esac \ + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +$as_echo "$as_me: error: could not create $ac_file" >&2;} + { (exit 1); exit 1; }; } + ;; -done -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF + + esac + +done # for ac_tag + { (exit 0); exit 0; } _ACEOF chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save +test $ac_write_fail = 0 || + { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. @@ -27837,6 +30414,10 @@ if test "$no_create" != yes; then # would make configure fail if this is the last instruction. $ac_cs_success || { (exit 1); exit 1; } fi +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then + { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} +fi chmod a+x set_soenv -- cgit From 041f0f710cbb29713dabb64a77522219279ed3d1 Mon Sep 17 00:00:00 2001 From: Release Engineers Date: Tue, 25 Aug 2009 11:00:47 +0000 Subject: CWS-TOOLING: integrate CWS ooxml03 2009-08-11 12:16:50 +0200 kendy r274852 : CWS-TOOLING: rebase CWS ooxml03 to trunk@274622 (milestone: DEV300:m54) 2009-07-17 17:55:14 +0200 hbrinkm r274100 : resolved warning on unxlngi6.pro 2009-07-15 17:11:09 +0200 kendy r274015 : #i96319# With the disabled docx pieces, libmsword is not a UNO library. 2009-07-15 13:38:36 +0200 hbrinkm r274010 : removed unresolved symbols 2009-07-13 16:06:11 +0200 hbrinkm r273943 : resolved warnings 2009-07-10 14:01:03 +0200 hbrinkm r273889 : changes to make compile on Windows 2009-06-22 19:46:17 +0200 kendy r273252 : #i96319# Disable the DOCX export, it's not perfect yet... 2009-06-22 13:04:32 +0200 kendy r273219 : CWS-TOOLING: rebase CWS ooxml03 to trunk@272827 (milestone: DEV300:m50) 2009-06-11 17:11:39 +0200 kendy r272890 : #i96319# Fix regression in the Word 95 output of hyperlinks. 2009-06-05 17:53:08 +0200 kendy r272710 : #i96319# Fix regression in Word 95 output (wrong style number when nodes recurse). 2009-06-03 00:19:27 +0200 kendy r272529 : #i96319# Fix regression in output of the section breaks. 2009-05-29 18:30:19 +0200 kendy r272475 : CWS-TOOLING: rebase CWS ooxml03 to trunk@272291 (milestone: DEV300:m49) 2009-05-29 09:58:02 +0200 kendy r272435 : #i102354# Don't write the debug info directly to the document. 2009-05-28 15:57:01 +0200 kendy r272411 : #i102260# Revert another trivial fix. 2009-05-26 16:43:07 +0200 kendy r272310 : #i102260# Disable fix of FILLIN fields. 2009-05-26 14:14:09 +0200 kendy r272302 : #i96319# Fix regression in the calculation of size of cells. 2009-05-26 01:42:29 +0200 kendy r272274 : #i96319# Fix a regression - don't export RES_PARATR_LINESPACING and RES_UL_SPACE with every style. [And additionally some beautification.] 2009-05-23 00:37:44 +0200 thb r272212 : #i102156# added XFastSAXSerializable plus implementation 2009-05-22 16:43:09 +0200 kendy r272201 : CWS-TOOLING: rebase CWS ooxml03 to trunk@271830 (milestone: DEV300:m48) 2009-05-14 23:37:02 +0200 thb r271924 : #i10000# post-filter split fixes - make non-pro compile again 2009-05-14 22:35:54 +0200 thb r271923 : #i10000# post-svx split fixes - both librpt and librptui need libsvx 2009-05-14 21:39:08 +0200 thb r271922 : #i10000# post-svx split work - getting nonpro build working again 2009-05-11 09:11:23 +0200 kendy r271740 : #i99638# svxcore library is not a UNO library. 2009-04-29 17:31:45 +0200 kendy r271389 : #i96319# Fixed a corner case in docx export of nested tables. Actually, this even simplifies the code a bit :-) 2009-04-29 12:10:08 +0200 kendy r271364 : #i96319# Fix output of spacing in docx. 2009-04-29 10:56:43 +0200 kendy r271357 : #i96319# Fix an endless loop in the docx export of bookmarks. 2009-04-29 01:06:21 +0200 kendy r271348 : #i96319# Fix output of cell width and height. 2009-04-27 13:29:02 +0200 kendy r271264 : #i96319# Fix output of section columns (their number + widths) for docx. 2009-04-24 15:51:23 +0200 kendy r271219 : #i96319# Fix output of dates - xsi:type=... should be there only for dcterms. 2009-04-23 18:27:28 +0200 kendy r271190 : #i96319# Fix output of gridCol's. 2009-04-23 17:13:44 +0200 kendy r271184 : #i96319# Avoid incorrect double output of tcPr. 2009-04-22 15:58:10 +0200 kendy r271125 : #i96319# Fix the output of the nested tables after all the rebases. 2009-04-20 15:16:48 +0200 kendy r270989 : #i96319# More correct output of the nodes. 2009-04-20 13:27:06 +0200 kendy r270976 : #i96319# Make it build after the rebase to m46 again; maybe does not run yet. 2009-04-10 23:00:46 +0200 kendy r270725 : CWS-TOOLING: rebase CWS ooxml03 to trunk@270723 (milestone: DEV300:m46) 2009-04-09 17:31:44 +0200 kendy r270716 : #i96319# Fix output of headers/footers. 2009-04-09 16:42:13 +0200 kendy r270715 : #i99638# Fix visibility for the debug build of svx. 2009-04-03 10:27:50 +0200 kendy r270466 : #i99683# One forgotten gid_File_Filter_Emp -> gid_File_Filter_Sdfilt. 2009-03-06 16:19:03 +0100 kendy r269013 : #i99638# Remove SpecialProgress-related methods and members, not used any more, and breaks linking on Win32. 2009-03-06 09:43:55 +0100 kendy r268974 : #i99638# Resolve some more unresolved symbols on Win32. 2009-03-05 23:01:39 +0100 kendy r268946 : #i99638# Export less SdStyleSheetPool symbols. 2009-03-05 15:31:23 +0100 kendy r268910 : #i99638# MSVC needs struct WW8_PdAttrDesc declared, otherwise fails to link. 2009-03-04 14:15:23 +0100 kendy r268826 : #i99638# More Win32-related build fixes. 2009-03-04 13:47:48 +0100 kendy r268823 : #i99638# Disable pptx export again, brougth in by mistake. 2009-03-04 09:54:00 +0100 kendy r268786 : #i99638# Deliver also isvxcore.lib and isvxmsfilter.lib. 2009-03-03 17:42:25 +0100 kendy r268773 : #i99638# SdrModel::setUnoModel() should not be inline. 2009-03-03 17:25:59 +0100 kendy r268770 : #i99638# Ugh, revert. 2009-03-03 17:05:16 +0100 kendy r268765 : #i99638# Make ObjectContact dll private. 2009-03-03 15:35:41 +0100 kendy r268733 : #i99638# More destructors visible for Win32 linking. 2009-03-03 14:26:23 +0100 kendy r268726 : #i99638# Make some destructors visible, and change one static inline to static to Win32 linking happy. 2009-03-03 10:42:12 +0100 kendy r268712 : #i99638# More moving stuff around to make Win32 linking happy. 2009-03-03 09:48:17 +0100 kendy r268708 : #i99638# Reduce the includes, needed for Win32 linking. 2009-03-03 08:48:00 +0100 kendy r268705 : #i99638# ImpGetResStr() visibility markup moved to the header. 2009-03-02 16:30:17 +0100 kendy r268664 : #i99638# Fix visibility problems that appeared on x86. 2009-02-27 22:25:57 +0100 kendy r268618 : #i96319# Better definition of DBG in utils.hxx. 2009-02-27 21:53:17 +0100 kendy r268616 : #i96319# License for utils.hxx, define DBG only for the debug builds. 2009-02-27 21:44:25 +0100 kendy r268615 : #i96319# Fixed types for printf etc. parameters. 2009-02-27 17:23:17 +0100 kendy r268607 : #i96319# Fix build after the rebase. 2009-02-27 15:12:49 +0100 kendy r268597 : CWS-TOOLING: rebase CWS ooxml03 to trunk@268395 (milestone: DEV300:m42) 2009-02-27 12:37:57 +0100 kendy r268580 : #i96319# Fix build dependency in oox. 2009-02-26 22:02:06 +0100 kendy r268547 : #i99683# Move ppt import to a separate library. The ppt export is already separate, so it makes sense to give there the import as well. The current library 'emp' was renamed to 'scfilt', it links against svxmsfilter, and few symbols had to be made visible (28 of them). 2009-02-26 14:36:25 +0100 kendy r268520 : #i99638# Whitespace fixes. 2009-02-26 14:31:35 +0100 kendy r268518 : #i99638# Split svx into svxcore, svxmsfilter and the rest. SvxImportMSVBasic's SaveOrDelMSVBAStorage(), GetSaveWarningOfMSVBAStorage(), and GetMSBasicStorageName() must go to svxcore (because of Writer). 2009-02-26 00:16:32 +0100 kendy r268471 : #i99638# Split libsvx into 3 pieces - svxcore, svxmsfilter, and svx (the rest). This contains: - the split (based on inter-object dependencies) - svxcore is actually a closure on a graph where the objects are vertexes, and where there's an edge between 2 vertexes when one needs symbol from the second ;-) - maybe still could be split, but that will be most probably harder to achieve - svxmsfilter is a subset that is needed just by the filters of the MS Office formats - the new svx contains the rest that did not fit the above 2 - visibility for svxcore - some svxcore symbols had to be exposed for svxmsfilter or svx - adaption of modules linking against svx - in some cases, linking just against svxcore is enough 2009-02-25 23:35:03 +0100 kendy r268470 : #i99545# Get rid of struct ConstAsciiString, and use simple #define's instead - it's a pre-requisite for a svx split, and also saves memory on x86-64, and some symbol names. 2009-02-25 22:39:02 +0100 kendy r268468 : #i96319# Get rid of the now unneecessary debug class DOCX. 2009-02-17 20:35:29 +0100 kendy r268190 : #i96319# WW8 filter rework + docx export License header + whitespace fixes. 2009-02-17 20:02:39 +0100 kendy r268189 : #i96319# WW8 filter rework + docx export Add license header to preset-definitions-to-shape-types.pl. 2009-02-17 19:58:11 +0100 kendy r268188 : #i96319# WW8 filter rework + docx export oox does not have to depend on FASTSAXLIB. 2009-02-17 17:05:34 +0100 kendy r268182 : #i96319# WW8 filter rework + docx export Fix the sax compilation, apparently some of the changes were missing. 2009-02-17 13:04:14 +0100 kendy r268163 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky VML: Fix output of shape paths (point components can be either 16 or 32 bit). [And also implement a fallback for the missing shapes - treated as rectangle.] 2009-02-17 13:03:56 +0100 kendy r268162 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky VML: Correction of some values. Now the shapes seem to be good enough; time to abandon them ;-) 2009-02-17 13:03:37 +0100 kendy r268161 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky VML: Better detection of consts. 2009-02-17 13:03:19 +0100 kendy r268160 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky VML: Fixed the 'sun' shape. 2009-02-17 13:03:00 +0100 kendy r268159 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky VML: Better check for unneeded 'prod's. 2009-02-17 13:02:42 +0100 kendy r268158 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky VML: Fix the adj values. 2009-02-17 13:02:23 +0100 kendy r268157 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky VML: Fix pentagon and star5 shapes. 2009-02-17 13:02:04 +0100 kendy r268156 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky VML: Fix most of the 'star' shapes by preventing an overflow. 2009-02-17 13:01:41 +0100 kendy r268155 : #i96319# WW8 filter rework + docx export From: Radek Doulik * fixed build after resolving conflicts 2009-02-17 13:01:19 +0100 kendy r268154 : #i96319# WW8 filter rework + docx export From: Radek Doulik * added TODO comment 2009-02-17 13:00:59 +0100 kendy r268153 : #i96319# WW8 filter rework + docx export From: Radek Doulik * implemented adjustments export in custom shapes 2009-02-17 13:00:40 +0100 kendy r268152 : #i96319# WW8 filter rework + docx export From: Radek Doulik * partially refactored EscherPropertyContainer::CreateCustomShapeProperties extracted 3 helper functions, which are now used in ooxml export 2009-02-17 13:00:17 +0100 kendy r268151 : #i96319# WW8 filter rework + docx export From: Radek Doulik * make mAny member of DrawingML protected, so that ShapeExport can access it * export connector shape * added DrawingML::WriteConnectorConnections * fixed bezier shape outline export (regression fix) 2009-02-17 12:59:54 +0100 kendy r268150 : #i96319# WW8 filter rework + docx export From: Radek Doulik * make EscherConnectorListEntry structure public, so that it can be used by ooxml export 2009-02-17 12:59:34 +0100 kendy r268149 : #i96319# WW8 filter rework + docx export From: Radek Doulik * added mapping of shapes to shape IDs * cleaned a bit shape name generation 2009-02-17 12:59:13 +0100 kendy r268148 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky VML: Fixed some of the text shapes, 166/202. In the 202, I counted even shapes that are marked 'should not be used' (and their definition is missing) even in the documentation. The only really missing shapes are those that use general arcTo... 2009-02-17 12:58:53 +0100 kendy r268147 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky VML: Found missing shapes, now 159/202. 2009-02-17 12:58:36 +0100 kendy r268146 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky VML: Optimize the amount of formulas a bit. Adds one more shape that previously reached the top amount of formulas ;-) 2009-02-17 12:58:15 +0100 kendy r268145 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky VML: Implemented quadratic beziers, 144/202 now. I was unable to use 'qb', it did not produce good results, no idea why :-( Instead used 'c' - cubic bezier - and recounted the control points (mathematically equivalent representation). The downside is that for some shapes I run out of formulas :-( - TODO later. 2009-02-17 12:57:56 +0100 kendy r268144 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky VML: Fix presetShapeDefinitions.xml, there's an error there. 2009-02-17 12:57:31 +0100 kendy r268143 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky VML: Implemented cubicBezTo + few formulas, now 136/202. 2009-02-17 12:57:11 +0100 kendy r268142 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky VML: Fixed units of sin/cos, which makes it now 118/202. Realized that some of the shapes are 'too small' - like <10 units, insetad of ~21600; have to look at that. 2009-02-17 12:56:43 +0100 kendy r268141 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky VML: More arcTo shapes, 116/202 now. 2009-02-17 12:56:21 +0100 kendy r268140 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky VML: Better conversion of */ (fixes some shapes). Implemented nostroke/nofill. 2009-02-17 12:56:01 +0100 kendy r268139 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky VML: More formulas, and partially implemented 'arcTo' - 93/202 shapes now. 2009-02-17 12:55:39 +0100 kendy r268138 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky VML: Radically changed the conversion of formulas to be able to implement +/. [...and actually implemented it ;-), 60/202 shapes now.] 2009-02-17 12:55:19 +0100 kendy r268137 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky VML: Shape types generation plugged to the build, 53/202 shapes now. 2009-02-17 12:54:57 +0100 kendy r268136 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky VML: More predefined shapes generated (thanks to 'pin' translation). 2009-02-17 12:54:36 +0100 kendy r268135 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky VML: Script that creates the predefined shape types + the definitions. The shape types themselves come from the OOXML documentation; the script just converts them from DrawingML to a VML representation in a C++ file. The converter is not feature-complete yet, resulting in some missing shapes. Also it is not yet part of the build (makefile.mk not modified yet). 2009-02-17 12:54:10 +0100 kendy r268134 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat docx export: + Fixed a regression on sections output + Columns break has to be postponed to the next paragraph + Implemented sections properly + Columns formatting properties exported 2009-02-17 12:53:49 +0100 kendy r268133 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat haven't I fixed those problems? 2009-02-17 12:53:29 +0100 kendy r268132 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat docx export: + table alignment is now exported 2009-02-17 12:53:07 +0100 kendy r268131 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor Integrate VMLExport with Calc for Comment export. Few minor changes needed to VMLExport so that Calc could customize the behavior. Specifically, Calc needed to be able to: - Explicitly specify the //v:shape/@type attribute value so that Excel wouldn't show a diagonal "arrow" underneath the note text instead of showing an actual box. - Add custom Escher properties such as "hidden", etc. - Insert the //v:shape/x:ClientData element before //v:shape is closed. * oox/inc/oox/export/vmlexport.hxx, oox/source/export/vmlexport.cxx: - Make Commit(), StartShape(), and EndShape() protected so that Calc can override those methods - StartShape() is needed to add //v:shape/@type - Commit() is needed to add new Escher properties - EndShape() is needed to generate //v:shape/x:ClientData. - Add AddShapeAttribute() method, so Calc can set the //v:shape/@type value. - Output "visibility:hidden" for the ESCHER_Prop_fHidden property. 2009-02-17 12:52:46 +0100 kendy r268130 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky VML: Finish the transition of VMLExport from 'sw' to 'oox' + few trivial fixes. The VML export code is now accessible as oox::vml::VMLExport. The (not that related) fixes include SAL_DLLPUBLIC_EXPORT -> OOX_DLLPUBLIC change and few warning fixes. 2009-02-17 12:52:24 +0100 kendy r268129 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky VML: Moved vmlexport.[hc]xx to oox. 2009-02-17 12:52:04 +0100 kendy r268128 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky VML: Cleanup before we move to oox. 2009-02-17 12:51:41 +0100 kendy r268127 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat docx export: Some more features for tables export 2009-02-17 12:51:21 +0100 kendy r268126 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat docx export: + nested tables export refinement + export row height and table headers 2009-02-17 12:50:58 +0100 kendy r268125 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky VML: Initialize a local variable. 2009-02-17 12:50:34 +0100 kendy r268124 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat docx export: fixed table layout for nested tables. Fixed nested tables output 2009-02-17 12:50:13 +0100 kendy r268123 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat docx export: added support of nested tables. Still needs to be heavily tested. Some problems are occuring with the grid layout. 2009-02-17 12:49:49 +0100 kendy r268122 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Change SAL_DLLPUBLIC_EXPORT to SW_DLLPUBLIC which is more appropriate here. 2009-02-17 12:49:28 +0100 kendy r268121 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor Fix line-callout-3 translation. The `line-callout-3' callout was being mapped to the `accentBorderCallout90' OOXML callout, which Excel didn't like at all. Changing this to `borderCallout3' produces OOXML that Excel will load. Not sure what mso-spt49 is supposed to be, but given the other mso-spt* values I think accentBorderCallout90 makes more sense (but cannot find such a value in the OOXML XSD files). 2009-02-17 12:49:05 +0100 kendy r268120 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor Fix refactoring of DrawingML::WritePolyPolygon(). The original version only checked rPoly.GetFlags() for every item *after* the first item -- i.e. the first item was skipped. Change the `for' loop start index to follow this behavior. 2009-02-17 12:48:42 +0100 kendy r268119 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor Fix Bezier output. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit The //a:cubicBezTo element (?5.1.11.7) requires that there be *three* //a:pt child elements. Ensure that this is the case (otherwise Excel yells at me about invalid DrawingML if I export a free-form shape). This also cleans up the code slightly, by moving out a `if(j==0)` block to before the for loop, and re-indenting the code to simplify understanding. 2009-02-17 12:48:22 +0100 kendy r268118 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor Flush documentation. 2009-02-17 12:48:00 +0100 kendy r268117 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat docx export: + implemented table cell margins and fixed grid layout + reapplied missing patch from m34 about default spacing of paragraphs 2009-02-17 12:47:40 +0100 kendy r268116 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor Migrate Calc to use ShapeExport. Minor snafu here: XML_nvPr is valid only within Impress, so if Calc exports it Excel doesn't like the resulting documents. Remove XML_nvPr output from ShapeExport and replace with calls to ShapeExport::WriteNonVisualProperties(). PowerPointShapeExport can thus override ShapeExport::WriteNonVisualProperties() to generate the required //p:nvPr elements. * oox/inc/oox/export/shapes.hxx: Declare ShapeExport::WriteNonVisualProperties(). * oox/source/export/shapes.cxx: * - Replace XML_nvPr generation with calls to WriteNonVisualProperties(). - Get the GraphicObject name property from the shape instead of generating "Picture N" values (if the shape has a Name property). - Generate a GraphicObject Description attribute, if present. - Remove unused method parameter names (to remove warnings). 2009-02-17 12:47:15 +0100 kendy r268114 : #i96319# WW8 filter rework + docx export From: Radek Doulik * fixed few shape names, which were missing Shape at the end * fixed mso-spt202 custom shape translation, which was causing problems with word wrapping * enabled wrap attribure for bodyPr tag * fixed 2 compiler warnings 2009-02-17 12:46:55 +0100 kendy r268113 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat docx export: column spans in tables are now exported 2009-02-17 12:46:33 +0100 kendy r268112 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat docx: + Fixed table structure output + Output table borders + Fixed borders output 2009-02-17 12:46:11 +0100 kendy r268111 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor Excercise ShapeExport::WriteShape(). Refactor PowerPointExport::WriteShapeTree() to use ShapeExport::WriteShape(), overloading ShapeExport virtual Write* methods as appropriate to insert support for additional shapes. * oox/source/export/shapes.cxx: Correct the shape names (often by appending "Shape") so that the table lookup works as expected. 2009-02-17 12:45:49 +0100 kendy r268110 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor Implement multiplexing ShapeExport::WriteShape(). What got me started on this whole "migrate large fractions of sd into oox" binge was PowerPointExport::WriteShapeTree(), which included a "multiplexer" -- a method that took the XShape's shape type and translated it into a (set of) member function(s) to call to convert the shape. I needed just such a multiplexer for Calc, and was loathe to copy/paste it. However, PowerPointExport::WriteShapeTree() is far more complicated for something to go into oox, dealing as it does with grouping and myriad other sd-specific details. Thus, an overhaul: All the ShapeExport::Write* methods are now virtual. The multiplexing ShapeExport::WriteShape() method will consult a string type -> member function lookup table, and if a matching member function is found it will be invoked. This allows subclasses to customize behavior. If no matching conversion member function is found, then ShapeExport::WriteUnknownShape() is invoked, allowing subclasses to transparently handle additional shapes w/o special-casing the WriteShape() call. * oox/inc/oox/export/shapes.hxx, oox/source/export/shapes.cxx: Make Write* methods virtual; Add WriteUnknownShape(); Replace the (non-functional) WriteShapeTree() with the multiplexing WriteShape(), and provide a hashtable mapping shape type to conversion method. 2009-02-17 12:45:28 +0100 kendy r268109 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor Move Impress DrawingML Export code into oox::drawingml::ShapeExport. Begin moving sharable sd/source/filter/eppt/epptooxml.cxx DrawingML code into oox::drawingml::ShapeExport, so that DrawingML elements (w/ different namespaces) can use the same export code. WARNING: the migration makes the assumption that mXPropSet comes from mXShape, that is: Reference< XPropertySet > mXPropSet( mXShape, UNO_QUERY ); If this is wrong, things will obviously break. This *should* be correct, as the altered code path rooted in PowerPointExport::WriteShapeTree() calls PPTWriterBase::GetShapeByIndex(), which ensures that mXPropSet is the XPropertySet for the mXShape instance: Any aAny( mXShape->queryInterface( ::getCppuType( (const Reference< XPropertySet >*) 0 ) )); aAny >>= mXPropSet; * oox/inc/oox/export/shapes.hxx, oox/source/export/shapes.cxx: Sync with the above removed PowerPointExport methods. 2009-02-17 12:45:11 +0100 kendy r268108 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor Deliver inc/oox/export/shapes.hxx. 2009-02-17 12:44:51 +0100 kendy r268107 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor Abstract out sd's shape export code. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit DrawingML is an evil, evil thing -- it's highly duplicative. For example, the element has been duplicated no less than four times into different XML namespaces: ?4.4.1.12, ?5.1.2.1.8, ?5.2.2.3, ?5.6.2.8, i.e. in the following XML namespaces (from the XSD files): http://schemas.openxmlformats.org/drawingml/2006/chartDrawing http://schemas.openxmlformats.org/drawingml/2006/main http://schemas.openxmlformats.org/drawingml/2006/picture http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing http://schemas.openxmlformats.org/presentationml/2006/main In all these cases, they all have the same attributes, the same parent elements, and the same child elements. They are, for all intents and purposes, identica EXCEPT for the XML namespace. Instead of rampantly duplicating sd's shape export code and doing s/XML_p/XML_???/g (i.e. replace the namespace), I'm refactoring sd's export code into oox::drawingml::ShapeExport. The ShapeExport constructor takes the target XML namespace as a parameter, and generates all XML relative to this namespace. * inc/oox/export/drawingml.hxx: Add DrawingML::GetFB() and DrawingML::GetFS() accessor methods, which are needed by ShapeExport. * source/export/makefile.mk: Add shapes.cxx to the build. * inc/oox/export/shapes.hxx, source/export/shapes.cxx: Declare and implement oox::drawingml::ShapeExport. 2009-02-17 12:44:32 +0100 kendy r268106 : #i96319# WW8 filter rework + docx export From: Radek Doulik * extracted paragraph adjustment translation * added text wrap (commented out as it doesn't work flawlessly yet) 2009-02-17 12:44:12 +0100 kendy r268105 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat docx export: now able to export the tables structures 2009-02-17 12:43:53 +0100 kendy r268104 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat Fixed a bug in doc table export. 2009-02-17 12:43:34 +0100 kendy r268103 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat Fixed several build bugs: + strange integer conversion + unexported symbol dbg_out + Reintegrated missing patches from m34 + Reupdated scp2 module to flag libmsword as a uno component 2009-02-17 12:43:15 +0100 kendy r268102 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Change hardcoded numbers into sprm constants. 2009-02-17 12:42:58 +0100 kendy r268101 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Make the tables build even with the docx-related changes. 2009-02-17 12:42:38 +0100 kendy r268100 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky VML: Write shapes defined by paths. 2009-02-17 12:42:14 +0100 kendy r268099 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat docx export: implemented paraSnapToGrid & suppressAutoHyphens 2009-02-17 12:41:54 +0100 kendy r268098 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat docx export: Implemented ParaScriptSpace and its friends 2009-02-17 12:41:32 +0100 kendy r268097 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat docx export: Keep with next paragraph 2009-02-17 12:41:11 +0100 kendy r268096 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat docx: Fixed tab position export, left margin was missing 2009-02-17 12:40:48 +0100 kendy r268095 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat TOX export: + fixed export fields expression containing tabs + fixed the begin element of fields like TOX, Hyperlinks and index marks + implemented export of index marks (same missing things than binary filter) 2009-02-17 12:40:28 +0100 kendy r268094 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor Export the core revision document property. The mapping between revision and getEditingCycles() was found by perusing the existing OLE Structured Storage output source. 2009-02-17 12:40:10 +0100 kendy r268093 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky VML: Preparations for the predefined shape types. 2009-02-17 12:39:50 +0100 kendy r268092 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky VML: Implemented the most interesting stroke properties. 2009-02-17 12:39:31 +0100 kendy r268091 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat Minimal working TOX export, not fully tested yet. Implemented DocxExport::AppendBookmark method 2009-02-17 12:39:11 +0100 kendy r268090 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky VML: Implemented the most interesting fill properties. 2009-02-17 12:38:53 +0100 kendy r268089 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky VML: Output of lines. 2009-02-17 12:38:35 +0100 kendy r268088 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat Thanks to kendy, dateToW3CDTF is now useless 2009-02-17 12:38:16 +0100 kendy r268087 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat Uncomplete merge + change the timestamp generation with the use of strftime 2009-02-17 12:37:58 +0100 kendy r268086 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat + Fixes in core properties export: - the first keyword was duplicated, - the CreationTime in apps.xml was written several times + Refactored the fields output to prepare the place for TOX: now using a stack of fields to output + Refactored the Hyperlink export implementation to handle links with anchors in documents 2009-02-17 12:37:36 +0100 kendy r268085 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky MS Word begins to like the VML generated by the docx export :-) We can export basic groups, rects and ellipses now; TODO other shapes and lots of properties. 2009-02-17 12:37:18 +0100 kendy r268084 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Propagate bounding rectangle in EscherEx::Commit(). Ignored in EscherEx itself, but mandatory for the VML export. 2009-02-17 12:36:59 +0100 kendy r268083 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Comment out output of XML_TotalTime (xProperties->getEditingDuration()), breaks here. #i96319# WW8 filter rework + docx export confuses MS Office terribly. 2009-02-17 12:36:42 +0100 kendy r268082 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky The boost datetime conversion broke from time to time, no idea why :-( Now using the most trivial approach... 2009-02-17 12:36:24 +0100 kendy r268081 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Implementation of few basic VML shapes and properties. 2009-02-17 12:36:06 +0100 kendy r268080 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Add EscherPropertyContainer::GetOpts() to be able to get all the options at once. 2009-02-17 12:35:48 +0100 kendy r268079 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Include "tokens.hxx" instead of . The latter attempts to take the version from solver which is not there yet when building from scratch ;-) 2009-02-17 12:35:28 +0100 kendy r268078 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat Forgot to remove an include. Compiler didn't crash on it... strange 2009-02-17 12:35:10 +0100 kendy r268077 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat Merged the properties export code with the one of jonp. In fact, only the date formatting code of mine has been kept to replace jon's one. 2009-02-17 12:34:49 +0100 kendy r268076 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat Export of core properties migrated to oox module 2009-02-17 12:34:23 +0100 kendy r268075 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor Add some trace/debugging information. Some of the app/core properties are #ifdef'd, as I don't know what XDocumentProperties attribute is the appropriate mapping. My suspicion is that many of the remaining app/core properties may be found within the DocumentStatistics attribute, and thus I print out the document statistics found. (So far, I'm not seeing any from Calc, but this may bear some fruit with .docx or .pptx export...) 2009-02-17 12:34:01 +0100 kendy r268074 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor Document Properties: skip empty elements. * xmlfilterbase.cxx (writeElement): Don't generate an element if the element has no value. 2009-02-17 12:33:35 +0100 kendy r268073 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor Initial stab at exporting document properties. Short, short version: to export document properties call XmlFilterBase::exportDocumentProperties(Reference). * oox/inc/oox/core/xmlfilterbase.hxx, oox/source/core/xmlfilterbase.cxx: Add and implement XmlFilterBase::exportDocumentProperties(), which generates docProps/core.xml and docProps/app.xml. * oox/source/token/tokens.txt: Add XML_vt element. * sc/source/filter/excel/excdoc.cxx: call XmlFilterBase::exportDocumentProperties(). * sc/source/filter/excel/expop2.cxx: Remove sfx2::SaveOlePropertySet() call, as it isn't useful for OOXML output. 2009-02-17 12:33:17 +0100 kendy r268072 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Beginnings of the VML export. The shapes are exported, but with no attributes - so their position is not written yet, etc. 2009-02-17 12:32:54 +0100 kendy r268070 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Do more EscherEx methods virtual. We want to re-use EscherEx for the export of VML. For this, some of the methods have to be made virtual so that we can change them to do what we need ;-) 2009-02-17 12:32:26 +0100 kendy r268069 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat Removed debug fprintf's 2009-02-17 12:32:09 +0100 kendy r268068 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat docx: bookmarks now exported 2009-02-17 12:31:52 +0100 kendy r268067 : #i96319# WW8 filter rework + docx export From: Radek Doulik * export polypolygons * export transformation defined by rectangle 2009-02-17 12:31:35 +0100 kendy r268066 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat Split text runs to be able to insert bookmark tags 2009-02-17 12:31:18 +0100 kendy r268065 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Enum for specifying the document type to DrawingML. Various document types need it differently... 2009-02-17 12:30:57 +0100 kendy r268064 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor Provide an appropriate //Relationship/@Target value. * oox/source/export/drawingml.cxx: The //Relationship/@Target value needs to be a path relative to the DrawingML document. For Excel, the DrawingML is in xl/drawings/drawing*.xml, while the embedded media is in xl/media/image*. Thus, to get from xl/drawings/drawing*.xml to xl/media/image*, we need "../media/image", not "media/image". Without this change, Excel throws an error when loading the Spreadsheet, as it can't find the resource. 2009-02-17 12:30:35 +0100 kendy r268063 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Fixed output of the properties that are written at or time. Fixes the most annoying "the first run has strange properties" bug, and generally improves the quality of output of styles a lot. 2009-02-17 12:30:16 +0100 kendy r268062 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor Generate valid DrawingML. The DrawingML is a hack, with hard-coded values in various places that have no business being hardcoded, but it is valid, and Excel does load the DrawingML without error. (It instead errors out because xl/drawings/_rels/drawing1.xml.rels contains an invalid file path. :-( * oox/inc/oox/export/drawingml.hxx, oox/source/export/drawingml.cxx: Add a WriteBlipFill() overload which takes the XML namespace as an argument. This is necessary because Excel wants a element, not , and I don't want to have to duplicate the rest of the WriteBlipFill() logic within sc. 2009-02-17 12:29:59 +0100 kendy r268061 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Remove one of the 2 fixes of the same problem ;-) 2009-02-17 12:29:32 +0100 kendy r268060 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Few whitespace fixes. 2009-02-17 12:29:12 +0100 kendy r268059 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Basic output of images works, both embedded as well as linked. Still some TODOs in FlyFrameGraphic(), to be solved later... 2009-02-17 12:28:51 +0100 kendy r268058 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Add TwipsToEMU() to oox/export/utils.hxx. 2009-02-17 12:28:30 +0100 kendy r268057 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor Fix the build. DrawingML::WriteImage(const Graphic&) needs to have a Graphic type in scope. 2009-02-17 12:28:10 +0100 kendy r268056 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Change define FSEND -1 to const sal_Int32 FSEND = -1. The former can hide errors, like startElementNS( ..., "xyz" FSEND ), because it compiles without warning, but then gets part of the string, and we end up without a sentinel. 2009-02-17 12:27:50 +0100 kendy r268055 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat Docx export: Dropdown field now exported 2009-02-17 12:27:28 +0100 kendy r268054 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor Add the xdr token. The `xdr' token is used as the XML namespace in Spreadsheet DrawingML documents. 2009-02-17 12:27:08 +0100 kendy r268053 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky With a bit of cheating, images can be written... Everything (but the image itself) is hardcoded so far. 2009-02-17 12:26:47 +0100 kendy r268052 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Write the location of the image as media/image, not ../media/image. Hopefully it does not break pptx - but for docx it's necessary. 2009-02-17 12:26:24 +0100 kendy r268051 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Improved mergeTopMarks(). - instead of bool, it accepts MergeMarksEnum with values MERGE_MARKS_APPEND, MERGE_MARKS_PREPEND, and MERGE_MARKS_POSTPONE, which should be more readable - MERGE_MARKS_POSTPONE is a new thing, it allows to write output that is written with the next mergeTopMarks() - useful when you get some data too early and need to write them after the end of data that you are just writing. 2009-02-17 12:26:05 +0100 kendy r268050 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Output of images; framework is mostly done, but disabled due to problems with order. [So far it would be output inside rPr which is not what we want ;-)] 2009-02-17 12:25:41 +0100 kendy r268049 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Intoduced OUString DrawingML::WriteImage( const Graphic& rGraphic ). Additionally - added the possibility to write images to word/ subdir in the zip container, not just ppt/ - added 'wp' to the known tokens - fixed Graphic::GetLink() in vcl to be 'const' - added svx and vcl to the dependencies of oox 2009-02-17 12:25:18 +0100 kendy r268048 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat merged binary and ooxml filters export. 2009-02-17 12:24:55 +0100 kendy r268047 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat Core properties created (still have to write the dates) 2009-02-17 12:24:32 +0100 kendy r268046 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat Added support for GetExpression and SetExpression fields (only in text format). 2009-02-17 12:24:09 +0100 kendy r268045 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat Some more fields supported 2009-02-17 12:23:49 +0100 kendy r268044 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat Some more fields 2009-02-17 12:23:27 +0100 kendy r268043 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Write also numbering type "none". 2009-02-17 12:23:07 +0100 kendy r268041 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Numbering finished, implemented the rest of the level information. 2009-02-17 12:22:45 +0100 kendy r268040 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat docx fields exports: the start of the way 2009-02-17 12:22:23 +0100 kendy r268039 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Write abstract numbering definitions including the levels. Not all of the information is written yet, but will be soon ;-) 2009-02-17 12:22:00 +0100 kendy r268038 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Implementation of the abstract numbering definitions, not yet finished. 2009-02-17 12:21:39 +0100 kendy r268037 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Output numbering definition instances. Abstract numbering definitions are still TODO. 2009-02-17 12:21:21 +0100 kendy r268036 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Rename OutListTab() -> NumberingDefinitions(), and OutListTabLevels() -> AbstractNumberingDefinitions(). This is better aligned with what is used in the docx documentation. 2009-02-17 12:21:00 +0100 kendy r268035 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat Changed the ColorToHex to support the "auto" value Code cleaning according to kendy's remarks 2009-02-17 12:20:37 +0100 kendy r268034 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat table horizontal merge 2009-02-17 12:20:15 +0100 kendy r268033 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky impl_convertColor() is not necessary, we already have impl_ColorToHex(). 2009-02-17 12:19:52 +0100 kendy r268032 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat docx Line numbering 2009-02-17 12:19:31 +0100 kendy r268031 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat docx: Implemented Section Types 2009-02-17 12:19:09 +0100 kendy r268030 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat FIX for borders: documents with no section border didn't wrote completely 2009-02-17 12:18:50 +0100 kendy r268029 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat Fixed some output errors for paragraphs borders 2009-02-17 12:18:31 +0100 kendy r268028 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat Fixed docx page border export problems and added color support 2009-02-17 12:18:13 +0100 kendy r268027 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat Beginning of page borders implementation 2009-02-17 12:17:54 +0100 kendy r268026 : #i96319# WW8 filter rework + docx export From: Radek Doulik * export line arrow ends 2009-02-17 12:17:34 +0100 kendy r268025 : #i96319# WW8 filter rework + docx export From: Radek Doulik * make helper function GetLineArrow public so that it can be used in ooxml export put it in EscherPropertyContainer class (static method) 2009-02-17 12:17:16 +0100 kendy r268024 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat renamed AppendRelation to AddRelation. 2009-02-17 12:16:58 +0100 kendy r268023 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat Fixed hyperlinks style. Fixed having a run of text before the hyperlink 2009-02-17 12:16:39 +0100 kendy r268022 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Initialize m_pHyperlinkAttrList to NULL. 2009-02-17 12:16:17 +0100 kendy r268021 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat Fixed the Hyperlink output Partly fixed the language Id output 2009-02-17 12:15:54 +0100 kendy r268020 : #i96319# WW8 filter rework + docx export From: Radek Doulik * fix type mismatch in gradient code * add flip and rotation parameters to shape transformation 2009-02-17 12:15:29 +0100 kendy r268019 : #i96319# WW8 filter rework + docx export From: Radek Doulik * finished gradient fill 2009-02-17 12:15:07 +0100 kendy r268018 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat + docx URL export: output is still wrong 2009-02-17 12:14:44 +0100 kendy r268017 : #i96319# WW8 filter rework + docx export From: Radek Doulik * export linear and axial gradients 2009-02-17 12:14:27 +0100 kendy r268016 : #i96319# WW8 filter rework + docx export From: Radek Doulik * export line joint type 2009-02-17 12:14:05 +0100 kendy r268015 : #i96319# WW8 filter rework + docx export From: Radek Doulik * export dashed lines 2009-02-17 12:13:48 +0100 kendy r268014 : #i96319# WW8 filter rework + docx export From: Cedric Bosdonnat cast problems fixed 2009-02-17 12:13:25 +0100 kendy r268013 : #i96319# WW8 filter rework + docx export From: Radek Doulik * added outline export * wrapped debug printfs in DBG * fix text color and typeface placement * do not write empty runs * do not write empty paragraph properties * added end paragraph properties - need to be filled later 2009-02-17 12:13:02 +0100 kendy r268012 : #i96319# WW8 filter rework + docx export From: Radek Doulik export language and fonts are now accepted by msppt 2009-02-17 12:12:44 +0100 kendy r268011 : #i96319# WW8 filter rework + docx export From: Radek Doulik re-enable pptx export - it was disabled by ooxml02 changes committed to git repo 2009-02-17 12:12:22 +0100 kendy r268010 : #i96319# WW8 filter rework + docx export From: Radek Doulik fix build 2009-02-17 12:12:04 +0100 kendy r268009 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor Merge ooxml02 fixes. 2009-02-17 12:11:43 +0100 kendy r268008 : #i96319# WW8 filter rework + docx export From: Radek Doulik move drawingml export to oox/ from sd/ 2009-02-17 12:11:20 +0100 kendy r268007 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Revert commit 8b63649bf0a5d14703459bbf31e1599d592a5dff. It was already fixed easier way. 2009-02-17 12:11:00 +0100 kendy r268006 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor oox fixes to help sc compile... * inc/oox/core/contexthandler2.hxx, inc/oox/drawingml/chart/modelbase.hxx, inc/oox/drawingml/customshapeproperties.hxx, inc/oox/helper/attributelist.hxx, inc/oox/ppt/pptimport.hxx, inc/oox/ppt/slidepersist.hxx: #include not "tokens.hxx" as these files are deployed into solver, and there is no "tokens.hxx" in other modules (such as sc). * prj/d.lst: Deliver enough header files to let sc build some more... 2009-02-17 12:10:34 +0100 kendy r268005 : #i96319# WW8 filter rework + docx export From: Jonathan Pryor Deliver tablestylelist.hxx. * d.lst: Deliver inc/oox/drawingml/table/tablestylelist.hxx, as it's needed by sc export. 2009-02-17 12:10:13 +0100 kendy r268004 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Fix few warnings in sw, and disable DocxExport::WriteNumbering() for now. 2009-02-17 12:09:56 +0100 kendy r268003 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Add empty implementations of 2 abstract import XmlFilterBase methods. To be able to instantiate DocxExportFilter again... 2009-02-17 12:09:35 +0100 kendy r268002 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Resolve an unresolved, forgotten chunk [GetAttr() -> GetFmtAttr()]. 2009-02-17 12:09:08 +0100 kendy r268001 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Field work seems to compile now. Contains also a rename of OutField() to OutputField() to match better the other changes. 2009-02-17 12:08:46 +0100 kendy r268000 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Fix build, WriteOutliner() is now in WW8Export. 2009-02-17 12:08:26 +0100 kendy r267999 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky OutListTab() split into 2 methods [OutListTab() and OutListTabLevels()]. Also introduced a general WW8Export::WriteNumbering() which calls the needed methods. OutListTabLevels() is planned to be reused in docx export as well. 2009-02-17 12:08:09 +0100 kendy r267998 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky DupNumRuleWithLvlStart() renamed to DuplicateNumRule(). 2009-02-17 12:07:40 +0100 kendy r267997 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Check for max numbering level can be in ParaNumRule(). 2009-02-17 12:07:20 +0100 kendy r267996 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Few whitespace changes. 2009-02-17 12:06:49 +0100 kendy r267995 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky GetId( const SwNumRule& rNumRule ) should not be const. If the first thing it does is a const_cast<...>( this ), then something is wrong ;-) 2009-02-17 12:06:29 +0100 kendy r267994 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Redlining: Save author and date. 2009-02-17 12:06:07 +0100 kendy r267993 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Output redlining. So far just insertion and deletion of text, and without author and timestamp. 2009-02-17 12:05:45 +0100 kendy r267992 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Write the font table. 2009-02-17 12:05:27 +0100 kendy r267991 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Get ready to output the fonts. 2009-02-17 12:05:06 +0100 kendy r267990 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Fix namespace of relation id, and output of headers and footers works now... It's r:id, not w:id ;-) 2009-02-17 12:04:40 +0100 kendy r267988 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Write actual headers and footers in docx. #i96319# WW8 filter rework + docx export 2009-02-17 12:04:17 +0100 kendy r267987 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky A small cleanup. 2009-02-17 12:04:00 +0100 kendy r267986 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Fix the regression, caused by SetupSectionPositions() not being virtual (accidentally). 2009-02-17 12:03:40 +0100 kendy r267985 : #i96319# WW8 filter rework + docx export From: Fridrich Strba another iteration of numbering, utterly broken, but not crashing anything 2009-02-17 12:03:18 +0100 kendy r267984 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky SectionProperties() code is now common for binary and docx. Unfortunately binary output does not pass the tests now. 2009-02-17 12:02:49 +0100 kendy r267983 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Improving the SectionProperties() method to be shared between ww8 and docx. Not there yet, but getting closer ;-) The docx code is still a placeholder only. 2009-02-17 12:02:29 +0100 kendy r267982 : #i96319# WW8 filter rework + docx export From: Fridrich Strba some more work towards the numbering.xml 2009-02-17 12:02:08 +0100 kendy r267981 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Get rid of rLnNumInfo and aLineNum. 2009-02-17 12:01:44 +0100 kendy r267980 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky We are in attribute output already. 2009-02-17 12:01:21 +0100 kendy r267979 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Get rid of unsigned int nHdFtGroup. 2009-02-17 12:01:03 +0100 kendy r267978 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Introduce WW8AttributeOutput::SectionProperties(). The goal is to share this between ww8 and docx. 2009-02-17 12:00:45 +0100 kendy r267977 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Be careful, m_pSections/CurrentSectionInfo() might be NULL. 2009-02-17 12:00:22 +0100 kendy r267976 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Write section properties even for the last section. 2009-02-17 11:59:59 +0100 kendy r267975 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Output sections (w:sectPr) and columns. 2009-02-17 11:59:34 +0100 kendy r267974 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky WW8_SepInfo: Move to constructor, what belongs there. 2009-02-17 11:59:14 +0100 kendy r267973 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Remove an obsolete commented out piece. 2009-02-17 11:58:53 +0100 kendy r267972 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Output columns break (when the section has more columns). 2009-02-17 11:58:35 +0100 kendy r267971 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Hook the output of the docx sections to the right place. 2009-02-17 11:58:17 +0100 kendy r267970 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Rename OutputSfxBreakItems() to OutputSectionBreaks(). 2009-02-17 11:57:58 +0100 kendy r267969 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Remove an non-needed comment, add an interesting one. 2009-02-17 11:57:39 +0100 kendy r267968 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Get rid of OutputPageSectionBreaks(), dissolve it into other methods. 2009-02-17 11:57:19 +0100 kendy r267967 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Fix regression in AttributeOutputBase::FormatBreak(). git bisect, thank you so much! :-) 2009-02-17 11:57:00 +0100 kendy r267966 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Move pDop and pFib to WW8Export. 2009-02-17 11:56:42 +0100 kendy r267965 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Implement DocxExport::PrepareNewPageDesc(). 2009-02-17 11:56:24 +0100 kendy r267964 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Improve WW8Export::PrepareNewPageDesc(). 2009-02-17 11:56:04 +0100 kendy r267963 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Move part of WW8_WrPlcSepx::OutHeaderFooter() to MSWordExportBase::WriteHeaderFooterText(). 2009-02-17 11:55:27 +0100 kendy r267961 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Share OutHeader() nad OutFooter() (remove copy'n'paste). 2009-02-17 11:55:06 +0100 kendy r267960 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Rename WriteKFTxt1() to WriteHeaderFooterText() and move it to MSWordExportBase. 2009-02-17 11:54:41 +0100 kendy r267959 : #i96319# WW8 filter rework + docx export From: Fridrich Strba extracting the ParaNumRule to MSWordExportBase 2009-02-17 11:54:20 +0100 kendy r267958 : #i96319# WW8 filter rework + docx export From: Fridrich Strba write out w:numPr node into document.xml + converting some tabs to 4 spaces 2009-02-17 11:53:56 +0100 kendy r267957 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky MSWordSections split into the base and WW8 specific (WW8_WrPlcSepx). [WW8_WrPlcSepx was the original name of MSWordSections - let it there to decrease confusion ;-)] 2009-02-17 11:53:31 +0100 kendy r267956 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Fix docx export crash by initializing pSepx. 2009-02-17 11:53:11 +0100 kendy r267955 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky MSWordExportBase::OutputPageSectionBreaks() is now common for binary and docx. 2009-02-17 11:52:48 +0100 kendy r267954 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky AttributeOutputBase::FormatPageDescription() is now common for binary and docx. 2009-02-17 11:52:28 +0100 kendy r267953 : #i96319# WW8 filter rework + docx export From: Fridrich Strba write an empty numbering stream 2009-02-17 11:52:06 +0100 kendy r267952 : #i96319# WW8 filter rework + docx export From: Fridrich Strba some more of the spacing 2009-02-17 11:51:39 +0100 kendy r267951 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Rename WW8_WrPlcSepx to MSWordSections. 2009-02-17 11:51:19 +0100 kendy r267950 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Move pSepx initialization to the WW8_WrPlcSepx constructor. 2009-02-17 11:50:53 +0100 kendy r267949 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Fixed styles id's (in styles.xml). Now the styles seem to work pretty well. 2009-02-17 11:50:33 +0100 kendy r267948 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Rename AttributeOutput's Style() to ParagraphStyle(), that is more correct. 2009-02-17 11:50:11 +0100 kendy r267947 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky FormatBreak() is now in the common AttributeOutputBase. And pageBreakBefore works now... 2009-02-17 11:49:49 +0100 kendy r267946 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Few obvious m_rWW8Export -> GetExport() in WW8AttributeOutput::FormatBreak(). 2009-02-17 11:49:28 +0100 kendy r267945 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Add PageBreakBefore() to AttrbuteOutput's. It's a preparation for moving FormatBreak() to the generic AttributeOutputBase, and also kills some copy and paste. 2009-02-17 11:49:08 +0100 kendy r267944 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Debug output of attributes is not needed any more, remove. 2009-02-17 11:48:46 +0100 kendy r267943 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Don't create a new AttributeOutput in WW8_WrPlcSepx::WriteKFTxt(). 2009-02-17 11:48:25 +0100 kendy r267942 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Move pEnd and pFtn from MSWordExportBase to WW8Export. 2009-02-17 11:48:03 +0100 kendy r267941 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Now outputting footnotes and endnotes. Their styles are not output correctly yet, thus the number of the footnote resp. endnote is not distinguished from the text of the paragraph. Another problem that is missing. 2009-02-17 11:47:42 +0100 kendy r267940 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Output of footnote/endnote references. And it's prepared for the output of footnote.xml resp. endnote.xml as well. 2009-02-17 11:47:21 +0100 kendy r267939 : #i96319# WW8 filter rework + docx export From: Fridrich Strba some more para properties: widows control, para-splitting and incomplete implementation of spacing 2009-02-17 11:46:59 +0100 kendy r267938 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Make a bit more obvious what's happenning with AttributeLists. 2009-02-17 11:46:38 +0100 kendy r267937 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Part of the footnote/endnote stuff is shared now between binary and docx. It is just a small part, but better than nothing ;-) I'm not sure that sharing more is possible/reasonable at all... 2009-02-17 11:46:16 +0100 kendy r267936 : #i96319# WW8 filter rework + docx export From: Fridrich Strba adding paragraph indentation 2009-02-17 11:45:56 +0100 kendy r267935 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Rename AddWordBookmark() -> AppendWordBookmark(). 2009-02-17 11:45:36 +0100 kendy r267934 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Remove 2nd param from AppendBookmark(), nobody was using that anyway. 2009-02-17 11:45:19 +0100 kendy r267933 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Readability improvements in WW8_WrPlcSubDoc::WriteGenericPlc(). 2009-02-17 11:44:53 +0100 kendy r267932 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Better readable WW8_WrPlcSubDoc::WriteGenericTxt(). 2009-02-17 11:44:35 +0100 kendy r267931 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Move WriteSpecialText() from WW8Export to MSWordExportBase. 2009-02-17 11:44:12 +0100 kendy r267930 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Support for color value 'auto' - used often in the styles. 2009-02-17 11:43:48 +0100 kendy r267929 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Comment the mark()/mergeTopMarks() magic for paragraphs + par. properties. 2009-02-17 11:43:31 +0100 kendy r267928 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Remove the styles debug output. 2009-02-17 11:43:14 +0100 kendy r267927 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Output of styles reworked. The ooxml stuff is implemented as well, but not tested yet. 2009-02-17 11:42:54 +0100 kendy r267926 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Output word/styles.xml - empty one for now. 2009-02-17 11:42:36 +0100 kendy r267925 : #i96319# WW8 filter rework + docx export From: Fridrich Strba Paragraph properties framework + tab stop + paragraph justification + converting some tabs to 4 spaces 2009-02-17 11:42:18 +0100 kendy r267924 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky More preparations for outputting the styles table in docx. 2009-02-17 11:41:56 +0100 kendy r267923 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Initialize pStyles even for docx. MSWordStyles was changed so that it can be initialized from any pDoc, it needs WW8Export just for writing ww8 styles. 2009-02-17 11:41:36 +0100 kendy r267922 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Rename WW8WrtStyle to MSWordStyles. 2009-02-17 11:41:14 +0100 kendy r267921 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Uncomment nStyleBeforeFly = GetId( lcl_getFormatCollection( *this, &rNode ) ); 2009-02-17 11:40:50 +0100 kendy r267920 : #i96319# WW8 filter rework + docx export From: Fridrich Strba oops, write actually the lang property 2009-02-17 11:40:24 +0100 kendy r267919 : #i96319# WW8 filter rework + docx export From: Fridrich Strba character kerning and character language 2009-02-17 11:40:06 +0100 kendy r267918 : #i96319# WW8 filter rework + docx export From: Fridrich Strba implement font names and also the asian layout part of run properties 2009-02-17 11:39:41 +0100 kendy r267917 : #i96319# WW8 filter rework + docx export From: Fridrich Strba this looks like a typo, it should be EndBracket for this one, I assume 2009-02-17 11:39:21 +0100 kendy r267916 : #i96319# WW8 filter rework + docx export From: Fridrich Strba removing some unnecessary warnings 2009-02-17 11:38:56 +0100 kendy r267915 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky OutputTableNode() finally moved to MSWordExportBase. EndTableRow() from *AttributeOutput gets too much parameters now, but unfortunately, at the moment it was the easiest solution. As more functionality will move to the actuall cell output, this will get a bit nicer I hope ;-) 2009-02-17 11:38:36 +0100 kendy r267913 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Trivial output of table cells. Still not complete, OutputTableNode() still contains some WW8-only stuff. 2009-02-17 11:38:10 +0100 kendy r267912 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Reduced code in DocxAttributeOutput::RunText()/impl_RunText(). 2009-02-17 11:37:51 +0100 kendy r267911 : #i96319# WW8 filter rework + docx export From: Fridrich Strba handle also tabs :) 2009-02-17 11:37:28 +0100 kendy r267910 : #i96319# WW8 filter rework + docx export From: Fridrich Strba generically filter out any character that is ascii < 0x20 from the string we write to the file 2009-02-17 11:37:10 +0100 kendy r267909 : #i96319# WW8 filter rework + docx export From: Fridrich Strba wrap debug output in #if #endif statements 2009-02-17 11:36:48 +0100 kendy r267908 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky StartTableRow(), EndTableRow(), and TableRowProperties() for *AttributeOutput. And the appropriate rework in OutputTableNode() (still no ooxml output yet, but getting closer. 2009-02-17 11:36:29 +0100 kendy r267907 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky StartTable() and EndTable() for *AttributeOutput. And the appropriate rework in OutputTableNode() [which is still let in WW8Export, but it's move to MSWordExportBase is close ;-)]. 2009-02-17 11:36:09 +0100 kendy r267906 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Improve readability in OutputTableNode; Out_SfxBreakItems -> MSWordExportBase. Out_SfxBreakItems was also renamed to OutputSfxBreakItems. 2009-02-17 11:35:50 +0100 kendy r267905 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Cosmetic change: OutputFlyFrameImpl() -> OutputFlyFrame_Impl(). 2009-02-17 11:35:30 +0100 kendy r267904 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Change WW8SaveData into SaveData() and RestoreData() methods. WW8SaveData was hard to extend to be able to handle WW8Export and DocxExport at the same time; so instead there are now SaveData() and RestoreData() virtual methods in MSWordExportBase, and the appropriate additions are solved directly in WW8Export (nothing for DocxExport [yet?]). 2009-02-17 11:35:12 +0100 kendy r267903 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Write line breaks. 2009-02-17 11:34:54 +0100 kendy r267902 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky More from WW8Export::ExportDocument_Impl() to MSWordExportBase::ExportDocument(). 2009-02-17 11:34:36 +0100 kendy r267901 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Rename StoreDoc() to ExportDocument(), and move it to MSWordExportBase. The format-dependant parts were moved to a virtual ExportDocument_Impl(). 2009-02-17 11:34:19 +0100 kendy r267900 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Explicitely default construct maMarkStack [to be safe ;-)]. 2009-02-17 11:34:01 +0100 kendy r267899 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Fix few crashes in DocAttributeOutput.cxx (missing FSNS() in vararg). 2009-02-17 11:33:43 +0100 kendy r267898 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Rename writeMarked() to mergeTopMarks() and improve the implementation. Just writing the top mark is not enough; in more complex scenarios it would destroy the order completely. This way we have better control over what's happening, and can nest the mark()/mergeTopMarks()/mergeTopMarks( true ) as necessary directly in the start/end tags. 2009-02-17 11:33:25 +0100 kendy r267897 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Use serializer's mark() and writeMarked() to change order of and ... instead of using m_aText to remember the content of the text. That wouldn't work later anyway - we will probably need to change the order of the paragraph properties and text runs as well which will be done easily using mark() and writeMarked() as well. 2009-02-17 11:33:06 +0100 kendy r267896 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Outputting docx runs with attributes works now. 2009-02-17 11:32:48 +0100 kendy r267895 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky The msword filter compiles again. Added empty implementations of the virtual methods to DocxExport and DocxAttributeBase [printing 'TODO Blah::bleh()' ;-)]. The thing binary output still passes the testsuite, yay! 2009-02-17 11:32:30 +0100 kendy r267894 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky OutputTextNode() is not virtual any more and sits in MSWordExportBase. Lots of stuff has been moved around again - mostly from WW8Export to MSWordExportBase (for the gerenalized stuff) and to WW8AttributeOutput (for the 'hardcore' output of bytes/sprms/data/...) At the moment, it compiles, but the docx part of the filter does not link thanks to the missing implementation of DocxAttributeOutput methods (the new ones). 2009-02-17 11:32:11 +0100 kendy r267893 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Documentation updates. 2009-02-17 11:31:48 +0100 kendy r267892 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Change harcoded sprm ids to consts (reused from writerfilter). This adds a build dependency of sw on writerfilter - hopefully it's OK. 2009-02-17 11:31:28 +0100 kendy r267891 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Get rid of *NodeOutput classes, the code belongs directly to *Export. The callbacks I moved to newly created classes NodeOutputBase, WW8NodeOutput, or DocxNodeOutput respectively in fact should not be in separate classes, but directy in MSWordExportBase, WW8Export, or DocxExport respectively. This commit moves them accordingly. 2009-02-17 11:31:06 +0100 kendy r267890 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky bUnicode -> m_rWW8Export.bWrtWW8; it's the same in this context. 2009-02-17 11:30:44 +0100 kendy r267889 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Remove unnecessary {} block. 2009-02-17 11:30:24 +0100 kendy r267888 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Several German comments to English. 2009-02-17 11:30:08 +0100 kendy r267887 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Move pO cleanup directly into aAttrIter.OutAttr(). 2009-02-17 11:29:44 +0100 kendy r267886 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Shorten WW8NodeOutput::TextNode() by moving SwFmtDrop output to a separate method. 2009-02-17 11:29:22 +0100 kendy r267885 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Unified the use of m_rWW8Export.pO in WW8NodeOutput::TextNode(). In some cases, it was used as m_rWW8Export.pO, in the others as only pO (but meaning the same thing). Changed all the occurences to the simple pO to improve readability. 2009-02-17 11:29:00 +0100 kendy r267884 : #i96319# WW8 filter rework + docx export From: Fridrich Strba and other attributes coming in; we start to have all the more or less easy ones covered now 2009-02-17 11:28:43 +0100 kendy r267883 : #i96319# WW8 filter rework + docx export From: Fridrich Strba some more attributes are comming in 2009-02-17 11:28:26 +0100 kendy r267882 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Create DocxNodeOutput. The basic one with a trivial implementation of TexNode() method so that it at least outputs all the paragraphs as one text run. 2009-02-17 11:28:03 +0100 kendy r267881 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky WriteText() moved from WW8Export do MSWordExportBase. And some refactoring implied by the move. 2009-02-17 11:27:35 +0100 kendy r267880 : #i96319# WW8 filter rework + docx export From: Fridrich Strba some more character attributes implemented 2009-02-17 11:27:18 +0100 kendy r267879 : #i96319# WW8 filter rework + docx export From: Fridrich Strba some text attributes + build fixes (not very informative, but it is me) 2009-02-17 11:26:57 +0100 kendy r267878 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky WW8Export holds an instance of WW8NodeOutput. Instead of creating a new one with every call of WW8Export::WriteText(). 2009-02-17 11:26:35 +0100 kendy r267877 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Get rid of aWW8NodeFnTab callbacks. Introduce NodeOutputBase/WW8NodeOutput instead, and change the OutWW8_* functions to the WW8NodeOutput methods. 2009-02-17 11:26:13 +0100 kendy r267876 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky pCurPam and pOrigPam back to MSWordExportBase. Looks necessary there... 2009-02-17 11:25:52 +0100 kendy r267875 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky DocxAttributeOutput implementation. So far just bare bones printing TODO's to stderr + output of real and ; also nothing instantiates it yet. 2009-02-17 11:25:30 +0100 kendy r267874 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Fixed a problem that more attributes were exported than necessary. 2009-02-17 11:25:10 +0100 kendy r267873 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Moving more stuff from MSWordExportBase to WW8Export. pCurPam and pOrigPam, pO, and pTableStream and pDataStream. Hopefully I won't have to move them back at some stage ;-) 2009-02-17 11:24:49 +0100 kendy r267872 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Cosmetic. 2009-02-17 11:24:27 +0100 kendy r267871 : #i96319# WW8 filter rework + docx export From: Fridrich Strba fix nondebug build too 2009-02-17 11:24:07 +0100 kendy r267870 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky After rework - even saves a trivial document :-) 2009-02-17 11:23:45 +0100 kendy r267869 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky SwWW8Writer and the attributes rework compiles now. Of course, no idea yet if it works at all. 2009-02-17 11:23:25 +0100 kendy r267868 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Ancestor of MSWordExportBase for docx. Just a dump of the work, still just writing the 'Hello, world!' document [if it compiled, which it does not ;-)] 2009-02-17 11:23:03 +0100 kendy r267867 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Instead of callbacks, use virtual functions to output attributes. This is just a dump of the rewrite, for sure does not compile. All the SwWW8Out_ callbacks were moved to a class dedicated for output - WW8AttributeOutput. It is a descendant of AttributeOutputBase; there will be a separate implementation for the docx case. 2009-02-17 11:22:43 +0100 kendy r267866 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Partial split of SwWW8Writer. Introduced a new structure - the logic of the filter will be in class MSWordExportBase, from which we will derive WW8Export and DocxExport. SwWW8Writer has been split into WW8Export (for the logic) and SwWW8Writer (for the actual access to the stream). For most of the methods it means renaming SwWW8Writer::MethodName() to WW8Export::MethodName() + cleaning access to the attributes/other methods. All this is not finished yet, and does not even compile - but it is necessary to dump the current status ;-) 2009-02-17 11:22:25 +0100 kendy r267865 : #i96319# WW8 filter rework + docx export From: Fridrich Strba do the filter forwarding the pure UNO way (hell expensive, but no build dependency on anything) 2009-02-17 11:22:06 +0100 kendy r267864 : #i96319# WW8 filter rework + docx export From: Fridrich Strba yay, we have the same component doing the import and export for word 2007 2009-02-17 11:21:46 +0100 kendy r267863 : #i96319# WW8 filter rework + docx export From: Fridrich Strba more work towards having the import and export in the same component 2009-02-17 11:21:20 +0100 kendy r267862 : #i96319# WW8 filter rework + docx export From: Fridrich Strba starting to forward export in writerfilter 2009-02-17 11:20:58 +0100 kendy r267860 : #i96319# WW8 filter rework + docx export From: Fridrich Strba trying to fix some of the registration stuff 2009-02-17 11:20:35 +0100 kendy r267859 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Exporting a real document. So far just a hardcoded 'Hello, world!' of course ;-) 2009-02-17 11:20:13 +0100 kendy r267858 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Renamed DocxWriter to DocxExportFilter. (...and also the files that contain it) 2009-02-17 11:19:52 +0100 kendy r267857 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky The initial exporter. Can be chosen from the menu, but so far we can just get a SwDoc* in the exportDocument() method, and consequently the exported file has zero size. 2009-02-17 11:19:30 +0100 kendy r267854 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Simple output of the styles. As just the and attributes work for now, the output is not much helpful ;-) - but as a proof-of-concept, this must be enough... 2009-02-17 11:15:14 +0100 kendy r267852 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky The fonts are between and . 2009-02-17 11:11:06 +0100 kendy r267851 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Proof-of-concept saving the fonts (word/fontTable.xml). As with the previous commits, it is just dumped to stderr. 2009-02-17 11:08:36 +0100 kendy r267850 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Proof-of-concept saving attributes of the text runs. Still using the DOCX debug class, which will be gone in the real implementation. 2009-02-17 11:04:40 +0100 kendy r267848 : #i96319# WW8 filter rework + docx export From: Jan Holesovsky Proof-of-concept save of paragraphs/runs/text. The paragraph pieces of DOCX just get dumped to stdout while saving the 'normal' DOC. This is just a hacky way of doing it, will be cleaned up (and converted to actual output to a stream) when I get the attributes, and distinction between main document/headers/footers/etc. right. 2009-02-17 11:02:54 +0100 kendy r267847 : #i96319# WW8 filter rework + docx export From: Fridrich Strba Make writerfilter export filter too (at least formally) 2009-02-16 22:48:29 +0100 kendy r267840 : CWS-TOOLING: rebase CWS ooxml03 to trunk@267171 (milestone: DEV300:m41) --- scp2/source/ooo/file_library_ooo.scp | 3 +++ scp2/source/ooo/file_ooo.scp | 2 +- scp2/source/ooo/module_hidden_ooo.scp | 2 +- solenv/inc/libs.mk | 4 ++++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 351360c3939f..3304e3ed6ec6 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1456,7 +1456,10 @@ STD_LIB_FILE_PATCH( gid_File_Lib_Svl, svl ) STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Svtools, svt ) SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Svtmisc, svtmisc.uno ) +STD_LIB_FILE_PATCH( gid_File_Lib_Svx_Core, svxcore) +STD_LIB_FILE_PATCH( gid_File_Lib_Svx_Msfilter, svxmsfilter) STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Svx, svx) + STD_UNO_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs) STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sw , sw) diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 5ddbbe70b70f..d4306e073e52 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -359,7 +359,7 @@ End STD_FILTER_FILE( gid_File_Filter_Eme, eme) -STD_FILTER_FILE_PATCH( gid_File_Filter_Emp, emp) +STD_FILTER_FILE_PATCH( gid_File_Filter_Sdfilt, sdfilt) STD_FILTER_FILE( gid_File_Filter_Icg, icg) diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 8729bea719f3..7ee9f755e781 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -140,7 +140,7 @@ Module gid_Module_Root_Files_4 Styles = (HIDDEN_ROOT); Files = (gid_File_Dat_Root4, gid_File_Filter_Eme, - gid_File_Filter_Emp, + gid_File_Filter_Sdfilt, gid_File_Filter_Icg, gid_File_Filter_Egi, gid_File_Filter_Epb, diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index b463b5db3db8..200ea5b54462 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -245,6 +245,8 @@ EGGTRAYLIB=-leggtray$(DLLPOSTFIX) SFXDEBUGLIB= FWELIB=-lfwe$(DLLPOSTFIX) FWILIB=-lfwi$(DLLPOSTFIX) +SVXCORELIB=-lsvxcore$(DLLPOSTFIX) +SVXMSFILTERLIB=-lsvxmsfilter$(DLLPOSTFIX) SVXLIB=-lsvx$(DLLPOSTFIX) BASCTLLIB=-lbasctl$(DLLPOSTFIX) BASICIDELIB=-lybctl @@ -428,6 +430,8 @@ DOCMGRLIB=docmgr.lib BASICLIB=basic.lib TKTLIB=tkt.lib SJLIB=sj.lib +SVXCORELIB=isvxcore.lib +SVXMSFILTERLIB=isvxmsfilter.lib SVXLIB=isvx.lib BASCTLLIB=basctl.lib BASICIDELIB=ybctl.lib -- cgit From 8376996e6553f0026390e64fbc1fd21106bf308b Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Tue, 25 Aug 2009 11:09:20 +0000 Subject: CWS-TOOLING: integrate CWS jl123 2009-08-04 12:34:31 +0200 jl r274615 : #i103742# added note regarding Berkeley update 2009-07-27 11:24:49 +0200 jl r274351 : #i100916# applying tono's patch 2009-07-22 16:29:54 +0200 jl r274248 : CWS-TOOLING: rebase CWS jl123 to trunk@274203 (milestone: DEV300:m53) 2009-07-21 11:49:45 +0200 jl r274172 : #100916# syncing data base with fcntl( F_FULLSYNC) failed with an unexpected error on Mac when buiding on NFS. Although there is a fallback using fsync, it was not used because of the unexpected error 2009-07-20 09:35:42 +0200 jl r274107 : #i100916# Applied tono's second patch 2009-07-16 16:41:24 +0200 jl r274062 : i100916 2009-07-13 14:47:32 +0200 jl r273936 : #i100916# deliver libdb-47.lib 2009-07-13 11:03:26 +0200 jl r273921 : #i100916# applied tono's patches for mingw 2009-07-10 14:34:22 +0200 jl r273895 : #i100916# renamed mingw patch 2009-07-10 14:33:36 +0200 jl r273894 : #i100916# renamed mingw patch 2009-07-10 14:04:39 +0200 jl r273890 : #i100916# new patch 2009-07-10 11:39:54 +0200 jl r273882 : #i100916# updating berkeleydb 2009-07-10 11:03:16 +0200 jl r273880 : #i100916# updating berkeleydb 2009-07-02 12:52:53 +0200 jl r273638 : CWS-TOOLING: rebase CWS jl127 to trunk@273468 (milestone: DEV300:m51) 2009-04-08 13:32:52 +0200 jl r270642 : #i100916# 2009-04-08 13:25:15 +0200 jl r270639 : #i100916# new version of berkeleydb 2009-04-08 12:37:14 +0200 jl r270634 : #i100916# changes for version 4.7.25 2009-04-08 12:36:08 +0200 jl r270633 : #i100916# new patch file for version 4.7.25 (no encryption) --- scp2/source/ooo/file_library_ooo.scp | 4 ++-- solenv/inc/libs.mk | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 3304e3ed6ec6..f7ed5904e033 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -242,9 +242,9 @@ File gid_File_Lib_Db Styles = (PACKED); Dir = gid_Dir_Program; #ifdef UNX - Name = STRING(CONCAT2(libdb-4.2,UNXSUFFIX)); + Name = STRING(CONCAT2(libdb-4.7,UNXSUFFIX)); #else - Name = "libdb42.dll"; + Name = "libdb47.dll"; #endif End diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 200ea5b54462..a0a318230255 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -233,10 +233,8 @@ NEON3RDLIB=$(STATIC) -lneon $(DYNAMIC) .ENDIF .IF "$(SYSTEM_DB)" == "YES" BERKELEYLIB=-ldb -BERKELEYCPPLIB=-ldb_cxx .ELSE -BERKELEYLIB=-ldb-4.2 -BERKELEYCPPLIB=-ldb_cxx-4.2 +BERKELEYLIB=-ldb-4.7 .ENDIF CURLLIB=-lcurl SFX2LIB=-lsfx$(DLLPOSTFIX) @@ -446,8 +444,7 @@ EXPATASCII3RDLIB=expat_xmltok.lib ascii_expat_xmlparse.lib ZLIB3RDLIB=zlib.lib JPEG3RDLIB=jpeglib.lib NEON3RDLIB=neon.lib -BERKELEYLIB=libdb42.lib -BERKELEYCPPLIB= +BERKELEYLIB=libdb47.lib CURLLIB=libcurl.lib CHAOSLIB=ichaos.lib UUILIB=iuui.lib -- cgit From 412727e371b974b89f75924b6547b54ad19ace41 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Tue, 25 Aug 2009 13:07:56 +0000 Subject: CWS-TOOLING: integrate CWS sb110 2009-08-05 15:28:43 +0200 sb r274677 : CWS-TOOLING: rebase CWS sb110 to trunk@274622 (milestone: DEV300:m54) 2009-08-05 11:46:36 +0200 sb r274646 : #i104018# fixed previous svn changeset 271712 (from issue 101244) 2009-07-20 14:41:56 +0200 sb r274138 : CWS-TOOLING: rebase CWS sb110 to trunk@273858 (milestone: DEV300:m52) 2009-06-02 11:42:17 +0200 sb r272489 : CWS-TOOLING: rebase CWS sb110 to trunk@272291 (milestone: DEV300:m49) 2009-05-08 12:46:51 +0200 sb r271712 : #i101244# after DLLs have been moved from basis to brand layer on Windows, code that used SvtPathOptions::GetModulePath to located libraries had to be adapted 2009-05-08 10:10:43 +0200 sb r271703 : #i101244# for performance reasons, on Windows move DLLs from basis to brand layer (i.e., next to executables); consequently eliminated some library duplications across the layers; adapted various code to the move 2009-05-08 09:54:44 +0200 sb r271702 : #i101244# hardwire Python dynamic libraries and script files into base layer (even if other dynamic libraries will move to brand layer on Windows), mainly because the pyuno dynamic library is both linked against from other dynamic libraries (pythonloader.uno) and accessed via "import pyuno" from Python scripts 2009-05-07 17:18:30 +0200 sb r271686 : #i101244# support NativeServicesURLPrefix on individual files; to implement that, changed meaning of global unomaxservices 2009-05-07 17:15:24 +0200 sb r271685 : #i101244# take legacy_binfilters.rdb explicitly from $OOO_BASE_DIR/program (instead of implicitly next to some dynamic library); cleaned up dead code 2009-05-07 17:12:12 +0200 sb r271684 : #i101244# take senddoc.exe explicitly from $OOO_BASE_DIR/program (instead of implicitly next to some dynamic library) 2009-05-07 17:11:33 +0200 sb r271683 : #i101244# take odbcconfig.exe explicitly from $OOO_BASE_DIR/program (instead of implicitly next to some dynamic library) 2009-05-07 17:09:44 +0200 sb r271682 : #i101244# read configmgr ini file explicitly from $OOO_BASE_DIR/program (instead of next to configmgr dynamic library) --- scp2/inc/macros.inc | 18 +- scp2/source/activex/file_activex.scp | 6 +- scp2/source/canvas/cairocanvas.scp | 2 +- scp2/source/gnome/file_gnome.scp | 6 +- scp2/source/impress/module_ogltrans.scp | 2 +- scp2/source/javafilter/file_javafilter.scp | 4 +- scp2/source/kde/file_kde.scp | 2 +- scp2/source/ooo/common_brand.scp | 5 +- scp2/source/ooo/file_library_ooo.scp | 316 ++++++++------------- scp2/source/ooo/file_ooo.scp | 6 +- scp2/source/ooo/module_hidden_ooo.scp | 5 - scp2/source/ooo/shortcut_ooo.scp | 10 +- scp2/source/python/file_python.scp | 1 + scp2/source/winexplorerext/file_winexplorerext.scp | 2 +- scp2/source/writer/file_writer.scp | 2 +- solenv/bin/modules/installer/globals.pm | 2 +- solenv/bin/modules/installer/servicesfile.pm | 81 +++--- 17 files changed, 206 insertions(+), 264 deletions(-) diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index cdbc6f8ce20d..7d9cdbd1d027 100644 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -85,6 +85,12 @@ #define EXTRAFILENAME(name,lang) STRING(CONCAT3(name,lang,.zip)) #define CONFIGLANGFILENAME(name,lang,ext) STRING(CONCAT4(name,lang,.,ext)) +#if defined WNT +#define SCP2_OOO_BIN_DIR gid_Brand_Dir_Program +#else +#define SCP2_OOO_BIN_DIR gid_Dir_Program +#endif + #define BIN_FILE_BODY \ UnixRights = 555 @@ -121,12 +127,12 @@ #define PACKED_LIB_FILE_BODY \ TXT_FILE_BODY; \ Styles = (PACKED); \ - Dir = gid_Dir_Program + Dir = SCP2_OOO_BIN_DIR #define PACKED_LIB_FILE_BODY_PATCH \ TXT_FILE_BODY; \ Styles = (PACKED,PATCH); \ - Dir = gid_Dir_Program + Dir = SCP2_OOO_BIN_DIR #define PACKED_FILTER_FILE_BODY \ TXT_FILE_BODY; \ @@ -307,13 +313,13 @@ #define PACKED_UNO_LIB_FILE_BODY \ TXT_FILE_BODY; \ Styles = (PACKED,UNO_COMPONENT); \ - Dir = gid_Dir_Program; \ + Dir = SCP2_OOO_BIN_DIR; \ RegistryID = gid_Starregistry_Services_Rdb #define PACKED_UNO_LIB_FILE_BODY_PATCH \ TXT_FILE_BODY; \ Styles = (PACKED,UNO_COMPONENT,PATCH); \ - Dir = gid_Dir_Program; \ + Dir = SCP2_OOO_BIN_DIR; \ RegistryID = gid_Starregistry_Services_Rdb #define STD_UNO_LIB_FILE(id,name) \ @@ -374,7 +380,7 @@ File id \ TXT_FILE_BODY; \ Name = LIBNAME(name); \ - Dir = gid_Dir_Program; \ + Dir = SCP2_OOO_BIN_DIR; \ Styles = (PACKED, NO_WARNING_IF_NOT_EXISTS); \ End @@ -382,7 +388,7 @@ File id \ TXT_FILE_BODY; \ Name = LIBNAME(name); \ - Dir = gid_Dir_Program; \ + Dir = SCP2_OOO_BIN_DIR; \ Styles = (PACKED, NO_WARNING_IF_NOT_EXISTS, UNO_COMPONENT); \ RegistryID = gid_Starregistry_Services_Rdb; \ End diff --git a/scp2/source/activex/file_activex.scp b/scp2/source/activex/file_activex.scp index 6dcb531a6d7f..8cc1c45e17e7 100644 --- a/scp2/source/activex/file_activex.scp +++ b/scp2/source/activex/file_activex.scp @@ -33,21 +33,21 @@ File gid_File_Lib_Soactivex TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = "so_activex.dll"; End File gid_File_Lib_Regactivex_Msi TXT_FILE_BODY; Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = "regactivex.dll"; End File gid_File_Lib_Regpatchactivex_Msi TXT_FILE_BODY; Styles = (PACKED,PATCH,PATCH_ONLY,BINARYTABLE,BINARYTABLE_ONLY,DONTRENAMEINPATCH); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = "regpatchactivex.dll"; End diff --git a/scp2/source/canvas/cairocanvas.scp b/scp2/source/canvas/cairocanvas.scp index 51ee7863dd9c..f3251634c53d 100644 --- a/scp2/source/canvas/cairocanvas.scp +++ b/scp2/source/canvas/cairocanvas.scp @@ -34,7 +34,7 @@ File gid_File_Lib_CairoCanvas TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(cairocanvas.uno,UNXSUFFIX)); #else diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp index 0161e06545c6..a7fdf1196ac3 100644 --- a/scp2/source/gnome/file_gnome.scp +++ b/scp2/source/gnome/file_gnome.scp @@ -33,7 +33,7 @@ File gid_File_Lib_GIO TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = STRING(CONCAT2(ucpgio1.uno,UNXSUFFIX)); RegistryID = gid_Starregistry_Services_Rdb; Regmergefile = "ucpgio-ucd.txt"; @@ -44,7 +44,7 @@ End File gid_File_Lib_Gnomevfs TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = STRING(CONCAT2(ucpgvfs1.uno,UNXSUFFIX)); RegistryID = gid_Starregistry_Services_Rdb; Regmergefile = "ucpgvfs-ucd.txt"; @@ -55,7 +55,7 @@ End File gid_File_Lib_Gconfbe TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = STRING(CONCAT2(gconfbe1.uno,UNXSUFFIX)); RegistryID = gid_Starregistry_Services_Rdb; Regmergefile = "gconfbe1-ucd.txt"; diff --git a/scp2/source/impress/module_ogltrans.scp b/scp2/source/impress/module_ogltrans.scp index 17d5c31e5a12..18425e88033a 100644 --- a/scp2/source/impress/module_ogltrans.scp +++ b/scp2/source/impress/module_ogltrans.scp @@ -43,7 +43,7 @@ File gid_File_Lib_OpenGLTransitions TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(OGLTrans.uno,UNXSUFFIX)); #else diff --git a/scp2/source/javafilter/file_javafilter.scp b/scp2/source/javafilter/file_javafilter.scp index 01f68c9b3e4c..3cd33ece0b26 100644 --- a/scp2/source/javafilter/file_javafilter.scp +++ b/scp2/source/javafilter/file_javafilter.scp @@ -35,7 +35,7 @@ File gid_File_Lib_Xmergesync TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = "xmergesync.dll"; End @@ -46,7 +46,7 @@ End File gid_File_Lib_Jfregca TXT_FILE_BODY; Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = "jfregca.dll"; End diff --git a/scp2/source/kde/file_kde.scp b/scp2/source/kde/file_kde.scp index 1835a39819b5..4cd9de0b240c 100644 --- a/scp2/source/kde/file_kde.scp +++ b/scp2/source/kde/file_kde.scp @@ -33,7 +33,7 @@ File gid_File_Lib_Kdebe TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = STRING(CONCAT2(kdebe1.uno,UNXSUFFIX)); RegistryID = gid_Starregistry_Services_Rdb; Regmergefile = "kdebe1-ucd.txt"; diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 7863b39788ea..60ba10716480 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -502,7 +502,10 @@ File gid_Brand_File_Bin_Unopkg Name = "unopkg.bin"; End -#if defined WNT && defined M1310 +#if defined WNT && \ + (defined M1310 || \ + ((defined M1400 || defined M1500) && \ + !(defined SYSTEM_MOZILLA || defined WITHOUT_MOZILLA))) File gid_Brand_File_Bin_Msvcr71 TXT_FILE_BODY; Dir = gid_Brand_Dir_Program; diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index f7ed5904e033..6c81b0f14928 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -33,7 +33,7 @@ File gid_File_Lib_Accessbridge BIN_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = "java_uno_accessbridge.dll"; End #endif @@ -63,7 +63,7 @@ File gid_File_Lib_Basprov TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT4(basprov,DLLPOSTFIX,.uno,UNXSUFFIX)); #else @@ -77,7 +77,7 @@ File gid_File_Lib_Cached1 TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(libcached1,UNXSUFFIX)); #else @@ -89,7 +89,7 @@ File gid_File_Lib_Configmgr2 TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(configmgr2.uno,UNXSUFFIX)); #else @@ -101,7 +101,7 @@ File gid_File_Lib_Sysmgr1 TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(sysmgr1.uno,UNXSUFFIX)); #else @@ -113,7 +113,7 @@ File gid_File_Lib_Behelper TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(behelper.uno,UNXSUFFIX)); #else @@ -126,7 +126,7 @@ File gid_File_Lib_Ldapbe2 TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(ldapbe2.uno,UNXSUFFIX)); #else @@ -203,7 +203,7 @@ File gid_File_Lib_Comphelper2 #else Name = STRING(CONCAT3(comphelp4,COMID,.dll)); #endif - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Styles = (PACKED,UNO_COMPONENT,PATCH); RegistryID = gid_Starregistry_Services_Rdb; End @@ -217,7 +217,7 @@ STD_LIB_FILE_PATCH( gid_File_Lib_Cui, cui) File gid_File_Lib_Curl TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; #ifdef UNX #ifdef MACOSX Name = STRING(CONCAT2(libcurl.3,UNXSUFFIX)); @@ -240,7 +240,7 @@ End File gid_File_Lib_Db TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(libdb-4.7,UNXSUFFIX)); #else @@ -256,7 +256,7 @@ End File gid_File_Lib_Egg_Tray TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = STRING(CONCAT3(libeggtray,DLLPOSTFIX,UNXSUFFIX)); End @@ -264,7 +264,7 @@ File gid_File_Lib_QStart_Gtk Name = LIBNAME(qstart_gtk); TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; End #endif #endif @@ -294,7 +294,7 @@ File gid_File_Lib_Dbpool TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(libdbpool2,UNXSUFFIX)); #else @@ -313,7 +313,7 @@ File gid_File_Lib_Dict_Ja #else Name = "dict_ja.dll"; #endif - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Styles = (PACKED); End @@ -324,7 +324,7 @@ File gid_File_Lib_Dict_Zh #else Name = "dict_zh.dll"; #endif - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Styles = (PACKED); End @@ -335,7 +335,7 @@ File gid_File_Lib_Collator_Data #else Name = "collator_data.dll"; #endif - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Styles = (PACKED); End @@ -346,7 +346,7 @@ File gid_File_Lib_Index_Data #else Name = "index_data.dll"; #endif - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Styles = (PACKED); End @@ -357,7 +357,7 @@ File gid_File_Lib_Textconv_Dict #else Name = "textconv_dict.dll"; #endif - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Styles = (PACKED); End @@ -365,7 +365,7 @@ File gid_File_Lib_Dlgprov TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT,PATCH); RegistryID = gid_Starregistry_Services_Rdb; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT4(dlgprov,DLLPOSTFIX,.uno,UNXSUFFIX)); #else @@ -377,7 +377,7 @@ File gid_File_Lib_Stringresource TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT4(stringresource,DLLPOSTFIX,.uno,UNXSUFFIX)); #else @@ -392,7 +392,7 @@ File gid_File_Lib_Vbaobj TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT4(libvbaobj,DLLPOSTFIX,.uno,UNXSUFFIX)); #else @@ -410,7 +410,7 @@ File gid_File_Lib_Dnd TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = "dnd.dll"; End @@ -421,7 +421,7 @@ End File gid_File_Lib_Dtrans TXT_FILE_BODY; Name = "dtrans.dll"; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Styles = (PACKED, UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; End @@ -443,7 +443,7 @@ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Emser, emser ) File gid_File_Lib_Inprocserv TXT_FILE_BODY; Styles = (PACKED,PATCH); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = "inprocserv.dll"; End @@ -462,14 +462,14 @@ File gid_File_Lib_Kab_1 TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = STRING(CONCAT2(libkab1,UNXSUFFIX)); End File gid_File_Lib_Kab_Drv_1 TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = STRING(CONCAT2(libkabdrv1,UNXSUFFIX)); End @@ -486,14 +486,14 @@ File gid_File_Lib_Macab_1 TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = STRING(CONCAT2(libmacab1,UNXSUFFIX)); End File gid_File_Lib_Macab_Drv_1 TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = STRING(CONCAT2(libmacabdrv1,UNXSUFFIX)); End @@ -517,7 +517,7 @@ File gid_File_Lib_Evtatt TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(libevtatt,UNXSUFFIX)); #else @@ -530,7 +530,7 @@ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Fileacc,fileacc) File gid_File_Lib_Filterconfig1 TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT,PATCH); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; RegistryID = gid_Starregistry_Services_Rdb; Name = SPECIAL_NAME(filterconfig1); End @@ -549,7 +549,7 @@ File gid_File_Lib_Fop TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = "fop.dll"; End @@ -561,7 +561,7 @@ File gid_File_Lib_Fps TXT_FILE_BODY; Styles = (PACKED,PATCH,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = "fps.dll"; End @@ -572,7 +572,7 @@ End File gid_File_Lib_Desktopbe TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = STRING(CONCAT2(desktopbe1.uno,UNXSUFFIX)); RegistryID = gid_Starregistry_Services_Rdb; Regmergefile = "desktopbe1-ucd.txt"; @@ -584,7 +584,7 @@ File gid_File_Lib_Fps_Gnome TXT_FILE_BODY; Styles = (PACKED); RegistryID = gid_Starregistry_Services_Rdb; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = SPECIAL_COMPONENT_LIB_NAME(fps_gnome.uno); Regmergefile = "fps-gnome-ucd.txt"; End @@ -610,7 +610,7 @@ File gid_File_Lib_Fps_Aqua TXT_FILE_BODY; Styles = (PACKED,PATCH); RegistryID = gid_Starregistry_Services_Rdb; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = SPECIAL_COMPONENT_LIB_NAME(fps_aqua.uno); Regmergefile = "fps-aqua-ucd.txt"; End @@ -620,7 +620,7 @@ File gid_File_Lib_MacOSXSpell Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; Name = LIBNAME(MacOSXSpell); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; End File gid_File_Lib_avmediaQuickTime @@ -628,7 +628,7 @@ File gid_File_Lib_avmediaQuickTime Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; Name = LIBNAME(avmediaQuickTime); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; End #endif #endif @@ -642,7 +642,7 @@ SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Fpicker, fpicker.uno ) File gid_File_Lib_Cairo TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; #ifdef UNX #ifdef MACOSX Name = STRING(CONCAT3(libcairo,.2,UNXSUFFIX)); @@ -670,7 +670,7 @@ File gid_File_Lib_Ftransl TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = "ftransl.dll"; End @@ -684,7 +684,7 @@ File gid_File_Lib_Fwk Name = LIBNAME(fwk); TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT,PATCH); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; RegistryID = gid_Starregistry_Services_Rdb; End @@ -696,7 +696,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Fwm , fwm) File gid_File_Lib_Gdiplus BIN_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = "gdiplus.dll"; End #endif @@ -705,7 +705,7 @@ File gid_File_Lib_Go Name = LIBNAME(go); TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT,PATCH); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; RegistryID = gid_Starregistry_Services_Rdb; End @@ -717,7 +717,7 @@ File gid_File_Lib_I18npool TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT,PATCH); RegistryID = gid_Starregistry_Services_Rdb; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(i18npool.uno,UNXSUFFIX)); #else @@ -728,7 +728,7 @@ End File gid_File_Lib_I18nregexp TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT3(libi18nregexp,COMID,UNXSUFFIX)); #else @@ -740,7 +740,7 @@ File gid_File_Lib_I18nsearch TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(i18nsearch.uno,UNXSUFFIX)); #else @@ -764,7 +764,7 @@ File gid_File_Lib_I18nutil #else Name = STRING(CONCAT3(i18nutil,COMID,.dll)); #endif - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Styles = (PACKED); End @@ -779,7 +779,7 @@ File gid_File_Lib_Icudata #else Name = STRING(CONCAT4(icudt,ICU_MAJOR,ICU_MINOR,.dll)); #endif - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Styles = (PACKED); End @@ -790,7 +790,7 @@ File gid_File_Lib_Icui18n #else Name = STRING(CONCAT4(icuin,ICU_MAJOR,ICU_MINOR,.dll)); #endif - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Styles = (PACKED); End @@ -801,7 +801,7 @@ File gid_File_Lib_Icule #else Name = STRING(CONCAT4(icule,ICU_MAJOR,ICU_MINOR,.dll)); #endif - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Styles = (PACKED); End @@ -812,7 +812,7 @@ File gid_File_Lib_Icuuc #else Name = STRING(CONCAT4(icuuc,ICU_MAJOR,ICU_MINOR,.dll)); #endif - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Styles = (PACKED); End @@ -825,7 +825,7 @@ File gid_File_Lib_J #else Name = STRING(CONCAT4(j,DLLPOSTFIX,_g,.dll)); #endif - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Styles = (PACKED); End @@ -852,7 +852,7 @@ File gid_File_Lib_Hsqldb_2 TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(libhsqldb,UNXSUFFIX)); #else @@ -867,7 +867,7 @@ End File gid_File_Lib_Lngpckinsthlp BIN_FILE_BODY; Styles = (PACKED, LANGUAGEPACK, BINARYTABLE, BINARYTABLE_ONLY); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = "lngpckinsthlp.dll"; End @@ -878,7 +878,7 @@ End File gid_File_Lib_sn_tools BIN_FILE_BODY; Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY, DONTRENAMEINPATCH); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = "sn_tools.dll"; End @@ -889,7 +889,7 @@ End File gid_File_Lib_relnotes BIN_FILE_BODY; Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY, DONTRENAMEINPATCH); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = "relnotes.dll"; End @@ -900,7 +900,7 @@ End File gid_File_Lib_Patchmsi TXT_FILE_BODY; Name = "patchmsi.dll"; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Styles = (PACKED,PATCH,PATCH_ONLY,BINARYTABLE,BINARYTABLE_ONLY,DONTRENAMEINPATCH); End @@ -911,7 +911,7 @@ End File gid_File_Lib_Rebasemsi TXT_FILE_BODY; Name = "rebase.dll"; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Styles = (PACKED,PATCH,BINARYTABLE,BINARYTABLE_ONLY,DONTRENAMEINPATCH); End @@ -926,7 +926,7 @@ File gid_File_Lib_Localedata_En #else Name = "localedata_en.dll"; #endif - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Styles = (PACKED); End @@ -937,7 +937,7 @@ File gid_File_Lib_Localedata_Es #else Name = "localedata_es.dll"; #endif - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Styles = (PACKED); End @@ -948,7 +948,7 @@ File gid_File_Lib_Localedata_Euro #else Name = "localedata_euro.dll"; #endif - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Styles = (PACKED); End @@ -959,7 +959,7 @@ File gid_File_Lib_Localedata_Others #else Name = "localedata_others.dll"; #endif - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Styles = (PACKED); End @@ -967,7 +967,7 @@ File gid_File_Lib_Mcnttype TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(libmcnttype,UNXSUFFIX)); #else @@ -997,7 +997,7 @@ File gid_File_Lib_Mozbootstrap TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT,PATCH); RegistryID = gid_Starregistry_Services_Rdb; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(libmozbootstrap,UNXSUFFIX)); #else @@ -1013,87 +1013,6 @@ STD_UNO_LIB_FILE(gid_File_Lib_T602Filter,t602filter) STD_UNO_LIB_FILE(gid_File_Lib_Writerfilter,writerfilter) -#ifdef WNT -#if defined(_gcc3) - -File gid_File_Lib_Mingwm10 - BIN_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Program; - Name = "mingwm10.dll"; -End - -#endif -#endif - -#if defined(WNT) -#if defined(M1400) -#if defined(PROF_EDITION) -File gid_File_Lib_Msvcr80 - BIN_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Program; -#ifndef _STLP_DEBUG - Name = "msvcr80.dll"; -#else - Name = "msvcr80d.dll"; -#endif -End -#endif -#endif -#endif - -#if defined(WNT) -#if defined(M1400) -#if defined(PROF_EDITION) -File gid_File_Lib_Msvcp80 - BIN_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Program; -#ifndef _STLP_DEBUG - Name = "msvcp80.dll"; -#else - Name = "msvcp80d.dll"; -#endif -End -#endif -#endif -#endif - -#if defined(WNT) -#if defined(M1400) -#if defined(PROF_EDITION) -File gid_File_Lib_Msvcm80 - BIN_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Program; -#ifndef _STLP_DEBUG - Name = "msvcm80.dll"; -#else - Name = "msvcm80d.dll"; -#endif -End -#endif -#endif -#endif - -#if defined(WNT) -#if defined(M1400) -#if defined(PROF_EDITION) -File gid_File_Msvcm80crt_Manifest - BIN_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Program; -#ifndef _STLP_DEBUG - Name = "Microsoft.VC80.CRT.manifest"; -#else - Name = "Microsoft.VC80.DebugCRT.manifest"; -#endif -End -#endif -#endif -#endif - STD_UNO_LIB_FILE(gid_File_Lib_Mysql,mysql) File gid_File_Oo_Office_Dataaccess_Mysql_Xcu TXT_FILE_BODY; @@ -1125,7 +1044,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Offacc, offacc) File gid_File_Lib_Officebean TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(libofficebean,UNXSUFFIX)); #else @@ -1142,7 +1061,7 @@ File gid_File_Lib_Ole TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = "oleautobridge.uno.dll"; End @@ -1191,7 +1110,7 @@ File gid_File_Lib_Vclplug_Gen Name = LIBNAME(vclplug_gen); TXT_FILE_BODY; Styles = (PACKED,PATCH); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; End #endif @@ -1201,7 +1120,7 @@ File gid_File_Lib_Vclplug_Gtk Name = LIBNAME(vclplug_gtk); TXT_FILE_BODY; Styles = (PACKED,PATCH); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; End #endif #ifdef ENABLE_KDE @@ -1210,7 +1129,7 @@ File gid_File_Lib_Vclplug_Kde Name = LIBNAME(vclplug_kde); TXT_FILE_BODY; Styles = (PACKED,PATCH); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; End #endif #endif @@ -1231,7 +1150,7 @@ File gid_File_Lib_AppleRemote Name = LIBNAME(AppleRemote); TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; End #endif @@ -1240,7 +1159,7 @@ File gid_File_Lib_Basebmp Name = LIBNAME(basebmp); TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; End #endif @@ -1254,7 +1173,7 @@ STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp ) File gid_File_Lib_Recentfile TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = STRING(CONCAT2(librecentfile,UNXSUFFIX)); End @@ -1265,7 +1184,7 @@ End File gid_File_Lib_Reg4allmsdoc TXT_FILE_BODY; Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = "reg4allmsdoc.dll"; End @@ -1276,7 +1195,7 @@ End File gid_File_Lib_Qslnkmsi TXT_FILE_BODY; Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = "qslnkmsi.dll"; End @@ -1287,7 +1206,7 @@ End File gid_File_Lib_Sdqsmsi TXT_FILE_BODY; Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = "sdqsmsi.dll"; End @@ -1297,7 +1216,7 @@ File gid_File_Lib_Res Name = LIBNAME(res); TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT,PATCH); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; RegistryID = gid_Starregistry_Services_Rdb; End @@ -1305,7 +1224,7 @@ File gid_File_Lib_Sax_Uno TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT,DONT_OVERWRITE); RegistryID = gid_Starregistry_Services_Rdb; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(sax.uno,UNXSUFFIX)); #else @@ -1317,7 +1236,7 @@ File gid_File_Lib_Fastsax_Uno TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT,DONT_OVERWRITE); RegistryID = gid_Starregistry_Services_Rdb; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(fastsax.uno,UNXSUFFIX)); #else @@ -1345,7 +1264,7 @@ File gid_File_Lib_Scriptframe Name = "scriptframe.dll"; #endif RegistryID = gid_Starregistry_Services_Rdb; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Styles = (PACKED,PATCH,UNO_COMPONENT); End @@ -1356,7 +1275,7 @@ File gid_File_Lib_Slideshow TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT,PATCH); RegistryID = gid_Starregistry_Services_Rdb; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(slideshow.uno,UNXSUFFIX)); #else @@ -1368,7 +1287,7 @@ File gid_File_Lib_Sdbc_2 TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(libsdbc2,UNXSUFFIX)); #else @@ -1384,7 +1303,7 @@ File gid_File_Lib_Sfx Name = LIBNAME(sfx); TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT,PATCH); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; RegistryID = gid_Starregistry_Services_Rdb; End @@ -1393,21 +1312,21 @@ End File gid_File_Lib_OOoFilt TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = "ooofilt.dll"; End File gid_File_Lib_OOoFiltProxy TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = "ooofiltproxy.dll"; End File gid_File_Lib_Instooofiltmsi TXT_FILE_BODY; Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = "instooofiltmsi.dll"; End @@ -1419,7 +1338,7 @@ File gid_File_Lib_Smplmail TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = "smplmail.uno.dll"; End @@ -1433,7 +1352,7 @@ File gid_File_Lib_Spa Name = LIBNAME(spa); TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; End #endif @@ -1443,7 +1362,7 @@ File gid_File_Lib_Spell Styles = (PACKED,UNO_COMPONENT,PATCH); RegistryID = gid_Starregistry_Services_Rdb; Name = LIBNAME(spell); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; End STD_UNO_LIB_FILE( gid_File_Lib_Spl, spl) @@ -1471,7 +1390,7 @@ File gid_File_Lib_Sysdtrans TXT_FILE_BODY; Styles = (PACKED,PATCH,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; #ifdef UNX #ifdef QUARTZ Name = STRING(CONCAT3(libdtransaqua,DLLPOSTFIX,UNXSUFFIX)); @@ -1503,7 +1422,7 @@ File gid_File_Lib_Tvhlp1 TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(libtvhlp1,UNXSUFFIX)); #else @@ -1515,7 +1434,7 @@ File gid_File_Lib_Ucb1 TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(libucb1,UNXSUFFIX)); #else @@ -1525,7 +1444,7 @@ End File gid_File_Lib_Ucbhelper TXT_FILE_BODY; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Styles = (PACKED); #ifdef UNX Name = STRING(CONCAT3(libucbhelper4,COMID,UNXSUFFIX)); @@ -1541,7 +1460,7 @@ File gid_File_Lib_Ucpchelp1 #else Name = "ucpchelp1.dll"; #endif - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Styles = (PACKED, UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; End @@ -1567,7 +1486,7 @@ File gid_File_Lib_Lnth Styles = (PACKED,UNO_COMPONENT,PATCH); RegistryID = gid_Starregistry_Services_Rdb; Name = LIBNAME(lnth); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; End File gid_File_Lib_Hyph @@ -1575,7 +1494,7 @@ File gid_File_Lib_Hyph Styles = (PACKED,UNO_COMPONENT,PATCH); RegistryID = gid_Starregistry_Services_Rdb; Name = LIBNAME(hyphen); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; End STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Utl , utl) @@ -1588,7 +1507,7 @@ File gid_File_Lib_Vcl Name = LIBNAME(vcl); TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT,PATCH); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; RegistryID = gid_Starregistry_Services_Rdb; End @@ -1599,7 +1518,7 @@ File gid_File_Lib_Vos #else Name = STRING(CONCAT3(vos3,COMID,.dll)); #endif - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Styles = (PACKED); End @@ -1613,7 +1532,7 @@ File gid_File_Lib_Xo Name = LIBNAME(xo); TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT,PATCH); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; RegistryID = gid_Starregistry_Services_Rdb; End @@ -1633,7 +1552,7 @@ UNO_JAR_FILE( gid_File_Jar_Xsltvalidate, XSLTValidate ) File gid_File_Lib_Xslt TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; #ifdef UNX #ifdef MACOSX Name = STRING(CONCAT4(libxslt,.,LIBXSLT_MAJOR,UNXSUFFIX)); @@ -1674,7 +1593,7 @@ File gid_File_Lib_XSec_Framework #else Name = "xsec_fw.dll"; #endif - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Styles = (PACKED,UNO_COMPONENT,PATCH); RegistryID = gid_Starregistry_Services_Rdb; End @@ -1686,7 +1605,7 @@ File gid_File_Lib_XSec_XmlSec #else Name = "xsec_xmlsec.dll"; #endif - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Styles = (PACKED,UNO_COMPONENT,PATCH); RegistryID = gid_Starregistry_Services_Rdb; End @@ -1698,7 +1617,7 @@ File gid_File_Lib_XSec_XMLSecurity #else Name = "xmlsecurity.dll"; #endif - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; End @@ -1711,7 +1630,7 @@ File gid_File_Lib_LibXMLSec_xmlseccore #else Name = "libxmlsec.dll"; #endif - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Styles = (PACKED); End @@ -1722,7 +1641,7 @@ File gid_File_Lib_LibXMLSec_xmlsecmscrypto #else Name = "libxmlsec-mscrypto.dll"; #endif - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Styles = (PACKED); End #endif @@ -1734,7 +1653,7 @@ File gid_File_Lib_Migrationoo2 TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(migrationoo2.uno,UNXSUFFIX)); #else @@ -1745,7 +1664,7 @@ End File gid_File_Lib_Libtextcat TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; #ifdef UNX Name = STRING(CONCAT2(libtextcat,UNXSUFFIX)); #else @@ -1763,7 +1682,7 @@ SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH( gid_File_Lib_Updatefeed , updatefeed.uno ) File gid_File_Lib_Onlinecheck BIN_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = "onlinecheck.dll"; End #endif @@ -1772,7 +1691,7 @@ End File gid_File_Lib_Openssl TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; #ifdef WNT Name = "ssleay32.dll"; #endif @@ -1783,7 +1702,7 @@ End File gid_File_Lib_Crypto TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; #ifdef WNT Name = "libeay32.dll"; @@ -1793,30 +1712,33 @@ End File gid_File_Lib_Soffice TXT_FILE_BODY; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = SCP2_URE_DL_NORMAL("sofficeapp"); Styles = (PACKED); End File gid_File_Lib_Unopkgapp TXT_FILE_BODY; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = SCP2_URE_DL_NORMAL("unopkgapp"); Styles = (PACKED); End STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Oooimprovecore , oooimprovecore) -#if defined WNT && !defined SYSTEM_MOZILLA && !defined WITHOUT_MOZILLA +#if defined WNT && !defined SYSTEM_MOZILLA && !defined WITHOUT_MOZILLA && \ + !(defined M1400 && defined PROF_EDITION && !defined _STLP_DEBUG) + // see common_brand.scp gid_Brand_File_Lib_Msvcp80 and + // gid_Brand_File_Lib_Msvcr80 File gid_File_Moz_Msvcp80 TXT_FILE_BODY; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = SCP2_URE_DL_NORMAL("msvcp80"); Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); End File gid_File_Moz_Msvcr80 TXT_FILE_BODY; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = SCP2_URE_DL_NORMAL("msvcr80"); Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); End @@ -1826,7 +1748,7 @@ End File gid_File_Lib_Raptor TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; #ifdef UNX #ifdef MACOSX Name = STRING(CONCAT4(libraptor,.,RAPTOR_MAJOR,UNXSUFFIX)); @@ -1845,7 +1767,7 @@ End File gid_File_Lib_Rasqal TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; #ifdef UNX #ifdef MACOSX Name = STRING(CONCAT4(librasqal,.,RASQAL_MAJOR,UNXSUFFIX)); @@ -1864,7 +1786,7 @@ End File gid_File_Lib_Rdf TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; #ifdef UNX #ifdef MACOSX Name = STRING(CONCAT4(librdf,.,REDLAND_MAJOR,UNXSUFFIX)); diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index d4306e073e52..211a473c00aa 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -1169,7 +1169,7 @@ End File gid_File_Mozilla_Runtime TXT_FILE_BODY; Styles = (ARCHIVE); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = "mozruntime.zip"; End @@ -2732,7 +2732,11 @@ File gid_Starregistry_Services_Rdb Name = "services.rdb"; Dir = gid_Dir_Program; Styles = (PACKED, STARREGISTRY, PATCH); +#if defined WNT + NativeServicesURLPrefix = "vnd.sun.star.expand:$BRAND_BASE_DIR/program/"; +#else NativeServicesURLPrefix = "vnd.sun.star.expand:$OOO_BASE_DIR/program/"; +#endif JavaServicesURLPrefix = "vnd.sun.star.expand:$OOO_BASE_DIR/program/classes/"; End diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 7ee9f755e781..9f4506b80d8a 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -401,13 +401,8 @@ Module gid_Module_Root_Files_5 gid_File_Lib_sn_tools, gid_File_Lib_relnotes, GID_FILE_LIB_WPD, - gid_File_Lib_Mingwm10, gid_File_Lib_Msvcp70, gid_File_Lib_Msvcr70, - gid_File_Lib_Msvcr80, - gid_File_Lib_Msvcp80, - gid_File_Lib_Msvcm80, - gid_File_Msvcm80crt_Manifest, gid_File_Lib_Ole, gid_File_Lib_Patchmsi, gid_File_Lib_Reg4allmsdoc, diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp index 357f976771b3..3824fe3a0841 100644 --- a/scp2/source/ooo/shortcut_ooo.scp +++ b/scp2/source/ooo/shortcut_ooo.scp @@ -35,28 +35,28 @@ Shortcut gid_Shortcut_Lib_Icudata FileID = gid_File_Lib_Icudata; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = STRING(CONCAT5(libicudata,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR)); Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE); End Shortcut gid_Shortcut_Lib_Icui18n FileID = gid_File_Lib_Icui18n; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = STRING(CONCAT5(libicui18n,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR)); Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE); End Shortcut gid_Shortcut_Lib_Icule FileID = gid_File_Lib_Icule; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = STRING(CONCAT5(libicule,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR)); Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE); End Shortcut gid_Shortcut_Lib_Icuuc FileID = gid_File_Lib_Icuuc; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = STRING(CONCAT5(libicuuc,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR)); Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE); End @@ -90,7 +90,7 @@ End Shortcut gid_Shortcut_Lib_Hsqldb_2 FileID = gid_File_Lib_Hsqldb_2; - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = "libhsqldb.jnilib"; Styles = (NETWORK, RELATIVE); End diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index 403e6385dcfd..d8412b7e2cab 100644 --- a/scp2/source/python/file_python.scp +++ b/scp2/source/python/file_python.scp @@ -50,6 +50,7 @@ File gid_File_Lib_Pythonloader Name = "pythonloader.uno.dll"; #endif RegistryID = gid_Starregistry_Services_Rdb; + NativeServicesURLPrefix = "vnd.sun.star.expand:$OOO_BASE_DIR/program/"; Styles = (PACKED,UNO_COMPONENT); End diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp index 23ed3b7b2365..e7b3584b32db 100644 --- a/scp2/source/winexplorerext/file_winexplorerext.scp +++ b/scp2/source/winexplorerext/file_winexplorerext.scp @@ -77,6 +77,6 @@ End File gid_File_Lib_Shlxtmsi TXT_FILE_BODY; Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY); - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Name = "shlxtmsi.dll"; End diff --git a/scp2/source/writer/file_writer.scp b/scp2/source/writer/file_writer.scp index 96960dc6283a..91ff3a33ca0a 100644 --- a/scp2/source/writer/file_writer.scp +++ b/scp2/source/writer/file_writer.scp @@ -39,7 +39,7 @@ File gid_File_Lib_Hwpreader #else Name = "hwp.dll"; #endif - Dir = gid_Dir_Program; + Dir = SCP2_OOO_BIN_DIR; Styles = (PACKED, UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; End diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm index 6782e06627b4..d9799069e539 100644 --- a/solenv/bin/modules/installer/globals.pm +++ b/solenv/bin/modules/installer/globals.pm @@ -397,7 +397,7 @@ BEGIN %usedtreeconditions = (); %moduledestination = (); - $unomaxservices = 25; + $unomaxservices = 1800; # regcomp -c argument length $javamaxservices = 15; $one_cab_file = 0; diff --git a/solenv/bin/modules/installer/servicesfile.pm b/solenv/bin/modules/installer/servicesfile.pm index 1e21c39cdef3..631db68da9dd 100644 --- a/solenv/bin/modules/installer/servicesfile.pm +++ b/solenv/bin/modules/installer/servicesfile.pm @@ -135,50 +135,62 @@ sub register_unocomponents my $error_occured = 0; my $filestring = ""; - for ( my $i = 0; $i <= $#{$unocomponents}; ) + for ( my $i = 0; $i <= $#{$unocomponents}; ++$i ) { - my $sourcepath = ${$unocomponents}[$i++]->{'sourcepath'}; - - $filestring = $filestring . make_file_url($sourcepath); - - if ( $i % $installer::globals::unomaxservices == 0 || $i > $#{$unocomponents} ) # limiting to $installer::globals::maxservices files + my $sourcepath = make_file_url(${$unocomponents}[$i]->{'sourcepath'}); + my $urlprefix = ${$unocomponents}[$i]->{'NativeServicesURLPrefix'}; + if (defined($urlprefix)) + { + call_regcomp( + $regcompfileref, $servicesfile, $sourcepath, $urlprefix); + } + else { - my @regcompoutput = (); + $filestring .= ";" unless $filestring eq ""; + $filestring .= $sourcepath; + } + if (length($filestring) > $installer::globals::unomaxservices || + ($i == $#{$unocomponents} && $filestring ne "")) + { + call_regcomp( + $regcompfileref, $servicesfile, $filestring, + $nativeservicesurlprefix); + $filestring = ""; + } + } - my $systemcall = "$installer::globals::wrapcmd $$regcompfileref -register -r ".fix_cygwin_path($servicesfile)." -c " . $installer::globals::quote . $filestring . $installer::globals::quote . " -wop=" . $installer::globals::quote . $nativeservicesurlprefix . $installer::globals::quote . " 2\>\&1 |"; + return $error_occured; +} - open (REG, "$systemcall"); - while () {push(@regcompoutput, $_); } - close (REG); +sub call_regcomp +{ + my ($regcompfileref, $servicesfile, $filestring, $urlprefix) = @_; + my @regcompoutput = (); - my $returnvalue = $?; # $? contains the return value of the systemcall + my $systemcall = "$installer::globals::wrapcmd $$regcompfileref -register -r ".fix_cygwin_path($servicesfile)." -c " . $installer::globals::quote . $filestring . $installer::globals::quote . " -wop=" . $installer::globals::quote . $urlprefix . $installer::globals::quote . " 2\>\&1 |"; - my $infoline = "Systemcall: $systemcall\n"; - push( @installer::globals::logfileinfo, $infoline); + open (REG, "$systemcall"); + while () {push(@regcompoutput, $_); } + close (REG); - for ( my $j = 0; $j <= $#regcompoutput; $j++ ) { push( @installer::globals::logfileinfo, "$regcompoutput[$j]"); } + my $returnvalue = $?; # $? contains the return value of the systemcall - if ($returnvalue) - { - $infoline = "ERROR: $systemcall\n"; - push( @installer::globals::logfileinfo, $infoline); - $error_occured = 1; - } - else - { - $infoline = "SUCCESS: $systemcall\n"; - push( @installer::globals::logfileinfo, $infoline); - } + my $infoline = "Systemcall: $systemcall\n"; + push( @installer::globals::logfileinfo, $infoline); - $filestring = ""; - } - else - { - $filestring = $filestring . ";"; - } - } + for ( my $j = 0; $j <= $#regcompoutput; $j++ ) { push( @installer::globals::logfileinfo, "$regcompoutput[$j]"); } - return $error_occured; + if ($returnvalue) + { + $infoline = "ERROR: $systemcall\n"; + push( @installer::globals::logfileinfo, $infoline); + $error_occured = 1; + } + else + { + $infoline = "SUCCESS: $systemcall\n"; + push( @installer::globals::logfileinfo, $infoline); + } } ################################################################ @@ -343,7 +355,6 @@ sub register_pythoncomponents $counter++; } -# if ((( $counter > 0 ) && ( $counter%$installer::globals::unomaxservices == 0 )) || (( $counter > 0 ) && ( $i == $#{$pythoncomponents} ))) # limiting to $installer::globals::maxservices files if ( $counter > 0 ) { $filestring =~ s/\;\s*$//; -- cgit From 3c9375838163d433f3319afed8e32d717a297346 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Tue, 25 Aug 2009 13:43:43 +0000 Subject: CWS-TOOLING: integrate CWS buildsourceconfig 2009-08-21 11:01:55 +0200 releng r275224 : #i104368# some clean-ups for incompatible etc modes 2009-08-21 09:52:22 +0200 releng r275220 : #i104368# build tool and new perl module for multiple repositories --- solenv/bin/build.pl | 555 ++++++++++++++++++------------------- solenv/bin/modules/SourceConfig.pm | 331 ++++++++++++++++++++++ 2 files changed, 599 insertions(+), 287 deletions(-) create mode 100644 solenv/bin/modules/SourceConfig.pm diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl index c83f65991a82..a08b69c3b526 100644 --- a/solenv/bin/build.pl +++ b/solenv/bin/build.pl @@ -44,6 +44,7 @@ use IO::Socket::INET; use lib ("$ENV{SOLARENV}/bin/modules"); + use SourceConfig; my $in_so_env = 0; if (defined $ENV{COMMON_ENV_TOOLS}) { @@ -168,7 +169,7 @@ $html_last_updated = 0; %jobs_hash = (); $html_path = undef; - $html_file = CorrectPath($ENV{SRC_ROOT} . '/' . $ENV{INPATH}. '.build.html'); + $html_file = CorrectPath($ENV{SOLARSRC} . '/' . $ENV{INPATH}. '.build.html'); $build_finished = 0; %had_error = (); # hack for misteriuos windows problems - try run dmake 2 times if first time there was an error $mkout = CorrectPath("$ENV{SOLARENV}/bin/mkout.pl"); @@ -188,6 +189,14 @@ # the server considered as an error/client crash my %lost_client_jobs = (); # hash containing lost jobs my %job_jobdir = (); # hash containing job-dir pairs + my %module_paths = (); # hash with absolute module paths + my $source_config = SourceConfig -> new(); + my $source_config_file = $source_config->get_config_file_path(); + my %active_modules = (); + my $generate_config = 0; + my %add_to_config = (); + my %remove_from_config = (); + my $clear_config = 0; ### main ### get_options(); @@ -209,7 +218,12 @@ $deliver_env{'L10N_framework'}++; }; + if ($generate_config) { + generate_config_file(); + exit 0; + } $StandDir = get_stand_dir(); # This also sets $CurrentPrj + get_module_and_buildlist_paths(); provide_consistency() if (defined $ENV{CWS_WORK_STAMP} && defined($ENV{COMMON_ENV_TOOLS})); $deliver_command = $ENV{DELIVER}; @@ -254,8 +268,11 @@ # } elsif (!$custom_job && $post_custom_job) { # do_post_custom_job(CorrectPath($StandDir.$CurrentPrj)); }; - if (scalar @warnings) { - print STDERR $_ foreach (@warnings); + print_warnings(); + if (scalar keys %active_modules) { + foreach (keys %dead_parents) { + delete $dead_parents{$_} if (!defined $active_modules{$_}); + }; }; if (scalar keys %dead_parents) { my ($DeadPrj); @@ -294,6 +311,117 @@ # # ######################### +sub print_warnings { + if (scalar @warnings) { + print STDERR "\nWARNING(S):\n"; + print STDERR $_ foreach (@warnings); + }; +}; + +sub rename_file { + my ($old_file_name, $new_file_name, $throw_error) = @_; + + if(-e $old_file_name) { + rename($old_file_name, $new_file_name) or system("mv", $old_file_name, $new_file_name); + if (-e $old_file_name) { + system("rm -rf $old_file_name") if (!unlink $old_file_name); + }; + } elsif ($throw_error) { + print_error("No such file $old_file_name"); + }; +}; + +sub generate_config_file { + my $temp_config_file = File::Temp::tmpnam($ENV{TMP}); + my @config_content_new = (); + my $addition_message; + my $removal_message; + my %present_modules = (); + if ($source_config_file) { + open(SOURCE_CONFIG_FILE, $source_config_file); + my @config_content = ; + close SOURCE_CONFIG_FILE; + my ($module_section, $repository_section); + foreach (@config_content) { + $line++; + if ((!/^\S+/)||(/^\s*#+/)) { + push(@config_content_new, $_); + next; + } + if (/^\[repositories\]\s*(\s+#)*/) { + if ($module_section) { + $addition_message = add_modules_to_source_config(\%add_to_config, \@config_content_new); + }; + $module_section = 0; + $repository_section = 1; + push(@config_content_new, $_); + next; + }; + if (/^\[modules\]\s*(\s+#)*/) { + $module_section = 1; + $repository_section = 0; + push(@config_content_new, $_); + next; + }; + if ($module_section && /\s*(\S+)=active\s*(\s+#)*/) { + if ($clear_config || defined $remove_from_config{$1}) { + delete $remove_from_config{$1}; + $removal_message .= "$1 "; + } else { + push(@config_content_new, $_); + if (defined $add_to_config{$1}) { + push(@warnings, "Module $1 already activated in $source_config_file\n"); + delete $add_to_config{$1}; + } + }; + } else { + push(@config_content_new, $_); + }; + }; + if (keys %add_to_config) { + if (!$module_section) { + push(@config_content_new, "[modules]\n"); + }; + $addition_message = add_modules_to_source_config(\%add_to_config, \@config_content_new); + }; + } else { + if ($clear_config || scalar %remove_from_config) { + print_error('No source config file found'); + }; + $source_config_file = $source_config->get_config_file_default_path(); + push(@config_content_new, "[modules]\n"); + $addition_message = add_modules_to_source_config(\%add_to_config, \@config_content_new); + }; + die("Cannot open $temp_config_file") if (!open(NEW_CONFIG, ">$temp_config_file")); + print NEW_CONFIG $_ foreach (@config_content_new); + close NEW_CONFIG; + rename_file($temp_config_file, $source_config_file, 1); + foreach (keys %remove_from_config) { + push(@warnings, "Module(s) $_ not found in " . $source_config_file . "\n"); + }; + print_warnings(); + print $addition_message if ($addition_message); + print "Module(s) $removal_message removed from $source_config_file\n" if ($removal_message); + exit(0); +}; + +# +# Add modules from the passed hash to the array of config strigns +# +sub add_modules_to_source_config { + my ($modules_hash_ref, $config_content_new) = @_; + my $message; + foreach (keys %$modules_hash_ref) { + push(@$config_content_new, "$_=active\n"); + $message .= "$_ "; + }; + if ($message) { + return 'Module(s) ' .$message . 'are added to the ' . $source_config_file . "\n\n"; + } else { + return ''; + }; +}; + # # procedure retrieves build list path # (all possibilities are taken into account) @@ -303,7 +431,7 @@ sub get_build_list_path { my @possible_dirs = ($module, $module. '.lnk', $module. '.link'); return $build_list_paths{$module} if (defined $build_list_paths{$module}); foreach (@possible_dirs) { - my $possible_dir_path = $StandDir.$_.'/prj/'; + my $possible_dir_path = $module_paths{$_}.'/prj/'; if (-d $possible_dir_path) { foreach my $build_list (@possible_build_lists) { my $possible_build_list_path = CorrectPath($possible_dir_path . $build_list); @@ -316,7 +444,7 @@ sub get_build_list_path { }; }; $dead_parents{$module}++; - $build_list_paths{$module} = CorrectPath(retrieve_build_list($module)); + $build_list_paths{$module} = CorrectPath(retrieve_build_list($module)) if (!defined $build_list_paths{$module}); return $build_list_paths{$module}; }; @@ -354,39 +482,6 @@ sub store_weights { }; }; -# -# This procedure implements complete in-depth weights search -# it's working, but very slow, so switched off in favor of the -# last (simplified) implementation... -# -#sub store_weights { -# my $deps_hash = shift; -# $weights_hash{$_} = {} foreach (keys %$deps_hash); -# foreach (keys %$deps_hash) { -# foreach my $module_deps_hash ($$deps_hash{$_}) { -# foreach my $dependency (keys %$module_deps_hash) { -# ${$weights_hash{$dependency}}{$_}++; -# }; -# }; -# }; -# my $current_prj_preq = $$deps_hash{$CurrentPrj}; -# foreach (keys %$current_prj_preq) { -# accumulate_weights($deps_hash, $_); -# }; -#}; - -#sub accumulate_weights { -# my ($deps_hash, $module) = @_; -# my @prerequisites = keys %{$$deps_hash{$module}}; -# my @is_prereq_for = keys %{$weights_hash{$module}}; -# foreach my $prereq_module (@prerequisites) { -## next if (defined $weight_stored{$prereq_module}); -## $weight_stored{$prereq_module}++; -# ${$weights_hash{$prereq_module}}{$_}++ foreach @is_prereq_for; -# accumulate_weights($deps_hash, $prereq_module); -# }; -#}; - # # Build everything that should be built # @@ -394,11 +489,20 @@ sub BuildAll { if ($BuildAllParents) { my ($Prj, $PrjDir, $orig_prj); GetParentDeps( $CurrentPrj, \%global_deps_hash); + if (scalar keys %active_modules) { + $active_modules{$CurrentPrj}++; + $modules_types{$CurrentPrj} = 'mod'; + }; modules_classify(keys %global_deps_hash); store_weights(\%global_deps_hash); + if (keys %active_modules && ($build_from || $incompatible)) { + print_error("There are active module in $source_config_file. Please remove these modules to proceed.\n"); + }; prepare_build_from(\%global_deps_hash) if ($build_from); prepare_incompatible_build(\%global_deps_hash) if ($incompatible); if ($build_all_cont || $build_since) { + print STDERR "There are active module in $source_config_file. Inactive modules will be skipped.\n"; + push (@warnings, "\nThere are active module in $source_config_file. Inactive modules are skipped.\n\n"); prepare_build_all_cont(\%global_deps_hash); }; $modules_number = scalar keys %global_deps_hash; @@ -419,7 +523,7 @@ sub BuildAll { next; }; - $PrjDir = CorrectPath($StandDir.$Prj); + $PrjDir = $module_paths{$Prj}; get_deps_hash($Prj, \%LocalDepsHash); my $info_hash = $html_info{$Prj}; $$info_hash{DIRS} = check_deps_hash(\%LocalDepsHash, $Prj); @@ -466,10 +570,6 @@ sub dmake_dir { $jobs_hash{$BuildDir}->{STATUS} = 'building'; if ($BuildDir =~ /(\s)/o) { $error_code = do_custom_job($BuildDir, \%LocalDepsHash); -# do_pre_job($`, $pre_job) if ($' eq $pre_job); -# $error_code = do_post_job($`, $', \%LocalDepsHash) if ($' eq $post_job); -# RemoveFromDependencies($BuildDir, \%LocalDepsHash); -# html_store_job_info(\%LocalDepsHash, $BuildDir, $error_code); } else { html_store_job_info(\%LocalDepsHash, $BuildDir); print_error("$BuildDir not found!!\n") if (!-d $BuildDir); @@ -495,22 +595,6 @@ sub dmake_dir { RemoveFromDependencies($BuildDir, \%LocalDepsHash) if (!$child); return if ($cmd_file || $show); $error_code = run_job($dmake, $BuildDir); -# chdir $BuildDir; -# getcwd(); -# if ($html) { -# my $log_file = $jobs_hash{$BuildDir}->{LONG_LOG_PATH}; -# my $log_dir = File::Basename::dirname($log_file); -# if (!-d $log_dir) { -# system("$perl $mkout"); -# }; -# $error_code = system ("$dmake > $log_file 2>&1"); -# if (!$grab_output && -f $log_file) { -# system("cat $log_file"); -# }; -# } else { -# $error_code = system ("$dmake"); -# }; - html_store_job_info(\%LocalDepsHash, $BuildDir, $error_code) if (!$child); }; if ($error_code && $ignore) { @@ -618,7 +702,7 @@ sub get_deps_from_object { my ($module, $build_list_object, $dependencies_hash) = @_; foreach my $dir ($build_list_object->getJobDirectories("make", $ENV{GUI})) { - $PathHash{$dir} = $StandDir . $module; + $PathHash{$dir} = $module_paths{$module}; $PathHash{$dir} .= $dir if ($dir ne '/'); my %deps_hash = (); @@ -694,10 +778,11 @@ sub get_deps_hash { $deps_hash{$_}++ foreach (GetDependenciesArray($Dependencies)); $$dependencies_hash{$DirAlias} = \%deps_hash; $BuildQueue{$DirAlias}++; + my $local_dir = ''; if ($Dir =~ /(\\|\/)/o) { - $Dir = $module_to_build . $1 . $'; - } else {$Dir = $module_to_build;}; - $PathHash{$DirAlias} = CorrectPath($StandDir . $Dir); + $local_dir = $'; + }; + $PathHash{$DirAlias} = CorrectPath($module_paths{$module_to_build} . "/$local_dir"); } elsif ($_ !~ /^\s*$/ && $_ !~ /^\w*\s/o) { chomp; push(@errors, $_); @@ -851,42 +936,17 @@ sub get_commands { while ($arg = pop(@dmake_args)) { $dmake .= ' '.$arg; }; -# if (($ENV{GUI} eq 'WNT') && $QuantityToBuild) { -# print_error("There is no such executable $_4nt_exe") if (!-e $_4nt_exe); -# $dmake_batch = generate_4nt_batch(); -# }; }; -# -# Procedure prooves if current dir is a root dir of the drive -# -#sub IsRootDir { -# my ($Dir); -# $Dir = shift; -# if ( (($ENV{GUI} eq 'UNX') || -# ($ENV{GUI} eq 'MACOSX')) && -# ($Dir eq '/')) { -# return 1; -# } elsif ( (($ENV{GUI} eq 'WNT') || -# ($ENV{GUI} eq 'WIN') || -# ($ENV{GUI} eq 'OS2')) && -# ($Dir =~ /\S:\/$/)) { -# return 1; -# } else { -# return 0; -# }; -#}; - # # Procedure retrieves list of projects to be built from build.lst # sub get_stand_dir { - if (!(defined $ENV{GUI})) { + if (!defined $ENV{GUI}) { $ENV{mk_tmp} = ''; die "No environment set\n"; }; my $StandDir; -# $StandDir = getcwd(); if ( defined $ENV{PWD} ) { $StandDir = $ENV{PWD}; } elsif (defined $ENV{_cwd}) { @@ -898,9 +958,8 @@ sub get_stand_dir { do { foreach (@possible_build_lists) {# ('build.lst', 'build.xlist'); if (-e $StandDir . '/prj/'.$_) { - $StandDir =~ /([\-\.\w]+$)/; - $StandDir = $`; - $CurrentPrj = $1; + $CurrentPrj = File::Basename::basename($StandDir); + $StandDir = File::Basename::dirname($StandDir); return $StandDir; } elsif ($StandDir eq $previous_dir) { $ENV{mk_tmp} = ''; @@ -908,10 +967,7 @@ sub get_stand_dir { }; }; $previous_dir = $StandDir; -# $StandDir = Cwd::realpath($StandDir . '/..'); - my @dirlist = split(/\//,Cwd::realpath($StandDir)); - pop @dirlist; # discard last dirname; - $StandDir = join('/', @dirlist); + $StandDir = File::Basename::dirname(Cwd::realpath($StandDir)); print_error('Found no project to build') if (!$StandDir); } # while (chdir '..'); @@ -967,7 +1023,7 @@ sub RemoveFromDependencies { sub check_deps_hash { my ($deps_hash_ref, $module) = @_; my @possible_order; - my $module_path = $StandDir . $module if (defined $module); + my $module_path = $module_paths{$module} if (defined $module); return if (!scalar keys %$deps_hash_ref); my %deps_hash = %$deps_hash_ref; my $consistent; @@ -978,12 +1034,11 @@ sub check_deps_hash { my $string; my $log_name; my $build_number = 0; + do { $consistent = ''; foreach $key (sort keys %deps_hash) { $local_deps_ref = $deps_hash{$key}; - $little_key = $key; - #print "Key = $key , consi = '$consistent' "; if (!scalar keys %$local_deps_ref) { if (defined $module) { $build_number++; @@ -1017,18 +1072,14 @@ sub check_deps_hash { BUILD_NUMBER => $build_number, STATUS => 'waiting', LOG_PATH => $module . "/$ENV{INPATH}/misc/logs/$log_name", - LONG_LOG_PATH => CorrectPath($StandDir . $module . "/$ENV{INPATH}/misc/logs/$log_name"), + LONG_LOG_PATH => CorrectPath($module_paths{$module} . "/$ENV{INPATH}/misc/logs/$log_name"), START_TIME => 0, FINISH_TIME => 0, CLIENT => '-' }; -# if (-f $jobs_hash{$key}->{LONG_LOG_PATH} && $html) { -# print STDERR 'Warning: log file ' . $jobs_hash{$key}->{LONG_LOG_PATH} . " already exists!!\n"; -# }; }; RemoveFromDependencies($key, \%deps_hash); delete $deps_hash{$key}; - #print " ... OK!\n"; $consistent++; }; }; @@ -1065,21 +1116,17 @@ sub FindIndepPrj { next if (&IsHashNative($Prj)); my $PrjDeps = $$Dependencies{$Prj}; push(@candidates, $Prj) if (!scalar keys %$PrjDeps); - #return $Prj if (!scalar keys %$PrjDeps); }; if (scalar @candidates) { my $best_candidate = undef; my $weight = 0; foreach my $candidate (sort @candidates) { -# if (defined $weights_hash{$candidate} && scalar keys %{$weights_hash{$candidate}} > $weight) { if (defined $weights_hash{$candidate} && $weights_hash{$candidate} > $weight) { $best_candidate = $candidate; -# $weight = scalar keys %{$weights_hash{$candidate}}; $weight = $weights_hash{$candidate}; }; }; if (defined $best_candidate) { -# delete $weights_hash{$best_candidate}; return $best_candidate; } my @sorted_candidates = sort(@candidates); @@ -1150,13 +1197,14 @@ sub GetDirectoryList { sub print_error { my $message = shift; my $force = shift; -# rmtree(CorrectPath($tmp_dir), 0, 1) if ($tmp_dir); $modules_number -= scalar keys %global_deps_hash; $modules_number -= 1; print STDERR "\nERROR: $message\n"; $ENV{mk_tmp} = ''; - close CMD_FILE if ($cmd_file); - unlink ($cmd_file); + if ($cmd_file) { + close CMD_FILE; + unlink ($cmd_file); + }; if (!$child) { $ENV{mk_tmp} = ''; close CMD_FILE if ($cmd_file); @@ -1168,7 +1216,7 @@ sub print_error { sub usage { print STDERR "\nbuild\n"; - print STDERR "Syntax: build [--all|-a[:prj_name]]|[--from|-f prj_name1[:prj_name2] [prj_name3 [...]]]|[--since|-c prj_name] [--with_branches|-b]|[--prepare|-p][:platform] [--dontchekoutmissingmodules]] [--deliver|-d [--dlv_switch deliver_switch]]] [-P processes|--server [--setenvstring \"string\"] [--client_timeout MIN] [--port port1[:port2:...:portN]]] [--show|-s] [--help|-h] [--file|-F] [--ignore|-i] [--version|-V] [--mode|-m OOo[,SO[,EXT]] [--html [--html_path html_file_path] [--dontgraboutput]] [--pre_job=pre_job_sring] [--job=job_string|-j] [--post_job=post_job_sring] [--stoponerror]\n"; + print STDERR "Syntax: build [--all|-a[:prj_name]]|[--from|-f prj_name1[:prj_name2] [prj_name3 [...]]]|[--since|-c prj_name] [--with_branches|-b]|[--prepare|-p][:platform] [--dontchekoutmissingmodules]] [--deliver|-d [--dlv_switch deliver_switch]]] [-P processes|--server [--setenvstring \"string\"] [--client_timeout MIN] [--port port1[:port2:...:portN]]] [--show|-s] [--help|-h] [--file|-F] [--ignore|-i] [--version|-V] [--mode|-m OOo[,SO[,EXT]] [--html [--html_path html_file_path] [--dontgraboutput]] [--pre_job=pre_job_sring] [--job=job_string|-j] [--post_job=post_job_sring] [--stoponerror] [--genconf [--removeall|--clear|--remove|--add module1,module2[,...,moduleN]]]\n"; print STDERR "Example1: build --from sfx2\n"; print STDERR " - build all projects dependent from sfx2, starting with sfx2, finishing with the current module\n"; print STDERR "Example2: build --all:sfx2\n"; @@ -1199,9 +1247,14 @@ sub usage { print STDERR " --help - print help info\n"; print STDERR " --ignore - force tool to ignore errors\n"; print STDERR " --html - generate html page with build status\n"; - print STDERR " file named $ENV{INPATH}.build.html will be generated in $ENV{SRC_ROOT}\n"; + print STDERR " file named $ENV{INPATH}.build.html will be generated in $ENV{SOLARSRC}\n"; print STDERR " --html_path - set html page path\n"; print STDERR " --dontgraboutput - do not grab console output when generating html page\n"; + print STDERR " --genconf - generate/modify workspace configuration file\n"; + print STDERR " --add - add active module(s) to configuration file\n"; + print STDERR " --remove - removeactive modules(s) from configuration file\n"; + print STDERR " --removeall|--clear - remove all active modules(s) from configuration file\n"; + print STDERR " --stoponerror - stop build when error occurs (for mp builds)\n"; print STDERR " --dontchekoutmissingmodules - do not chekout missing modules when running prepare (links still will be broken)\n"; print STDERR " Custom jobs:\n"; @@ -1261,6 +1314,16 @@ sub get_options { $arg =~ /^--help$/ and usage() and do_exit(0); $arg =~ /^-h$/ and usage() and do_exit(0); $arg =~ /^--ignore$/ and $ignore = 1 and next; + $arg =~ /^--genconf$/ and $generate_config = 1 and next; + if ($arg =~ /^--add$/) { + get_list_of_modules(\%add_to_config); + next; + }; + if ($arg =~ /^--remove$/) { + get_list_of_modules(\%remove_from_config); + next; + }; + ($arg =~ /^--clear$/ || $arg =~ /^--removeall$/) and $clear_config = 1 and next; $arg =~ /^--html$/ and $html = 1 and next; $arg =~ /^--dontgraboutput$/ and $dont_grab_output = 1 and next; $arg =~ /^--html_path$/ and $html_path = shift @ARGV and next; @@ -1320,7 +1383,17 @@ sub get_options { print_error("--setenvstring switch is for server mode only!!") if ($setenv_string); print_error("--client_timeout switch is for server mode only!!") if ($client_timeout); }; -# $ignore++ if ($html); + + if (!$generate_config) { + my $error_message = ' switch(es) should be used only with "--genconf"'; + print_error('"--removeall" ("--clear")' . $error_message) if ($clear_config); + if ((scalar %add_to_config) || (scalar %remove_from_config)) { + print_error('"--add" or/and "--remove"' . $error_message); + }; + } elsif ((!scalar %add_to_config) && !$clear_config && (!scalar %remove_from_config)){ + print_error('Please supply necessary switch for "--genconf" (--add|--remove|--removeall)'); + }; + if ($only_platform) { $only_common = 'common'; $only_common .= '.pro' if ($only_platform =~ /\.pro$/); @@ -1330,6 +1403,18 @@ sub get_options { @ARGV = @dmake_args; }; +sub get_module_and_buildlist_paths { + $active_modules{$_}++ foreach ($source_config->get_active_modules()); + my %active_modules_copy = %active_modules; + foreach ($source_config->get_all_modules()) { + delete $active_modules_copy{$_} if defined($active_modules_copy{$_}); + $module_paths{$_} = $source_config->get_module_path($_); + $build_list_paths{$_} = $source_config->get_module_build_list($_) + } + $dead_parents{$_}++ foreach (keys %active_modules_copy); +}; + + sub get_dmake_args { my $arg; my @job_args = (); @@ -1549,22 +1634,7 @@ sub start_child { $jobs_hash{$job_dir}->{STATUS} = 'building'; if ($job_dir =~ /(\s)/o) { my $error_code = undef; -# do_pre_job($`, $pre_job) if ($' eq $pre_job); $error_code = do_custom_job($job_dir, $dependencies_hash); -# $error_code = do_post_job($`, $', $dependencies_hash) if ($' eq $post_job); -# html_store_job_info($dependencies_hash, $job_dir, $error_code); -# if ($error_code) { -# # give windows (4nt) one more chance -# if ($ENV{GUI} eq 'WNT' && !$cygwin) { -# $error_code = do_post_job($`, $post_job, $dependencies_hash); -# }; -# if ($error_code) { -# $broken_modules_hashes{$dependencies_hash}++; -# $broken_build{$job_dir} = $error_code; -# } -# } else { -# RemoveFromDependencies($job_dir, $dependencies_hash); -# }; return; }; html_store_job_info($dependencies_hash, $job_dir); @@ -1613,7 +1683,6 @@ sub build_multiprocessing { # to build do { while ($Prj = PickPrjToBuild(\%global_deps_hash)) { - my $module_type = $modules_types{$Prj}; push @build_queue, $Prj; $projects_deps_hash{$Prj} = {}; get_deps_hash($Prj, $projects_deps_hash{$Prj}); @@ -1672,7 +1741,6 @@ sub build_actual_queue { !$running_children{$projects_deps_hash{$Prj}}) { if (!defined $broken_modules_hashes{$projects_deps_hash{$Prj}} || $ignore) { -# chdir(&CorrectPath($StandDir.$Prj)); RemoveFromDependencies($Prj, \%global_deps_hash); $build_is_finished{$Prj}++; splice (@$build_queue, $i, 1); @@ -1725,11 +1793,11 @@ sub do_custom_job { # html_store_job_info($dependencies_hash, $job_dir); RemoveFromDependencies($module_job, $dependencies_hash); } else { - $error_code = run_job($job, CorrectPath($StandDir.$module), $module_job); + $error_code = run_job($job, $module_paths{$module}, $module_job); if ($error_code) { # give windows (4nt) one more chance if ($ENV{GUI} eq 'WNT' && !$cygwin) { - $error_code = run_job($job, CorrectPath($StandDir.$module), $module_job); + $error_code = run_job($job, $module_paths{$module}, $module_job); }; }; if ($error_code) { @@ -1743,27 +1811,6 @@ sub do_custom_job { return $error_code; }; -#sub do_pre_job { -# my $module = shift; -# announce_module($module); -# if ($pre_custom_job && defined $modules_types{$module} && ($modules_types{$module} eq 'mod')) { -# my $module_path = CorrectPath($StandDir.$module); -# chdir $module_path; -# getcwd(); -# my $cj_error_code = system ("$pre_custom_job"); -# print_error("Cannot run pre job \"$pre_custom_job\"") if ($cj_error_code); -# }; -#}; - - -#sub do_post_custom_job { -# my $module_path = shift; -# chdir $module_path; -# getcwd(); -# my $cj_error_code = system ("$post_custom_job"); -# print_error("Cannot run post job \"$post_custom_job\"") if ($cj_error_code); -#}; - # # Print announcement for module just started # @@ -1779,7 +1826,11 @@ sub print_announce { $prj_type = $modules_types{$Prj} if (defined $modules_types{$Prj}); my $text; if ($prj_type eq 'lnk') { - $text = "Skipping link to $Prj\n"; + if (scalar keys %active_modules && (!defined $active_modules{$Prj})) { + $text = "Skipping module $Prj\n"; + } else { + $text = "Skipping link to $Prj\n"; + }; $build_is_finished{$Prj}++; } elsif ($prj_type eq 'img') { # return if (defined $module_announced{$`}); @@ -1815,15 +1866,16 @@ sub are_all_dependent { sub modules_classify { my @modules = @_; foreach my $module (sort @modules) { - if ((-e $StandDir.$module.'.lnk') || (-e $StandDir.$module.'.link')) { - $modules_types{$module} = 'lnk'; + if (!defined $module_paths{$module}) { + $modules_types{$module} = 'img'; next; }; - if (-d $StandDir.$module) { - $modules_types{$module} = 'mod'; + if (( $module_paths{$module} =~ /\.lnk$/) || ($module_paths{$module} =~ /\.link$/) + || (scalar keys %active_modules && (!defined $active_modules{$module}))) { + $modules_types{$module} = 'lnk'; next; }; - $modules_types{$module} = 'img'; + $modules_types{$module} = 'mod'; }; }; @@ -1834,12 +1886,10 @@ sub modules_classify { # sub provide_consistency { check_dir(); - foreach $var_ref (\$build_from, \$build_all_cont, \$build_since) { - if ($$var_ref) { - return if (-d $StandDir.$$var_ref); - $$var_ref .= '.lnk' and return if (-d $StandDir.$$var_ref.'.lnk'); - $$var_ref .= '.link' and return if (-d $StandDir.$$var_ref.'.link'); - print_error("Cannot find module '$$var_ref'", 9); + foreach my $module_ref (\$build_from, \$build_all_cont, \$build_since) { + if ($$module_ref) { + return if (defined $module_paths{$$module_ref}); + print_error("Cannot find module '$$module_ref'", 9); return; }; }; @@ -1874,16 +1924,16 @@ sub get_workspace_lst # sub ensure_clear_module { my $module = shift; - my $module_type = $modules_types{$module}; - if ($module_type eq 'mod') { + if ($modules_types{$module} eq 'mod') { clear_module($module); return; }; - if ($module_type eq 'lnk') { - if((!rename("$StandDir$module.lnk", "$StandDir$module")) && (!rename("$StandDir$module.link", "$StandDir$module"))) { - print_error("Cannot rename link to $module. Please rename it manually"); - } else { + if ($modules_types{$module} eq 'lnk' && (File::Basename::basename($module_paths{$module}) ne $module)) { + if(rename($module_paths{$module}, File::Basename::dirname($module_paths{$module}) ."/$module")) { + $module_paths{$module} = File::Basename::dirname($module_paths{$module}) ."/$module"; clear_module($module); + } else { + print_error("Cannot rename link to $module. Please rename it manually"); }; }; }; @@ -1895,12 +1945,12 @@ sub clear_module { my $module = shift; print "Removing module's $module output trees...\n"; print "\n" and return if ($show); - opendir DIRHANDLE, $StandDir.$module; + opendir DIRHANDLE, $module_paths{$module}; my @dir_content = readdir(DIRHANDLE); closedir(DIRHANDLE); foreach (@dir_content) { next if (/^\.+$/); - my $dir = CorrectPath($StandDir.$module.'/'.$_); + my $dir = CorrectPath($module_paths{$module}.'/'.$_); if ((!-d $dir.'/.svn') && is_output_tree($dir)) { #print "I would delete $dir\n"; rmtree("$dir", 0, 1) if ($ENV{USE_SHELL} ne '4nt'); @@ -1941,14 +1991,19 @@ sub get_tmp_dir { my $tmp_dir; if( defined($ENV{TMPDIR}) ) { $tmp_dir = $ENV{TMPDIR} . '/'; + } elsif( defined($ENV{TMP}) ) { + $tmp_dir = $ENV{TMP} . '/'; } else { $tmp_dir = '/tmp/'; } - $tmp_dir .= $$ while (-e $tmp_dir); - $tmp_dir = CorrectPath($tmp_dir); - eval {mkpath($tmp_dir)}; - print_error("Cannot create temporary directory in $tmp_dir") if ($@); - return $tmp_dir; + + return File::Temp::tempdir(DIR =>$tmp_dir); + +# $tmp_dir .= $$ while (-e $tmp_dir); +# $tmp_dir = CorrectPath($tmp_dir); +# eval {mkpath($tmp_dir)}; +# print_error("Cannot create temporary directory in $tmp_dir") if ($@); +# return $tmp_dir; }; @@ -1998,8 +2053,8 @@ sub prepare_incompatible_build { foreach (keys %incompatibles) { my $incomp_prj = $_; if (!defined $$deps_hash{$_}) { - $incomp_prj .= '.lnk' if (-e $StandDir.$incomp_prj . '.lnk'); - $incomp_prj .= '.link' if (-e $StandDir.$incomp_prj . '.link'); + $incomp_prj .= '.lnk' if ($module_paths{$module} =~ /\.lnk$/); + $incomp_prj .= '.link' if ($module_paths{$module} =~ /\.link$/); } delete $incompatibles{$_}; $incompatibles{$incomp_prj} = $$deps_hash{$incomp_prj}; @@ -2026,7 +2081,7 @@ sub prepare_incompatible_build { next if ($show); if ($modules_types{$prj} ne 'mod') { push(@missing_modules, $prj); - } elsif (-d CorrectPath($StandDir.$prj.'/'. $ENV{INPATH})) { + } elsif (-d $module_paths{$prj}. '/'. $ENV{INPATH}) { $old_output_tree++; }; }; @@ -2116,6 +2171,29 @@ sub get_modes { $build_modes{$option}++; }; +sub get_list_of_modules { + my $option = ''; + my $hash_ref = shift; + while ($option = shift @ARGV) { + if ($option =~ /^-+/) { + unshift(@ARGV, $option); + return; + } else { + if ($option =~ /,/) { + foreach (split /,/, $option) { + next if (!$_); + $$hash_ref{$_}++; + }; + } else { + $$hash_ref{$option}++; + }; + }; + }; + if (!scalar %$hash_ref) { + print_error('No module list supplied!!'); + }; +}; + sub get_incomp_projects { my $option = ''; while ($option = shift @ARGV) { @@ -2199,8 +2277,7 @@ sub clear_delivered { my $undeliver = "$deliver_command $deliver_delete_switches $nul"; # my $current_dir = getcwd(); foreach my $module (sort @modules_built) { - my $module_path = CorrectPath($StandDir.$module); - if (!(chdir($module_path.'.lnk') or chdir($module_path.'.link') or chdir($module_path))) { + if (chdir($module_paths{$module})) { push(@warnings, "Could not remove delivered files from the module $module. Your build can become inconsistent.\n"); } else { print "Removing delivered from module $module\n"; @@ -2307,7 +2384,7 @@ sub check_dir { my @dir_entries = split(/[\\\/]/, $start_dir); my $current_module = $dir_entries[$#dir_entries]; $current_module = $` if (($current_module =~ /(\.lnk)$/) || ($current_module =~ /(\.link)$/)); - my $link_name = $ENV{SRC_ROOT}.'/'.$current_module.$1; + my $link_name = $ENV{SOLARSRC}.'/'.$current_module.$1; if ( $^O eq 'MSWin32' ) { $start_dir =~ s/\\/\//go; $link_name =~ s/\\/\//go; @@ -2316,8 +2393,8 @@ sub check_dir { }; } elsif ((-l $link_name) && (chdir $link_name)) { if ($start_dir eq getcwd()) { - # we're dealing with link => fallback to SRC_ROOT under UNIX - $StandDir = $ENV{SRC_ROOT}.'/'; + # we're dealing with link => fallback to SOLARSRC under UNIX + $StandDir = $ENV{SOLARSRC}.'/'; get_current_module($current_module); return; } else { @@ -2377,52 +2454,6 @@ sub do_exit { exit($exit_code); }; -#sub get_post_job { -# my $job = $deliver_command; -# $job = $custom_job if ($custom_job); -# return $job; -#}; - -#sub do_post_job { -# my $job = get_post_job(); -# if ($show) { -# print $job . "\n"; -# return; -# } -# my $module = shift; -# my $post_job_name = shift; -# delete $build_in_progress{$module}; -# $module_path = CorrectPath($StandDir.$module); -# my $error_code = undef; -# if ($cmd_file) { -# print "cd $module_path\n"; -# print "$job\n"; -# } else { -# chdir $module_path; -# getcwd(); -# if ($html) { -# # tested on Linux only!! -# my $log_file = $jobs_hash{$post_job_name}->{LONG_LOG_PATH}; -# my $log_dir = File::Basename::dirname($log_file); -# if (!-d $log_dir) { -# eval {mkpath($log_dir)}; -# print_error("Cannot create log directory $log_dir") if ($@); -# }; -# $error_code = system ("$job > $log_file 2>&1"); -# if (!$grab_output && -f $log_file) { -# system("cat $log_file"); -# }; -# } else { -# $error_code = system ("$job"); -# } -# }; -# $build_is_finished{$module}++ if (!defined $modules_with_errors{$module}); -# if (!$error_code && $post_custom_job) { -# do_post_custom_job(CorrectPath($StandDir.$module)); -# }; -# return $error_code; -#}; - # # Procedure sorts module in user-frendly order # @@ -2454,19 +2485,11 @@ sub sort_modules_appearance { sub generate_html_file { return if (!$html); my $force_update = shift; -# $force_update = 1; -# my $html_file = CorrectPath($ENV{HOME} . '/work/' . $ENV{INPATH}. '.build.html'); -# my $write_secs = (stat($html_file))[9]; -# my @stat = stat($html_file); -# if (defined $write_secs) { - # Regular update no often than once in 5 sec -# return if (!$force_update && (time - $html_last_updated < 5)); -# } $html_last_updated = time; my @modules_order = sort_modules_appearance(); my ($successes_percent, $errors_percent) = get_progress_percentage(scalar keys %html_info, scalar keys %build_is_finished, scalar keys %modules_with_errors); my $build_duration = get_time_line(time - $build_time); - my $temp_html_file = File::Temp::tmpnam($ENV{TMPDIR}); + my $temp_html_file = File::Temp::tmpnam($tmp_dir); my $title; $title = $ENV{CWS_WORK_STAMP} . ': ' if (defined $ENV{CWS_WORK_STAMP}); $title .= $ENV{INPATH}; @@ -2523,6 +2546,7 @@ sub generate_html_file { foreach (@modules_order) { next if ($modules_types{$_} eq 'lnk'); + next if (scalar keys %active_modules && (!defined $active_modules{$_})); my ($errors_info_line, $dirs_info_line, $errors_number, $successes_percent, $errors_percent, $time) = get_html_info($_); # print HTML 'document.write(" ");' . "\n"; @@ -2788,13 +2812,7 @@ sub generate_html_file { print HTML '};' . "\n"; print HTML '' . "\n"; close HTML; - - if(-e $temp_html_file) { - rename($temp_html_file, $html_file) or system("mv", $temp_html_file, $html_file); - if (-e $temp_html_file) { - system("rm -rf $temp_html_file") if (!unlink $temp_html_file); - }; - }; + rename_file($temp_html_file, $html_file); }; sub get_local_time_line { @@ -2909,7 +2927,6 @@ sub html_store_job_info { } my $module = $module_by_hash{$deps_hash}; my $module_info_hash = $html_info{$module}; -# $$module_info_hash{BUILD_TIME} += $jobs_hash{$build_dir}->{FINISH_TIME} - $jobs_hash{$build_dir}->{START_TIME}; my $dmake_array; if (defined $error_code) { $jobs_hash{$build_dir}->{FINISH_TIME} = time(); @@ -2925,29 +2942,8 @@ sub html_store_job_info { }; push (@$dmake_array, $build_dir); }; -# generate_html_file($force_update); }; -#sub close_server_socket { -# # Actually, the "or warn..." part is for debugging, -# # should be removed for release -# if (defined $new_socket_obj) { -# print $new_socket_obj 'No job'; -# close($new_socket_obj) or warn $! ? "Error closing connection: $!" -# : "Exit status $? from closing connection"; -# }; -# if (defined $socket_obj) { -# close($socket_obj) or warn $! ? "Error closing server socket: $!" -# : "Exit status $? from closing server socket"; -# }; -#}; - -#sub stop_server { -# close_server_socket(); -# print "Server terminated\n"; -# exit($?); -#}; - sub start_server_on_port { my $port = shift; if ($ENV{GUI} eq 'WNT') { @@ -3033,10 +3029,8 @@ sub run_server { my $client_ipnum = $new_socket_obj->peerhost(); my $client_host = gethostbyaddr(inet_aton($client_ipnum), AF_INET); # print who is connected -# print "got a connection from: $client_host", "[$client_ipnum]\n"; # send them a message, close connection my $client_message = <$new_socket_obj>; -# print $client_message; chomp $client_message; my @client_data = split(/ /, $client_message); my %client_hash = (); @@ -3052,7 +3046,6 @@ sub run_server { next; }; } else { -# handle_dead_children(0); if ($client_hash{result} eq "0") { # print "$clients_jobs{$pid} succedded on $pid\n"; } else { @@ -3128,12 +3121,6 @@ sub get_job_string { if ($job_dir =~ /(\s)$pre_job/o) { do_custom_job($job_dir, $dependencies_hash); $job_dir = ''; -# if ($' eq $pre_job) { -# do_pre_job($`, $pre_job); -# html_store_job_info($dependencies_hash, $job_dir, undef); -# RemoveFromDependencies($job_dir, $dependencies_hash); -# $job_dir = ''; -# }; }; } while (!$job_dir); } else { @@ -3150,24 +3137,19 @@ sub get_job_string { if ($job_dir =~ /(\s)$pre_job/o) { # if ($' eq $pre_job) { do_custom_job($job_dir, $dependencies_hash); -# do_pre_job($`, $pre_job); -# html_store_job_info($dependencies_hash, $job_dir, undef); -# RemoveFromDependencies($job_dir, $dependencies_hash); $job_dir = ''; # } }; } while (!$job_dir); }; $running_children{$dependencies_hash}++; -# $processes_hash{$pid} = $job_dir; $folders_hashes{$job_dir} = $dependencies_hash; my $log_file = $jobs_hash{$job_dir}->{LONG_LOG_PATH}; -# $jobs_hash{$job_dir}->{CLIENT} = $pid; my $full_job_dir = $job_dir; if ($job_dir =~ /(\s)/o) { $job = $'; $job = $deliver_command if ($job eq $post_job); - $full_job_dir = CorrectPath($StandDir.$`); + $full_job_dir = $module_paths{$`}; } my $log_dir = File::Basename::dirname($log_file); if (!-d $log_dir) { @@ -3215,7 +3197,6 @@ sub fill_modules_queue { my $build_queue = shift; my $Prj; while ($Prj = PickPrjToBuild(\%global_deps_hash)) { - my $module_type = $modules_types{$Prj}; push @$build_queue, $Prj; $projects_deps_hash{$Prj} = {}; get_deps_hash($Prj, $projects_deps_hash{$Prj}); diff --git a/solenv/bin/modules/SourceConfig.pm b/solenv/bin/modules/SourceConfig.pm new file mode 100644 index 000000000000..b1005b26d6c7 --- /dev/null +++ b/solenv/bin/modules/SourceConfig.pm @@ -0,0 +1,331 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2008 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# $RCSfile: SourceConfig.pm,v $ +# +# $Revision: 1.0 $ +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +#************************************************************************* +# +# SourceConfig - Perl extension for parsing general info databases +# +# usage: see below +# +#************************************************************************* + +package SourceConfig; + +use strict; + +use constant SOURCE_CONFIG_FILE_NAME => 'source_config'; + +use Carp; + +##### profiling ##### + +##### ctor ##### + +sub new { + my $proto = shift; + my $class = ref($proto) || $proto; + my $source_root = shift; + if (defined $source_root) { + $source_root =~ s/\\|\/$//; + } else { + $source_root = $ENV{SOLARSRC}; + }; + my $self = {}; + $self->{DEBUG} = 0; + $self->{SOURCE_ROOT} = $source_root; + $self->{REPOSITORIES} = {}; + $self->{MODULE_PATHS} = {}; + $self->{MODULE_BUILD_LIST_PATHS} = {}; + $self->{ACTIVE_MODULES} = {}; + $self->{MODULE_REPOSITORY} = {}; + $self->{SOURCE_CONFIG_FILE} = get_config_file($source_root); + $self->{SOURCE_CONFIG_DEFAULT} = Cwd::realpath($source_root) .'/'.SOURCE_CONFIG_FILE_NAME; + read_config_file($self); + bless($self, $class); + return $self; +} + +##### methods ##### + +sub get_repositories +{ + my $self = shift; + return sort keys %{$self->{REPOSITORIES}}; +} + +sub get_config_file_default_path { + my $self = shift; + return $self->{SOURCE_CONFIG_DEFAULT}; +} + +sub get_config_file_path { + my $self = shift; + return $self->{SOURCE_CONFIG_FILE}; +} + +sub get_module_repository { + my $self = shift; + my $module = shift; + $self -> get_module_paths() if (!scalar keys %{$self->{MODULE_PATHS}}); + if (defined ${$self->{MODULE_REPOSITORY}}{$module}) { + return ${$self->{MODULE_REPOSITORY}}{$module}; + } else { + Carp::cluck("No such module $module in active repositories!!\n"); + return undef; + }; +} + +sub get_module_path { + my $self = shift; + my $module = shift; + $self -> get_module_paths() if (!scalar keys %{$self->{MODULE_PATHS}}); + if (defined ${$self->{MODULE_PATHS}}{$module}) { + return ${$self->{MODULE_PATHS}}{$module}; + } else { + Carp::cluck("No path for module $module in active repositories!!\n"); + return undef; + }; +} + +sub get_module_build_list { + my $self = shift; + my $module = shift; + $self -> get_buildlist_paths() if (!scalar keys %{$self->{MODULE_BUILD_LIST_PATHS}}); + if (defined ${$self->{MODULE_BUILD_LIST_PATHS}}{$module}) { + return ${$self->{MODULE_BUILD_LIST_PATHS}}{$module}; + } else { + Carp::cluck("No build list in module $module found!!\n") if ($self->{DEBUG}); + return undef; + }; +} + +sub get_all_modules +{ + my $self = shift; + my $module = shift; + $self -> get_module_paths() if (!scalar keys %{$self->{MODULE_PATHS}}); + return sort keys %{$self->{MODULE_PATHS}}; +}; + + +sub get_active_modules +{ + my $self = shift; + return sort keys %{$self->{ACTIVE_MODULES}}; +} + + +##### private methods ##### + +sub get_buildlist_paths { + my $self = shift; + $self -> get_module_paths() if (!scalar keys %{$self->{MODULE_PATHS}}); + my @possible_build_lists = ('build.lst', 'build.xlist'); # build lists names + foreach my $module (keys %{$self->{MODULE_PATHS}}) { + foreach (@possible_build_lists) { + my $possible_path = ${$self->{MODULE_PATHS}}{$module} . "/prj/$_"; + ${$self->{MODULE_BUILD_LIST_PATHS}}{$module} = $possible_path if (-e $possible_path); + }; + }; +}; + +sub get_module_paths { + my $self = shift; + foreach my $repository (keys %{$self->{REPOSITORIES}}) { + my $repository_path = ${$self->{REPOSITORIES}}{$repository}; + if (opendir DIRHANDLE, $repository_path) { + foreach my $module (readdir(DIRHANDLE)) { + next if ($module =~ /^\.+/); + my $module_entry = $module; + $module =~ s/\.lnk$//; + $module =~ s/\.link$//; + my $possible_path = "$repository_path/$module_entry"; + if (-d $possible_path) { + if (defined ${$self->{MODULE_PATHS}}{$module}) { + close DIRHANDLE; + croak("Ambiguous paths for module $module: $possible_path and " . ${$self->{MODULE_PATHS}}{$module}); + }; + ${$self->{MODULE_PATHS}}{$module} = $possible_path; + ${$self->{MODULE_REPOSITORY}}{$module} = $repository; + } + }; + close DIRHANDLE; + } else { + croak("Cannot read $_ repository content"); + }; + }; +}; + +sub get_config_file { + my $source_root = shift; + foreach ($source_root, $source_root . '/..') { + if (-f $_ . '/' . SOURCE_CONFIG_FILE_NAME) { + return Cwd::realpath($_) .'/'.SOURCE_CONFIG_FILE_NAME; + }; + }; + return ''; +}; + +sub read_config_file { + my $self = shift; + if (!$self->{SOURCE_CONFIG_FILE}) { + ${$self->{REPOSITORIES}}{File::Basename::basename($self->{SOURCE_ROOT})} = $self->{SOURCE_ROOT}; + return; + }; + my $repository_section = 0; + my $module_section = 0; + my $line = 0; + if (open(SOURCE_CONFIG_FILE, $self->{SOURCE_CONFIG_FILE})) { + foreach () { + $line++; + chomp; + next if (!/^\S+/); + next if (/^\s*#+/); + s/\r\n//; + if (/^\[repositories\]\s*(\s+#)*/) { + $module_section = 0; + $repository_section = 1; + next; + }; + if (/^\[modules\]\s*(\s+#)*/) { + $module_section = 1; + $repository_section = 0; + next; + }; + next if (!$repository_section && !$module_section); + if (/\s*(\S+)=active\s*(\s+#)*/) { + if ($repository_section) { + ${$self->{REPOSITORIES}}{$1} = File::Basename::dirname($self->{SOURCE_ROOT}) . "/$1"; + next; + } + if ($module_section) { + ${$self->{ACTIVE_MODULES}}{$1}++; + next; + }; + }; + croak("Line $line in " . $self->{SOURCE_CONFIG_FILE} . 'violates format. Please make your checks!!'); + }; + close SOURCE_CONFIG_FILE; + } else { + croak('Cannot open ' . $self->{SOURCE_CONFIG_FILE} . 'for reading'); + }; +}; + +##### finish ##### + +1; # needed by use or require + +__END__ + +=head1 NAME + +SourceConfig - Perl extension for parsing general info databases + +=head1 SYNOPSIS + + # example that will read source_config file and return the active repositories + + use SourceConfig; + + # Create a new instance of the parser: + $a = SourceConfig->new(); + + # Get repositories for the actual workspace: + $a->get_repositories(); + + +=head1 DESCRIPTION + +SourceConfig is a perl extension to load and parse General Info Databses. +It uses a simple object oriented interface to retrieve the information stored +in the database. + +Methods: + +SourceConfig::new() + +Creates a new instance of SourceConfig. Can't fail. + + +SourceConfig::get_repositories() + +Returns sorted list of active repositories for the actual workspace + + +SourceConfig::get_active_modules() + +Returns a sorted list of active modules + +SourceConfig::get_all_modules() + +Returns sorted list of all modules in active repositories. + +SourceConfig::get_module_path($module) + +Returns absolute module path + +SourceConfig::get_module_build_list($module) + +Returns absolute module build list path + +SourceConfig::get_module_repository($module) + +Returns the module's repository + +SourceConfig::get_config_file_path() + +Returns absolute module to the source configuration file + +SourceConfig::get_config_file_default_path() + +Returns default path for source configuration file + +=head2 EXPORT + +SourceConfig::new() +SourceConfig::get_repositories() +SourceConfig::get_active_modules() +SourceConfig::get_all_modules() +SourceConfig::get_module_path($module) +SourceConfig::get_module_build_list($module) +SourceConfig::get_module_repository($module) +SourceConfig::get_config_file_path() +SourceConfig::get_config_file_default_path() + +=head1 AUTHOR + +Vladimir Glazunov, vg@openoffice.com + +=head1 SEE ALSO + +perl(1). + +=cut -- cgit -- cgit From f09524dfff4e7cbdc2422ea3290b3de7a0e0811c Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Wed, 26 Aug 2009 06:36:38 +0000 Subject: CWS-TOOLING: integrate CWS mingwport22 2009-08-19 16:18:46 +0200 tono r275156 : i#103794: mingw gcc-4.4.0 port: make use of dwarf2 eh 2009-08-05 12:27:41 +0200 tono r274650 : CWS-TOOLING: rebase CWS mingwport22 to trunk@274622 (milestone: DEV300:m54) 2009-08-01 00:56:35 +0200 tono r274552 : i#103795: mingw gcc-4.4.0 port: use gcc dll 2009-07-27 00:13:27 +0200 tono r274344 : i#103795: mingw gcc-4.4.0 port: use gcc dll 2009-07-25 06:19:59 +0200 tono r274332 : i#103803: mingw gcc-4.4.0 port: invalid "extern static" 2009-07-25 06:13:56 +0200 tono r274331 : i#103802: mingw gcc-4.4.0 port: inhibit use of pthread 2009-07-25 06:05:22 +0200 tono r274330 : i#103801: mingw gcc-4.4.0 port: specify relocatable data section 2009-07-25 05:54:09 +0200 tono r274329 : i#103800: mingw gcc-4.4.0 port: remove invalid scope 2009-07-25 05:44:58 +0200 tono r274328 : i#103799: mingw gcc-4.4.0 port: add some #include 2009-07-25 05:33:09 +0200 tono r274327 : i#103798: mingw gcc-4.4.0 port: add backward in include path 2009-07-25 05:24:42 +0200 tono r274326 : i#103797: mingw gcc-4.4.0 port: nooptimize c++-uno bridge 2009-07-25 05:16:20 +0200 tono r274325 : i#103795: mingw gcc-4.4.0 port: use gcc dll 2009-07-25 04:01:59 +0200 tono r274324 : i#103794: mingw gcc-4.4.0 port: make use of dwarf2 eh 2009-07-25 02:44:01 +0200 tono r274322 : i#103793: mingw port: Exclude msvc[pr]80.dll from packaging 2009-07-25 02:28:21 +0200 tono r274321 : i#103791: mingw port fix typo --- configure | 153 ++++++++++++++++++++++++++- configure.in | 84 ++++++++++++++- scp2/source/ooo/common_brand.scp | 28 +++++ scp2/source/ooo/file_library_ooo.scp | 109 ++++++++++++++++++- scp2/source/ooo/makefile.mk | 8 ++ scp2/source/ooo/module_hidden_ooo.scp | 3 + scp2/source/ooo/scpaction_ooo.scp | 12 +++ scp2/source/ooo/ure.scp | 28 +++++ set_soenv.in | 11 +- solenv/inc/_tg_app.mk | 60 +++++++---- solenv/inc/_tg_def.mk | 20 ++-- solenv/inc/_tg_shl.mk | 190 ++++++++++++++-------------------- solenv/inc/extension_post.mk | 6 ++ solenv/inc/tg_app.mk | 6 +- solenv/inc/tg_def.mk | 2 +- solenv/inc/tg_shl.mk | 19 ++-- solenv/inc/wntgcci6.mk | 33 ++++-- 17 files changed, 606 insertions(+), 166 deletions(-) diff --git a/configure b/configure index 575c6158a4e6..28516ec77d9c 100755 --- a/configure +++ b/configure @@ -892,6 +892,14 @@ HAVE_GCC_VISIBILITY_FEATURE USE_SYSTEM_STL STLPORT_VER STLPORT4 +EXCEPTIONS +MINGW_GXXDLL +MINGW_GCCDLL +MINGW_SHARED_GXXLIB +MINGW_GCCLIB_EH +MINGW_SHARED_GCCLIB +MINGW_CLIB_DIR +MINGW_BACKWARD_INCLUDE_PATH MINGW_LIB_INCLUDE_PATH GXX_INCLUDE_PATH CRYPT_LINK @@ -10798,7 +10806,75 @@ $as_echo "no mingwin runtime includes" >&6; } { $as_echo "$as_me:$LINENO: result: $_mingw_lib_include_path" >&5 $as_echo "$_mingw_lib_include_path" >&6; } fi -MINGW_LIB_INCLUDE_PATH="$_mingw_lib_include_path" + MINGW_LIB_INCLUDE_PATH="$_mingw_lib_include_path" + + { $as_echo "$as_me:$LINENO: checking for mingwin c++ backward include path" >&5 +$as_echo_n "checking for mingwin c++ backward include path... " >&6; } + cat >conftest.$ac_ext <<_ACEOF +#include +_ACEOF + _mingw_backward_include_path=`$CXX -E -xc++ -Wno-deprecated conftest.$ac_ext 2>&5| $SED -n -e '/.*1*"\(.*\)\/hash_set".*/s//\1/p' | sort -u | xargs echo` + rm conftest.$ac_ext + if test -n "$_mingw_backward_include_path"; then + _mingw_backward_include_path=`cygpath -d $_mingw_backward_include_path` + _mingw_backward_include_path=`cygpath -u $_mingw_backward_include_path` + { $as_echo "$as_me:$LINENO: result: $_mingw_backward_include_path" >&5 +$as_echo "$_mingw_backward_include_path" >&6; } + else + _mingw_backward_include_path="NO_BACKWARD_INCLUDE" + { $as_echo "$as_me:$LINENO: result: no mingwin c++ backward includes" >&5 +$as_echo "no mingwin c++ backward includes" >&6; } + fi + MINGW_BACKWARD_INCLUDE_PATH="$_mingw_backward_include_path" + + mingw_crtbegin=`$CC -print-file-name=crtbegin.o` + MINGW_CLIB_DIR=`dirname $mingw_crtbegin` + { $as_echo "$as_me:$LINENO: checking whether to use dynamic libgcc" >&5 +$as_echo_n "checking whether to use dynamic libgcc... " >&6; } + if test -e "$MINGW_CLIB_DIR/libgcc_s.a"; then + { $as_echo "$as_me:$LINENO: checking dynamic libgcc name" >&5 +$as_echo_n "checking dynamic libgcc name... " >&6; } + MINGW_GCCDLL_pattern=`nm $MINGW_CLIB_DIR/libgcc_s.a | sed -ne 's@.* _libgcc\(.*\)_dll_iname@libgcc\1.dll@p' | uniq | sed -e 's@_@?@g'` + MINGW_GCCDLL=`cd $COMPATH && ls $MINGW_GCCDLL_pattern 2>/dev/null` + if test -n "$MINGW_GCCDLL"; then + MINGW_SHARED_GCCLIB=YES + { $as_echo "$as_me:$LINENO: result: use $MINGW_GCCDLL" >&5 +$as_echo "use $MINGW_GCCDLL" >&6; } + else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + fi + else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + fi + if test -e "$MINGW_CLIB_DIR/libgcc_eh.a"; then + MINGW_GCCLIB_EH=YES + fi + { $as_echo "$as_me:$LINENO: checking whether to use dynamic libstdc++" >&5 +$as_echo_n "checking whether to use dynamic libstdc++... " >&6; } + if test -e "$MINGW_CLIB_DIR/libstdc++_s.a" ; then + { $as_echo "$as_me:$LINENO: checking dynamic libstdc++ name" >&5 +$as_echo_n "checking dynamic libstdc++ name... " >&6; } + MINGW_GXXDLL_pattern=`nm $MINGW_CLIB_DIR/libstdc++_s.a | sed -ne 's@.* _libstdc__\(.*\)_dll_iname@libstdc++\1.dll@p' | uniq | sed -e 's@_@?@g'` + MINGW_GXXDLL=`cd $COMPATH && ls $MINGW_GXXDLL_pattern 2>/dev/null` + if test -n "$MINGW_GXXDLL"; then + MINGW_SHARED_GXXLIB=YES + { $as_echo "$as_me:$LINENO: result: use $MINGW_GXXDLL" >&5 +$as_echo "use $MINGW_GXXDLL" >&6; } + else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + fi + else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + fi + MINGW_CLIB_DIR=`cygpath $MINGW_CLIB_DIR` + + + + fi @@ -10859,6 +10935,81 @@ $as_echo "checked" >&6; } fi fi +{ $as_echo "$as_me:$LINENO: checking exception type" >&5 +$as_echo_n "checking exception type... " >&6; } +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +if test "$WITH_MINGWIN" = "yes"; then + +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +extern "C" void _Unwind_SjLj_RaiseException(void) __attribute__ ((__noreturn__)); + + +int +main () +{ +_Unwind_SjLj_RaiseException() + ; + 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + exceptions_type="sjlj" +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + exceptions_type="dwarf2" + +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + +{ $as_echo "$as_me:$LINENO: result: $exceptions_type" >&5 +$as_echo "$exceptions_type" >&6; } +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +EXCEPTIONS="$exceptions_type" + + if test "$_os" = "SunOS"; then _temp=`showrev -p | $AWK -F" " '{ print $2 }'` if test "$_os_release" = "7"; then diff --git a/configure.in b/configure.in index 5cb5c0f61097..d447e30f2fcf 100644 --- a/configure.in +++ b/configure.in @@ -2179,8 +2179,65 @@ _ACEOF else AC_MSG_RESULT([$_mingw_lib_include_path]) fi -MINGW_LIB_INCLUDE_PATH="$_mingw_lib_include_path" -AC_SUBST(MINGW_LIB_INCLUDE_PATH) + MINGW_LIB_INCLUDE_PATH="$_mingw_lib_include_path" + AC_SUBST(MINGW_LIB_INCLUDE_PATH) +dnl mingw gcc 4.4.0 needs backward in include path to use hash_set/hash_map + AC_MSG_CHECKING([for mingwin c++ backward include path]) + cat >conftest.$ac_ext <<_ACEOF +#include +_ACEOF + _mingw_backward_include_path=`$CXX -E -xc++ -Wno-deprecated conftest.$ac_ext 2>&5| $SED -n -e '/.*1*"\(.*\)\/hash_set".*/s//\1/p' | sort -u | xargs echo` + rm conftest.$ac_ext + if test -n "$_mingw_backward_include_path"; then + _mingw_backward_include_path=`cygpath -d $_mingw_backward_include_path` + _mingw_backward_include_path=`cygpath -u $_mingw_backward_include_path` + AC_MSG_RESULT([$_mingw_backward_include_path]) + else + _mingw_backward_include_path="NO_BACKWARD_INCLUDE" + AC_MSG_RESULT([no mingwin c++ backward includes]) + fi + MINGW_BACKWARD_INCLUDE_PATH="$_mingw_backward_include_path" + AC_SUBST(MINGW_BACKWARD_INCLUDE_PATH) + mingw_crtbegin=`$CC -print-file-name=crtbegin.o` + MINGW_CLIB_DIR=`dirname $mingw_crtbegin` + AC_MSG_CHECKING([whether to use dynamic libgcc]) + if test -e "$MINGW_CLIB_DIR/libgcc_s.a"; then + AC_MSG_CHECKING([dynamic libgcc name]) + MINGW_GCCDLL_pattern=`nm $MINGW_CLIB_DIR/libgcc_s.a | sed -ne 's@.* _libgcc\(.*\)_dll_iname@libgcc\1.dll@p' | uniq | sed -e 's@_@?@g'` + MINGW_GCCDLL=`cd $COMPATH && ls $MINGW_GCCDLL_pattern 2>/dev/null` + if test -n "$MINGW_GCCDLL"; then + MINGW_SHARED_GCCLIB=YES + AC_MSG_RESULT([use $MINGW_GCCDLL]) + else + AC_MSG_RESULT([no]) + fi + else + AC_MSG_RESULT([no]) + fi + if test -e "$MINGW_CLIB_DIR/libgcc_eh.a"; then + MINGW_GCCLIB_EH=YES + fi + AC_MSG_CHECKING([whether to use dynamic libstdc++]) + if test -e "$MINGW_CLIB_DIR/libstdc++_s.a" ; then + AC_MSG_CHECKING([dynamic libstdc++ name]) + MINGW_GXXDLL_pattern=`nm $MINGW_CLIB_DIR/libstdc++_s.a | sed -ne 's@.* _libstdc__\(.*\)_dll_iname@libstdc++\1.dll@p' | uniq | sed -e 's@_@?@g'` + MINGW_GXXDLL=`cd $COMPATH && ls $MINGW_GXXDLL_pattern 2>/dev/null` + if test -n "$MINGW_GXXDLL"; then + MINGW_SHARED_GXXLIB=YES + AC_MSG_RESULT([use $MINGW_GXXDLL]) + else + AC_MSG_RESULT([no]) + fi + else + AC_MSG_RESULT([no]) + fi + MINGW_CLIB_DIR=`cygpath $MINGW_CLIB_DIR` + AC_SUBST(MINGW_CLIB_DIR) + AC_SUBST(MINGW_SHARED_GCCLIB) + AC_SUBST(MINGW_GCCLIB_EH) + AC_SUBST(MINGW_SHARED_GXXLIB) + AC_SUBST(MINGW_GCCDLL) + AC_SUBST(MINGW_GXXDLL) fi dnl =================================================================== @@ -2245,6 +2302,29 @@ if test "$_os" = "OSF1"; then fi fi +dnl ************************************************************* +dnl Testing for exception handling - dwarf2 or sjlj exceptions... +dnl ************************************************************* +AC_MSG_CHECKING([exception type]) +AC_LANG_PUSH([C++]) +if test "$WITH_MINGWIN" = "yes"; then + AC_TRY_LINK( + [#include + +extern "C" void _Unwind_SjLj_RaiseException(void) __attribute__ ((__noreturn__)); + + ], + [_Unwind_SjLj_RaiseException() ], + [exceptions_type="sjlj"], + [exceptions_type="dwarf2"] + ) +fi + +AC_MSG_RESULT($exceptions_type) +AC_LANG_POP([C++]) +EXCEPTIONS="$exceptions_type" +AC_SUBST(EXCEPTIONS) + dnl ************************************************************** dnl Testing for required Solaris and SunStudio compiler patches... dnl ************************************************************** diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 60ba10716480..8a3b0b4443f1 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -91,6 +91,8 @@ Module gid_Module_Root_Brand gid_Brand_File_Html_Thirdpartylicensereadme, gid_Brand_File_Images_Brand_Zip, gid_Brand_File_Lib_Dbghelp, + gid_Brand_File_Lib_Mingw_GccS, + gid_Brand_File_Lib_Mingw_Stdcpp, gid_Brand_File_Lib_Mingwm10, gid_Brand_File_Lib_Msvcr80, gid_Brand_File_Lib_Msvcp80, @@ -710,6 +712,32 @@ End #endif #endif +#if defined(WNT) && defined( _gcc3 ) + +#if defined(MINGW_GCCDLL) + +File gid_Brand_File_Lib_Mingw_GccS + TXT_FILE_BODY; + Dir = gid_Brand_Dir_Program; + Name = MINGW_GCCDLL; + Styles = (PACKED); +End + +#endif + +#if defined(MINGW_GXXDLL) + +File gid_Brand_File_Lib_Mingw_Stdcpp + TXT_FILE_BODY; + Dir = gid_Brand_Dir_Program; + Name = MINGW_GXXDLL; + Styles = (PACKED); +End + +#endif + +#endif + #if defined(WNT) #if defined(M1400) #if defined(PROF_EDITION) diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 6c81b0f14928..ceb6c8b38e7b 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1013,6 +1013,113 @@ STD_UNO_LIB_FILE(gid_File_Lib_T602Filter,t602filter) STD_UNO_LIB_FILE(gid_File_Lib_Writerfilter,writerfilter) +#ifdef WNT +#if defined(_gcc3) + +File gid_File_Lib_Mingwm10 + BIN_FILE_BODY; + Styles = (PACKED); + Dir = gid_Dir_Program; + Name = "mingwm10.dll"; +End + +#endif +#endif + +#if defined(WNT) +#if defined(M1400) +#if defined(PROF_EDITION) +File gid_File_Lib_Msvcr80 + BIN_FILE_BODY; + Styles = (PACKED); + Dir = gid_Dir_Program; +#ifndef _STLP_DEBUG + Name = "msvcr80.dll"; +#else + Name = "msvcr80d.dll"; +#endif +End +#endif +#endif +#endif + +#if defined(WNT) +#if defined(M1400) +#if defined(PROF_EDITION) +File gid_File_Lib_Msvcp80 + BIN_FILE_BODY; + Styles = (PACKED); + Dir = gid_Dir_Program; +#ifndef _STLP_DEBUG + Name = "msvcp80.dll"; +#else + Name = "msvcp80d.dll"; +#endif +End +#endif +#endif +#endif + +#if defined(WNT) +#if defined(M1400) +#if defined(PROF_EDITION) +File gid_File_Lib_Msvcm80 + BIN_FILE_BODY; + Styles = (PACKED); + Dir = gid_Dir_Program; +#ifndef _STLP_DEBUG + Name = "msvcm80.dll"; +#else + Name = "msvcm80d.dll"; +#endif +End +#endif +#endif +#endif + +#if defined(WNT) && defined( _gcc3 ) + +#if defined(MINGW_GCCDLL) + +File gid_File_Lib_Mingw_GccS + TXT_FILE_BODY; + Dir = gid_Dir_Program; + Name = MINGW_GCCDLL; + Styles = (PACKED, PATCH); +End + +#endif + +#if defined(MINGW_GXXDLL) + +File gid_File_Lib_Mingw_Stdcpp + TXT_FILE_BODY; + Dir = gid_Dir_Program; + Name = MINGW_GXXDLL; + Styles = (PACKED, PATCH); +End + +#endif + +#endif + +#if defined(WNT) +#if defined(M1400) +#if defined(PROF_EDITION) +File gid_File_Msvcm80crt_Manifest + BIN_FILE_BODY; + Styles = (PACKED); + Dir = gid_Dir_Program; +#ifndef _STLP_DEBUG + Name = "Microsoft.VC80.CRT.manifest"; +#else + Name = "Microsoft.VC80.DebugCRT.manifest"; +#endif +End +#endif +#endif +#endif + STD_UNO_LIB_FILE(gid_File_Lib_Mysql,mysql) File gid_File_Oo_Office_Dataaccess_Mysql_Xcu TXT_FILE_BODY; @@ -1726,7 +1833,7 @@ End STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Oooimprovecore , oooimprovecore) -#if defined WNT && !defined SYSTEM_MOZILLA && !defined WITHOUT_MOZILLA && \ +#if defined WNT && !defined _gcc3 && !defined SYSTEM_MOZILLA && !defined WITHOUT_MOZILLA && \ !(defined M1400 && defined PROF_EDITION && !defined _STLP_DEBUG) // see common_brand.scp gid_Brand_File_Lib_Msvcp80 and // gid_Brand_File_Lib_Msvcr80 diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index 646196ec336a..0d85cc529b63 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -241,6 +241,14 @@ SCPDEFS+=-DENABLE_SVCTAGS SCPDEFS+=-DWITH_VC_REDIST .ENDIF +.IF "$(MINGW_GCCDLL)"!="" +SCPDEFS+=-DMINGW_GCCDLL=\""$(MINGW_GCCDLL)"\" +.ENDIF + +.IF "$(MINGW_GXXDLL)"!="" +SCPDEFS+=-DMINGW_GXXDLL=\""$(MINGW_GXXDLL)"\" +.ENDIF + SCP_PRODUCT_TYPE=osl ICUVERSION_DEPENDENT_FILES= \ diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 9f4506b80d8a..1d7e0f297148 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -401,6 +401,9 @@ Module gid_Module_Root_Files_5 gid_File_Lib_sn_tools, gid_File_Lib_relnotes, GID_FILE_LIB_WPD, + gid_File_Lib_Mingw_GccS, + gid_File_Lib_Mingw_Stdcpp, + gid_File_Lib_Mingwm10, gid_File_Lib_Msvcp70, gid_File_Lib_Msvcr70, gid_File_Lib_Ole, diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp index 190fd50cf166..76ea41ed06bb 100644 --- a/scp2/source/ooo/scpaction_ooo.scp +++ b/scp2/source/ooo/scpaction_ooo.scp @@ -107,6 +107,18 @@ ScpAction SCP_COPY_MINGWM10 Copy = "mingwm10.dll"; Name = "mingwm10.dll"; End +#if defined(MINGW_GCCDLL) +ScpAction SCP_COPY_MINGW_GCCS + Copy = MINGW_GCCDLL; + Name = MINGW_GCCDLL; +End +#endif +#if defined(MINGW_GXXDLL) +ScpAction SCP_COPY_MINGW_STDCPP + Copy = MINGW_GXXDLL; + Name = MINGW_GXXDLL; +End +#endif #endif ScpAction scp_Copy_Xpd_Javaloader diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index bc9629b6ee0b..61887e197530 100755 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -910,6 +910,32 @@ File gid_File_Lib_Mingwm10_Ure End #endif +#if defined(WNT) && defined( _gcc3 ) + +#if defined(MINGW_GCCDLL) + +File gid_File_Lib_Mingw_GccS_Ure + TXT_FILE_BODY; + Dir = SCP2_URE_DL_DIR; + Name = MINGW_GCCDLL; + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); +End + +#endif + +#if defined(MINGW_GXXDLL) + +File gid_File_Lib_Mingw_Stdcpp_Ure + TXT_FILE_BODY; + Dir = SCP2_URE_DL_DIR; + Name = MINGW_GXXDLL; + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); +End + +#endif + +#endif + #ifdef WNT #if defined(M1310) File gid_File_Dl_Msvcr71 @@ -1146,6 +1172,8 @@ Module gid_Module_Root_Ure_Hidden gid_File_Dl_Stlport, gid_File_Dl_GccS, gid_File_Dl_Stdcpp, + gid_File_Lib_Mingw_GccS_Ure, + gid_File_Lib_Mingw_Stdcpp_Ure, gid_File_Lib_Mingwm10_Ure, gid_File_Dl_Msvcr71, gid_File_Dl_Msvcp71, diff --git a/set_soenv.in b/set_soenv.in index 22b0a5707f4d..39f4db5eb023 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -1108,7 +1108,8 @@ if ($platform =~ m/cygwin|os2/) else { $ILIB .= $wps.$COMPATH.$LIB; } - $ILIB .= $wps.$PSDK_HOME.$LIB; + $ILIB .= $wps.PathFormat("@MINGW_CLIB_DIR@"). + $wps.$PSDK_HOME.$LIB; if ( '@ENABLE_DIRETX@' ) { $ILIB .= $wps.PathFormat("@DIRECTXSDK_LIB@"); } @@ -1485,6 +1486,7 @@ elsif ($platform =~ m/cygwin/) else { $SOLARINC .= $I.'$COMPATH'.$ds."include"; } @mingw_lib_include_paths = split( / /, "@MINGW_LIB_INCLUDE_PATH@" ); + $SOLARINC .= $I.PathFormat("@MINGW_BACKWARD_INCLUDE_PATH@"); foreach $mingw_lib_include_path (@mingw_lib_include_paths) { chomp $mingw_lib_include_path; if ( $mingw_lib_include_path ne $COMPATH.$ds."include" && $mingw_lib_include_path ne "" ) @@ -1963,8 +1965,15 @@ if ( $platform =~ m/cygwin/ ) ToFile( "ILIB", $ILIB, "e" ); if ( $MINGW eq "yes" ) { ToFile( "ATL_INCLUDE", $ATL_INCLUDE, "e" ); + ToFile( "EXCEPTIONS", "@EXCEPTIONS@", "e" ); ToFile( "DIRECTXSDK_HOME", PathFormat("@DIRECTXSDK_HOME@"), "e" ); ToFile( "USE_MINGW", $USE_MINGW, "e" ); + ToFile( "MINGW_CLIB_DIR", PathFormat("@MINGW_CLIB_DIR@"), "e" ); + ToFile( "MINGW_SHARED_GCCLIB", "@MINGW_SHARED_GCCLIB@", "e" ); + ToFile( "MINGW_GCCLIB_EH", "@MINGW_GCCLIB_EH@", "e" ); + ToFile( "MINGW_SHARED_GXXLIB", "@MINGW_SHARED_GXXLIB@", "e" ); + ToFile( "MINGW_GCCDLL", "@MINGW_GCCDLL@", "e" ); + ToFile( "MINGW_GXXDLL", "@MINGW_GXXDLL@", "e" ); } ToFile( "GREP", $WIN_GREP, "e" ); ToFile( "FIND", $WIN_FIND, "e" ); diff --git a/solenv/inc/_tg_app.mk b/solenv/inc/_tg_app.mk index e07999541823..318bb1e19917 100644 --- a/solenv/inc/_tg_app.mk +++ b/solenv/inc/_tg_app.mk @@ -144,11 +144,13 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \ @cat $(APP1LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP1RES)) > $(MISC)$/$(@:b)_all.res windres $(MISC)$/$(@:b)_all.res $(APP1RESO) .ENDIF - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ $(APP1BASEX) $(APP1STACKN) -o $@ $(APP1OBJS) \ -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP1RESO) \ `$(TYPE) /dev/null $(APP1LIBS) | sed s#$(ROUT)#$(OUT)#g` \ - $(APP_LINKTYPE) $(APP1LIBSALCPPRT) $(APP1STDLIBS) $(APP1STDLIB) $(STDLIB1) > $(MISC)$/$(TARGET).$(@:b)_1.cmd + $(APP_LINKTYPE) $(APP1LIBSALCPPRT) \ + -Wl,--start-group $(APP1STDLIBS) -Wl,--end-group $(APP1STDLIB) \ + $(STDLIB1) $(MINGWSSTDENDOBJ) > $(MISC)$/$(TARGET).$(@:b)_1.cmd @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_1.cmd @+source $(MISC)$/$(TARGET).$(@:b)_1.cmd @ls -l $@ @@ -428,11 +430,13 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \ @cat $(APP2LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP2RES)) > $(MISC)$/$(@:b)_all.res windres $(MISC)$/$(@:b)_all.res $(APP2RESO) .ENDIF - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ $(APP2BASEX) $(APP2STACKN) -o $@ $(APP2OBJS) \ -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP2RESO) \ `$(TYPE) /dev/null $(APP2LIBS) | sed s#$(ROUT)#$(OUT)#g` \ - $(APP_LINKTYPE) $(APP2LIBSALCPPRT) $(APP2STDLIBS) $(APP2STDLIB) $(STDLIB2) > $(MISC)$/$(TARGET).$(@:b)_2.cmd + $(APP_LINKTYPE) $(APP2LIBSALCPPRT) \ + -Wl,--start-group $(APP2STDLIBS) -Wl,--end-group $(APP2STDLIB) \ + $(STDLIB2) $(MINGWSSTDENDOBJ) > $(MISC)$/$(TARGET).$(@:b)_2.cmd @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_2.cmd @+source $(MISC)$/$(TARGET).$(@:b)_2.cmd @ls -l $@ @@ -712,11 +716,13 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \ @cat $(APP3LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP3RES)) > $(MISC)$/$(@:b)_all.res windres $(MISC)$/$(@:b)_all.res $(APP3RESO) .ENDIF - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ $(APP3BASEX) $(APP3STACKN) -o $@ $(APP3OBJS) \ -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP3RESO) \ `$(TYPE) /dev/null $(APP3LIBS) | sed s#$(ROUT)#$(OUT)#g` \ - $(APP_LINKTYPE) $(APP3LIBSALCPPRT) $(APP3STDLIBS) $(APP3STDLIB) $(STDLIB3) > $(MISC)$/$(TARGET).$(@:b)_3.cmd + $(APP_LINKTYPE) $(APP3LIBSALCPPRT) \ + -Wl,--start-group $(APP3STDLIBS) -Wl,--end-group $(APP3STDLIB) \ + $(STDLIB3) $(MINGWSSTDENDOBJ) > $(MISC)$/$(TARGET).$(@:b)_3.cmd @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_3.cmd @+source $(MISC)$/$(TARGET).$(@:b)_3.cmd @ls -l $@ @@ -996,11 +1002,13 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \ @cat $(APP4LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP4RES)) > $(MISC)$/$(@:b)_all.res windres $(MISC)$/$(@:b)_all.res $(APP4RESO) .ENDIF - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ $(APP4BASEX) $(APP4STACKN) -o $@ $(APP4OBJS) \ -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP4RESO) \ `$(TYPE) /dev/null $(APP4LIBS) | sed s#$(ROUT)#$(OUT)#g` \ - $(APP_LINKTYPE) $(APP4LIBSALCPPRT) $(APP4STDLIBS) $(APP4STDLIB) $(STDLIB4) > $(MISC)$/$(TARGET).$(@:b)_4.cmd + $(APP_LINKTYPE) $(APP4LIBSALCPPRT) \ + -Wl,--start-group $(APP4STDLIBS) -Wl,--end-group $(APP4STDLIB) \ + $(STDLIB4) $(MINGWSSTDENDOBJ) > $(MISC)$/$(TARGET).$(@:b)_4.cmd @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_4.cmd @+source $(MISC)$/$(TARGET).$(@:b)_4.cmd @ls -l $@ @@ -1280,11 +1288,13 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \ @cat $(APP5LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP5RES)) > $(MISC)$/$(@:b)_all.res windres $(MISC)$/$(@:b)_all.res $(APP5RESO) .ENDIF - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ $(APP5BASEX) $(APP5STACKN) -o $@ $(APP5OBJS) \ -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP5RESO) \ `$(TYPE) /dev/null $(APP5LIBS) | sed s#$(ROUT)#$(OUT)#g` \ - $(APP_LINKTYPE) $(APP5LIBSALCPPRT) $(APP5STDLIBS) $(APP5STDLIB) $(STDLIB5) > $(MISC)$/$(TARGET).$(@:b)_5.cmd + $(APP_LINKTYPE) $(APP5LIBSALCPPRT) \ + -Wl,--start-group $(APP5STDLIBS) -Wl,--end-group $(APP5STDLIB) \ + $(STDLIB5) $(MINGWSSTDENDOBJ) > $(MISC)$/$(TARGET).$(@:b)_5.cmd @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_5.cmd @+source $(MISC)$/$(TARGET).$(@:b)_5.cmd @ls -l $@ @@ -1564,11 +1574,13 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \ @cat $(APP6LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP6RES)) > $(MISC)$/$(@:b)_all.res windres $(MISC)$/$(@:b)_all.res $(APP6RESO) .ENDIF - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ $(APP6BASEX) $(APP6STACKN) -o $@ $(APP6OBJS) \ -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP6RESO) \ `$(TYPE) /dev/null $(APP6LIBS) | sed s#$(ROUT)#$(OUT)#g` \ - $(APP_LINKTYPE) $(APP6LIBSALCPPRT) $(APP6STDLIBS) $(APP6STDLIB) $(STDLIB6) > $(MISC)$/$(TARGET).$(@:b)_6.cmd + $(APP_LINKTYPE) $(APP6LIBSALCPPRT) \ + -Wl,--start-group $(APP6STDLIBS) -Wl,--end-group $(APP6STDLIB) \ + $(STDLIB6) $(MINGWSSTDENDOBJ) > $(MISC)$/$(TARGET).$(@:b)_6.cmd @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_6.cmd @+source $(MISC)$/$(TARGET).$(@:b)_6.cmd @ls -l $@ @@ -1848,11 +1860,13 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \ @cat $(APP7LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP7RES)) > $(MISC)$/$(@:b)_all.res windres $(MISC)$/$(@:b)_all.res $(APP7RESO) .ENDIF - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ $(APP7BASEX) $(APP7STACKN) -o $@ $(APP7OBJS) \ -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP7RESO) \ `$(TYPE) /dev/null $(APP7LIBS) | sed s#$(ROUT)#$(OUT)#g` \ - $(APP_LINKTYPE) $(APP7LIBSALCPPRT) $(APP7STDLIBS) $(APP7STDLIB) $(STDLIB7) > $(MISC)$/$(TARGET).$(@:b)_7.cmd + $(APP_LINKTYPE) $(APP7LIBSALCPPRT) \ + -Wl,--start-group $(APP7STDLIBS) -Wl,--end-group $(APP7STDLIB) \ + $(STDLIB7) $(MINGWSSTDENDOBJ) > $(MISC)$/$(TARGET).$(@:b)_7.cmd @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_7.cmd @+source $(MISC)$/$(TARGET).$(@:b)_7.cmd @ls -l $@ @@ -2132,11 +2146,13 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \ @cat $(APP8LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP8RES)) > $(MISC)$/$(@:b)_all.res windres $(MISC)$/$(@:b)_all.res $(APP8RESO) .ENDIF - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ $(APP8BASEX) $(APP8STACKN) -o $@ $(APP8OBJS) \ -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP8RESO) \ `$(TYPE) /dev/null $(APP8LIBS) | sed s#$(ROUT)#$(OUT)#g` \ - $(APP_LINKTYPE) $(APP8LIBSALCPPRT) $(APP8STDLIBS) $(APP8STDLIB) $(STDLIB8) > $(MISC)$/$(TARGET).$(@:b)_8.cmd + $(APP_LINKTYPE) $(APP8LIBSALCPPRT) \ + -Wl,--start-group $(APP8STDLIBS) -Wl,--end-group $(APP8STDLIB) \ + $(STDLIB8) $(MINGWSSTDENDOBJ) > $(MISC)$/$(TARGET).$(@:b)_8.cmd @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_8.cmd @+source $(MISC)$/$(TARGET).$(@:b)_8.cmd @ls -l $@ @@ -2416,11 +2432,13 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \ @cat $(APP9LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP9RES)) > $(MISC)$/$(@:b)_all.res windres $(MISC)$/$(@:b)_all.res $(APP9RESO) .ENDIF - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ $(APP9BASEX) $(APP9STACKN) -o $@ $(APP9OBJS) \ -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP9RESO) \ `$(TYPE) /dev/null $(APP9LIBS) | sed s#$(ROUT)#$(OUT)#g` \ - $(APP_LINKTYPE) $(APP9LIBSALCPPRT) $(APP9STDLIBS) $(APP9STDLIB) $(STDLIB9) > $(MISC)$/$(TARGET).$(@:b)_9.cmd + $(APP_LINKTYPE) $(APP9LIBSALCPPRT) \ + -Wl,--start-group $(APP9STDLIBS) -Wl,--end-group $(APP9STDLIB) \ + $(STDLIB9) $(MINGWSSTDENDOBJ) > $(MISC)$/$(TARGET).$(@:b)_9.cmd @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_9.cmd @+source $(MISC)$/$(TARGET).$(@:b)_9.cmd @ls -l $@ @@ -2700,11 +2718,13 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \ @cat $(APP10LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP10RES)) > $(MISC)$/$(@:b)_all.res windres $(MISC)$/$(@:b)_all.res $(APP10RESO) .ENDIF - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ $(APP10BASEX) $(APP10STACKN) -o $@ $(APP10OBJS) \ -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP10RESO) \ `$(TYPE) /dev/null $(APP10LIBS) | sed s#$(ROUT)#$(OUT)#g` \ - $(APP_LINKTYPE) $(APP10LIBSALCPPRT) $(APP10STDLIBS) $(APP10STDLIB) $(STDLIB10) > $(MISC)$/$(TARGET).$(@:b)_10.cmd + $(APP_LINKTYPE) $(APP10LIBSALCPPRT) \ + -Wl,--start-group $(APP10STDLIBS) -Wl,--end-group $(APP10STDLIB) \ + $(STDLIB10) $(MINGWSSTDENDOBJ) > $(MISC)$/$(TARGET).$(@:b)_10.cmd @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_10.cmd @+source $(MISC)$/$(TARGET).$(@:b)_10.cmd @ls -l $@ diff --git a/solenv/inc/_tg_def.mk b/solenv/inc/_tg_def.mk index 1b293d4f252a..06d4174200ba 100644 --- a/solenv/inc/_tg_def.mk +++ b/solenv/inc/_tg_def.mk @@ -28,7 +28,7 @@ $(DEF1EXPORTFILE) : $(SHL1VERSIONMAP) # Extract RTTI symbols from all the objects that will be used to build a shared library nm -gP $(SHL1OBJS) \ `$(TYPE) /dev/null $(foreach,j,$(SHL1LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp @.symbols-regexp.tmp >> $@.exported-symbols + | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols # overwrite the map file generate into the local output tree with the generated # exported symbols list $(RENAME) $@.exported-symbols $@ @@ -311,7 +311,7 @@ $(DEF2EXPORTFILE) : $(SHL2VERSIONMAP) # Extract RTTI symbols from all the objects that will be used to build a shared library nm -gP $(SHL2OBJS) \ `$(TYPE) /dev/null $(foreach,j,$(SHL2LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp @.symbols-regexp.tmp >> $@.exported-symbols + | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols # overwrite the map file generate into the local output tree with the generated # exported symbols list $(RENAME) $@.exported-symbols $@ @@ -594,7 +594,7 @@ $(DEF3EXPORTFILE) : $(SHL3VERSIONMAP) # Extract RTTI symbols from all the objects that will be used to build a shared library nm -gP $(SHL3OBJS) \ `$(TYPE) /dev/null $(foreach,j,$(SHL3LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp @.symbols-regexp.tmp >> $@.exported-symbols + | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols # overwrite the map file generate into the local output tree with the generated # exported symbols list $(RENAME) $@.exported-symbols $@ @@ -877,7 +877,7 @@ $(DEF4EXPORTFILE) : $(SHL4VERSIONMAP) # Extract RTTI symbols from all the objects that will be used to build a shared library nm -gP $(SHL4OBJS) \ `$(TYPE) /dev/null $(foreach,j,$(SHL4LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp @.symbols-regexp.tmp >> $@.exported-symbols + | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols # overwrite the map file generate into the local output tree with the generated # exported symbols list $(RENAME) $@.exported-symbols $@ @@ -1160,7 +1160,7 @@ $(DEF5EXPORTFILE) : $(SHL5VERSIONMAP) # Extract RTTI symbols from all the objects that will be used to build a shared library nm -gP $(SHL5OBJS) \ `$(TYPE) /dev/null $(foreach,j,$(SHL5LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp @.symbols-regexp.tmp >> $@.exported-symbols + | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols # overwrite the map file generate into the local output tree with the generated # exported symbols list $(RENAME) $@.exported-symbols $@ @@ -1443,7 +1443,7 @@ $(DEF6EXPORTFILE) : $(SHL6VERSIONMAP) # Extract RTTI symbols from all the objects that will be used to build a shared library nm -gP $(SHL6OBJS) \ `$(TYPE) /dev/null $(foreach,j,$(SHL6LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp @.symbols-regexp.tmp >> $@.exported-symbols + | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols # overwrite the map file generate into the local output tree with the generated # exported symbols list $(RENAME) $@.exported-symbols $@ @@ -1726,7 +1726,7 @@ $(DEF7EXPORTFILE) : $(SHL7VERSIONMAP) # Extract RTTI symbols from all the objects that will be used to build a shared library nm -gP $(SHL7OBJS) \ `$(TYPE) /dev/null $(foreach,j,$(SHL7LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp @.symbols-regexp.tmp >> $@.exported-symbols + | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols # overwrite the map file generate into the local output tree with the generated # exported symbols list $(RENAME) $@.exported-symbols $@ @@ -2009,7 +2009,7 @@ $(DEF8EXPORTFILE) : $(SHL8VERSIONMAP) # Extract RTTI symbols from all the objects that will be used to build a shared library nm -gP $(SHL8OBJS) \ `$(TYPE) /dev/null $(foreach,j,$(SHL8LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp @.symbols-regexp.tmp >> $@.exported-symbols + | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols # overwrite the map file generate into the local output tree with the generated # exported symbols list $(RENAME) $@.exported-symbols $@ @@ -2292,7 +2292,7 @@ $(DEF9EXPORTFILE) : $(SHL9VERSIONMAP) # Extract RTTI symbols from all the objects that will be used to build a shared library nm -gP $(SHL9OBJS) \ `$(TYPE) /dev/null $(foreach,j,$(SHL9LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp @.symbols-regexp.tmp >> $@.exported-symbols + | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols # overwrite the map file generate into the local output tree with the generated # exported symbols list $(RENAME) $@.exported-symbols $@ @@ -2575,7 +2575,7 @@ $(DEF10EXPORTFILE) : $(SHL10VERSIONMAP) # Extract RTTI symbols from all the objects that will be used to build a shared library nm -gP $(SHL10OBJS) \ `$(TYPE) /dev/null $(foreach,j,$(SHL10LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp @.symbols-regexp.tmp >> $@.exported-symbols + | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols # overwrite the map file generate into the local output tree with the generated # exported symbols list $(RENAME) $@.exported-symbols $@ diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk index 596ecf8eac17..213cdbcbe414 100644 --- a/solenv/inc/_tg_shl.mk +++ b/solenv/inc/_tg_shl.mk @@ -296,24 +296,21 @@ $(SHL1TARGETN) : \ .ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL1ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def -.IF "$(DEFLIB1NAME)"!="" # do not have to include objs @echo dlltool --input-def $(SHL1DEF) \ --dllname $(SHL1TARGET)$(DLLPOST) \ - --kill-at \ - --output-exp $(MISC)$/$(@:b)_exp.o > $(MISC)$/$(TARGET).$(@:b)_1.cmd + --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_1.cmd +.IF "$(DEFLIB1NAME)"!="" # do not have to include objs + @echo --output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_1.cmd .ELSE # "$(DEFLIB1NAME)"!="" # do not have to include objs - @echo dlltool --input-def $(SHL1DEF) \ - --dllname $(SHL1TARGET)$(DLLPOST) \ - --kill-at \ - --output-exp $(MISC)$/$(@:b)_exp.o \ + @echo --output-exp $(MISC)$/$(@:b)_exp.o \ $(STDOBJ) $(SHL1OBJS) $(SHL1LINKRESO) \ - `$(TYPE) /dev/null $(SHL1LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(TARGET).$(@:b)_1.cmd + `$(TYPE) /dev/null $(SHL1LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` >> $(MISC)$/$(TARGET).$(@:b)_1.cmd .ENDIF # "$(DEFLIB1NAME)"!="" - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL1VERSIONOBJ) $(SHL1DESCRIPTIONOBJ) $(SHL1OBJS) $(SHL1LINKRESO) \ `$(TYPE) /dev/null $(SHL1LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - -Wl,--exclude-libs,ALL $(SHL1STDLIBS) $(SHL1STDSHL) $(STDSHL1) \ - $(MISC)$/$(@:b)_exp.o \ + -Wl,--exclude-libs,ALL,--start-group $(SHL1STDLIBS) -Wl,--end-group \ + $(SHL1STDSHL) $(STDSHL1) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_1.cmd @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_1.cmd @+source $(MISC)$/$(TARGET).$(@:b)_1.cmd @@ -844,24 +841,21 @@ $(SHL2TARGETN) : \ .ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL2ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def -.IF "$(DEFLIB2NAME)"!="" # do not have to include objs @echo dlltool --input-def $(SHL2DEF) \ --dllname $(SHL2TARGET)$(DLLPOST) \ - --kill-at \ - --output-exp $(MISC)$/$(@:b)_exp.o > $(MISC)$/$(TARGET).$(@:b)_2.cmd + --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_2.cmd +.IF "$(DEFLIB2NAME)"!="" # do not have to include objs + @echo --output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_2.cmd .ELSE # "$(DEFLIB2NAME)"!="" # do not have to include objs - @echo dlltool --input-def $(SHL2DEF) \ - --dllname $(SHL2TARGET)$(DLLPOST) \ - --kill-at \ - --output-exp $(MISC)$/$(@:b)_exp.o \ + @echo --output-exp $(MISC)$/$(@:b)_exp.o \ $(STDOBJ) $(SHL2OBJS) $(SHL2LINKRESO) \ - `$(TYPE) /dev/null $(SHL2LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(TARGET).$(@:b)_2.cmd + `$(TYPE) /dev/null $(SHL2LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` >> $(MISC)$/$(TARGET).$(@:b)_2.cmd .ENDIF # "$(DEFLIB2NAME)"!="" - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL2VERSIONOBJ) $(SHL2DESCRIPTIONOBJ) $(SHL2OBJS) $(SHL2LINKRESO) \ `$(TYPE) /dev/null $(SHL2LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - -Wl,--exclude-libs,ALL $(SHL2STDLIBS) $(SHL2STDSHL) $(STDSHL2) \ - $(MISC)$/$(@:b)_exp.o \ + -Wl,--exclude-libs,ALL,--start-group $(SHL2STDLIBS) -Wl,--end-group \ + $(SHL2STDSHL) $(STDSHL2) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_2.cmd @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_2.cmd @+source $(MISC)$/$(TARGET).$(@:b)_2.cmd @@ -1392,24 +1386,21 @@ $(SHL3TARGETN) : \ .ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL3ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def -.IF "$(DEFLIB3NAME)"!="" # do not have to include objs @echo dlltool --input-def $(SHL3DEF) \ --dllname $(SHL3TARGET)$(DLLPOST) \ - --kill-at \ - --output-exp $(MISC)$/$(@:b)_exp.o > $(MISC)$/$(TARGET).$(@:b)_3.cmd + --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_3.cmd +.IF "$(DEFLIB3NAME)"!="" # do not have to include objs + @echo --output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_3.cmd .ELSE # "$(DEFLIB3NAME)"!="" # do not have to include objs - @echo dlltool --input-def $(SHL3DEF) \ - --dllname $(SHL3TARGET)$(DLLPOST) \ - --kill-at \ - --output-exp $(MISC)$/$(@:b)_exp.o \ + @echo --output-exp $(MISC)$/$(@:b)_exp.o \ $(STDOBJ) $(SHL3OBJS) $(SHL3LINKRESO) \ - `$(TYPE) /dev/null $(SHL3LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(TARGET).$(@:b)_3.cmd + `$(TYPE) /dev/null $(SHL3LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` >> $(MISC)$/$(TARGET).$(@:b)_3.cmd .ENDIF # "$(DEFLIB3NAME)"!="" - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL3VERSIONOBJ) $(SHL3DESCRIPTIONOBJ) $(SHL3OBJS) $(SHL3LINKRESO) \ `$(TYPE) /dev/null $(SHL3LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - -Wl,--exclude-libs,ALL $(SHL3STDLIBS) $(SHL3STDSHL) $(STDSHL3) \ - $(MISC)$/$(@:b)_exp.o \ + -Wl,--exclude-libs,ALL,--start-group $(SHL3STDLIBS) -Wl,--end-group \ + $(SHL3STDSHL) $(STDSHL3) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_3.cmd @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_3.cmd @+source $(MISC)$/$(TARGET).$(@:b)_3.cmd @@ -1940,24 +1931,21 @@ $(SHL4TARGETN) : \ .ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL4ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def -.IF "$(DEFLIB4NAME)"!="" # do not have to include objs @echo dlltool --input-def $(SHL4DEF) \ --dllname $(SHL4TARGET)$(DLLPOST) \ - --kill-at \ - --output-exp $(MISC)$/$(@:b)_exp.o > $(MISC)$/$(TARGET).$(@:b)_4.cmd + --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_4.cmd +.IF "$(DEFLIB4NAME)"!="" # do not have to include objs + @echo --output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_4.cmd .ELSE # "$(DEFLIB4NAME)"!="" # do not have to include objs - @echo dlltool --input-def $(SHL4DEF) \ - --dllname $(SHL4TARGET)$(DLLPOST) \ - --kill-at \ - --output-exp $(MISC)$/$(@:b)_exp.o \ + @echo --output-exp $(MISC)$/$(@:b)_exp.o \ $(STDOBJ) $(SHL4OBJS) $(SHL4LINKRESO) \ - `$(TYPE) /dev/null $(SHL4LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(TARGET).$(@:b)_4.cmd + `$(TYPE) /dev/null $(SHL4LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` >> $(MISC)$/$(TARGET).$(@:b)_4.cmd .ENDIF # "$(DEFLIB4NAME)"!="" - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL4VERSIONOBJ) $(SHL4DESCRIPTIONOBJ) $(SHL4OBJS) $(SHL4LINKRESO) \ `$(TYPE) /dev/null $(SHL4LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - -Wl,--exclude-libs,ALL $(SHL4STDLIBS) $(SHL4STDSHL) $(STDSHL4) \ - $(MISC)$/$(@:b)_exp.o \ + -Wl,--exclude-libs,ALL,--start-group $(SHL4STDLIBS) -Wl,--end-group \ + $(SHL4STDSHL) $(STDSHL4) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_4.cmd @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_4.cmd @+source $(MISC)$/$(TARGET).$(@:b)_4.cmd @@ -2488,24 +2476,21 @@ $(SHL5TARGETN) : \ .ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL5ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def -.IF "$(DEFLIB5NAME)"!="" # do not have to include objs @echo dlltool --input-def $(SHL5DEF) \ --dllname $(SHL5TARGET)$(DLLPOST) \ - --kill-at \ - --output-exp $(MISC)$/$(@:b)_exp.o > $(MISC)$/$(TARGET).$(@:b)_5.cmd + --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_5.cmd +.IF "$(DEFLIB5NAME)"!="" # do not have to include objs + @echo --output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_5.cmd .ELSE # "$(DEFLIB5NAME)"!="" # do not have to include objs - @echo dlltool --input-def $(SHL5DEF) \ - --dllname $(SHL5TARGET)$(DLLPOST) \ - --kill-at \ - --output-exp $(MISC)$/$(@:b)_exp.o \ + @echo --output-exp $(MISC)$/$(@:b)_exp.o \ $(STDOBJ) $(SHL5OBJS) $(SHL5LINKRESO) \ - `$(TYPE) /dev/null $(SHL5LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(TARGET).$(@:b)_5.cmd + `$(TYPE) /dev/null $(SHL5LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` >> $(MISC)$/$(TARGET).$(@:b)_5.cmd .ENDIF # "$(DEFLIB5NAME)"!="" - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL5VERSIONOBJ) $(SHL5DESCRIPTIONOBJ) $(SHL5OBJS) $(SHL5LINKRESO) \ `$(TYPE) /dev/null $(SHL5LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - -Wl,--exclude-libs,ALL $(SHL5STDLIBS) $(SHL5STDSHL) $(STDSHL5) \ - $(MISC)$/$(@:b)_exp.o \ + -Wl,--exclude-libs,ALL,--start-group $(SHL5STDLIBS) -Wl,--end-group \ + $(SHL5STDSHL) $(STDSHL5) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_5.cmd @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_5.cmd @+source $(MISC)$/$(TARGET).$(@:b)_5.cmd @@ -3036,24 +3021,21 @@ $(SHL6TARGETN) : \ .ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL6ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def -.IF "$(DEFLIB6NAME)"!="" # do not have to include objs @echo dlltool --input-def $(SHL6DEF) \ --dllname $(SHL6TARGET)$(DLLPOST) \ - --kill-at \ - --output-exp $(MISC)$/$(@:b)_exp.o > $(MISC)$/$(TARGET).$(@:b)_6.cmd + --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_6.cmd +.IF "$(DEFLIB6NAME)"!="" # do not have to include objs + @echo --output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_6.cmd .ELSE # "$(DEFLIB6NAME)"!="" # do not have to include objs - @echo dlltool --input-def $(SHL6DEF) \ - --dllname $(SHL6TARGET)$(DLLPOST) \ - --kill-at \ - --output-exp $(MISC)$/$(@:b)_exp.o \ + @echo --output-exp $(MISC)$/$(@:b)_exp.o \ $(STDOBJ) $(SHL6OBJS) $(SHL6LINKRESO) \ - `$(TYPE) /dev/null $(SHL6LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(TARGET).$(@:b)_6.cmd + `$(TYPE) /dev/null $(SHL6LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` >> $(MISC)$/$(TARGET).$(@:b)_6.cmd .ENDIF # "$(DEFLIB6NAME)"!="" - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL6VERSIONOBJ) $(SHL6DESCRIPTIONOBJ) $(SHL6OBJS) $(SHL6LINKRESO) \ `$(TYPE) /dev/null $(SHL6LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - -Wl,--exclude-libs,ALL $(SHL6STDLIBS) $(SHL6STDSHL) $(STDSHL6) \ - $(MISC)$/$(@:b)_exp.o \ + -Wl,--exclude-libs,ALL,--start-group $(SHL6STDLIBS) -Wl,--end-group \ + $(SHL6STDSHL) $(STDSHL6) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_6.cmd @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_6.cmd @+source $(MISC)$/$(TARGET).$(@:b)_6.cmd @@ -3584,24 +3566,21 @@ $(SHL7TARGETN) : \ .ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL7ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def -.IF "$(DEFLIB7NAME)"!="" # do not have to include objs @echo dlltool --input-def $(SHL7DEF) \ --dllname $(SHL7TARGET)$(DLLPOST) \ - --kill-at \ - --output-exp $(MISC)$/$(@:b)_exp.o > $(MISC)$/$(TARGET).$(@:b)_7.cmd + --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_7.cmd +.IF "$(DEFLIB7NAME)"!="" # do not have to include objs + @echo --output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_7.cmd .ELSE # "$(DEFLIB7NAME)"!="" # do not have to include objs - @echo dlltool --input-def $(SHL7DEF) \ - --dllname $(SHL7TARGET)$(DLLPOST) \ - --kill-at \ - --output-exp $(MISC)$/$(@:b)_exp.o \ + @echo --output-exp $(MISC)$/$(@:b)_exp.o \ $(STDOBJ) $(SHL7OBJS) $(SHL7LINKRESO) \ - `$(TYPE) /dev/null $(SHL7LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(TARGET).$(@:b)_7.cmd + `$(TYPE) /dev/null $(SHL7LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` >> $(MISC)$/$(TARGET).$(@:b)_7.cmd .ENDIF # "$(DEFLIB7NAME)"!="" - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL7VERSIONOBJ) $(SHL7DESCRIPTIONOBJ) $(SHL7OBJS) $(SHL7LINKRESO) \ `$(TYPE) /dev/null $(SHL7LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - -Wl,--exclude-libs,ALL $(SHL7STDLIBS) $(SHL7STDSHL) $(STDSHL7) \ - $(MISC)$/$(@:b)_exp.o \ + -Wl,--exclude-libs,ALL,--start-group $(SHL7STDLIBS) -Wl,--end-group \ + $(SHL7STDSHL) $(STDSHL7) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_7.cmd @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_7.cmd @+source $(MISC)$/$(TARGET).$(@:b)_7.cmd @@ -4132,24 +4111,21 @@ $(SHL8TARGETN) : \ .ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL8ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def -.IF "$(DEFLIB8NAME)"!="" # do not have to include objs @echo dlltool --input-def $(SHL8DEF) \ --dllname $(SHL8TARGET)$(DLLPOST) \ - --kill-at \ - --output-exp $(MISC)$/$(@:b)_exp.o > $(MISC)$/$(TARGET).$(@:b)_8.cmd + --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_8.cmd +.IF "$(DEFLIB8NAME)"!="" # do not have to include objs + @echo --output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_8.cmd .ELSE # "$(DEFLIB8NAME)"!="" # do not have to include objs - @echo dlltool --input-def $(SHL8DEF) \ - --dllname $(SHL8TARGET)$(DLLPOST) \ - --kill-at \ - --output-exp $(MISC)$/$(@:b)_exp.o \ + @echo --output-exp $(MISC)$/$(@:b)_exp.o \ $(STDOBJ) $(SHL8OBJS) $(SHL8LINKRESO) \ - `$(TYPE) /dev/null $(SHL8LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(TARGET).$(@:b)_8.cmd + `$(TYPE) /dev/null $(SHL8LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` >> $(MISC)$/$(TARGET).$(@:b)_8.cmd .ENDIF # "$(DEFLIB8NAME)"!="" - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL8VERSIONOBJ) $(SHL8DESCRIPTIONOBJ) $(SHL8OBJS) $(SHL8LINKRESO) \ `$(TYPE) /dev/null $(SHL8LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - -Wl,--exclude-libs,ALL $(SHL8STDLIBS) $(SHL8STDSHL) $(STDSHL8) \ - $(MISC)$/$(@:b)_exp.o \ + -Wl,--exclude-libs,ALL,--start-group $(SHL8STDLIBS) -Wl,--end-group \ + $(SHL8STDSHL) $(STDSHL8) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_8.cmd @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_8.cmd @+source $(MISC)$/$(TARGET).$(@:b)_8.cmd @@ -4680,24 +4656,21 @@ $(SHL9TARGETN) : \ .ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL9ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def -.IF "$(DEFLIB9NAME)"!="" # do not have to include objs @echo dlltool --input-def $(SHL9DEF) \ --dllname $(SHL9TARGET)$(DLLPOST) \ - --kill-at \ - --output-exp $(MISC)$/$(@:b)_exp.o > $(MISC)$/$(TARGET).$(@:b)_9.cmd + --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_9.cmd +.IF "$(DEFLIB9NAME)"!="" # do not have to include objs + @echo --output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_9.cmd .ELSE # "$(DEFLIB9NAME)"!="" # do not have to include objs - @echo dlltool --input-def $(SHL9DEF) \ - --dllname $(SHL9TARGET)$(DLLPOST) \ - --kill-at \ - --output-exp $(MISC)$/$(@:b)_exp.o \ + @echo --output-exp $(MISC)$/$(@:b)_exp.o \ $(STDOBJ) $(SHL9OBJS) $(SHL9LINKRESO) \ - `$(TYPE) /dev/null $(SHL9LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(TARGET).$(@:b)_9.cmd + `$(TYPE) /dev/null $(SHL9LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` >> $(MISC)$/$(TARGET).$(@:b)_9.cmd .ENDIF # "$(DEFLIB9NAME)"!="" - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL9VERSIONOBJ) $(SHL9DESCRIPTIONOBJ) $(SHL9OBJS) $(SHL9LINKRESO) \ `$(TYPE) /dev/null $(SHL9LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - -Wl,--exclude-libs,ALL $(SHL9STDLIBS) $(SHL9STDSHL) $(STDSHL9) \ - $(MISC)$/$(@:b)_exp.o \ + -Wl,--exclude-libs,ALL,--start-group $(SHL9STDLIBS) -Wl,--end-group \ + $(SHL9STDSHL) $(STDSHL9) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_9.cmd @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_9.cmd @+source $(MISC)$/$(TARGET).$(@:b)_9.cmd @@ -5228,24 +5201,21 @@ $(SHL10TARGETN) : \ .ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL10ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def -.IF "$(DEFLIB10NAME)"!="" # do not have to include objs @echo dlltool --input-def $(SHL10DEF) \ --dllname $(SHL10TARGET)$(DLLPOST) \ - --kill-at \ - --output-exp $(MISC)$/$(@:b)_exp.o > $(MISC)$/$(TARGET).$(@:b)_10.cmd + --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_10.cmd +.IF "$(DEFLIB10NAME)"!="" # do not have to include objs + @echo --output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_10.cmd .ELSE # "$(DEFLIB10NAME)"!="" # do not have to include objs - @echo dlltool --input-def $(SHL10DEF) \ - --dllname $(SHL10TARGET)$(DLLPOST) \ - --kill-at \ - --output-exp $(MISC)$/$(@:b)_exp.o \ + @echo --output-exp $(MISC)$/$(@:b)_exp.o \ $(STDOBJ) $(SHL10OBJS) $(SHL10LINKRESO) \ - `$(TYPE) /dev/null $(SHL10LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(TARGET).$(@:b)_10.cmd + `$(TYPE) /dev/null $(SHL10LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` >> $(MISC)$/$(TARGET).$(@:b)_10.cmd .ENDIF # "$(DEFLIB10NAME)"!="" - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL10VERSIONOBJ) $(SHL10DESCRIPTIONOBJ) $(SHL10OBJS) $(SHL10LINKRESO) \ `$(TYPE) /dev/null $(SHL10LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - -Wl,--exclude-libs,ALL $(SHL10STDLIBS) $(SHL10STDSHL) $(STDSHL10) \ - $(MISC)$/$(@:b)_exp.o \ + -Wl,--exclude-libs,ALL,--start-group $(SHL10STDLIBS) -Wl,--end-group \ + $(SHL10STDSHL) $(STDSHL10) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_10.cmd @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_10.cmd @+source $(MISC)$/$(TARGET).$(@:b)_10.cmd diff --git a/solenv/inc/extension_post.mk b/solenv/inc/extension_post.mk index 1888a6dddc71..dc4771420a7c 100644 --- a/solenv/inc/extension_post.mk +++ b/solenv/inc/extension_post.mk @@ -74,6 +74,12 @@ $(COMPONENT_LIBRARIES) : $(DLLDEST)$/$$(@:f) .IF "$(OS)$(CPU)"=="WNTI" .IF "$(COM)"=="GCC" $(GNUCOPY) $(SOLARBINDIR)$/mingwm10.dll $(EXTENSIONDIR) + .IF "$(MINGW_GCCDLL)"!="" + $(GNUCOPY) $(SOLARBINDIR)$/$(MINGW_GCCDLL) $(EXTENSIONDIR) + .ENDIF + .IF "$(MINGW_GXXDLL)"!="" + $(GNUCOPY) $(SOLARBINDIR)$/$(MINGW_GXXDLL) $(EXTENSIONDIR) + .ENDIF .ELSE .IF "$(PACKMS)"!="" .IF "$(CCNUMVER)" <= "001399999999" diff --git a/solenv/inc/tg_app.mk b/solenv/inc/tg_app.mk index d6846a0410d8..efffc86156c3 100644 --- a/solenv/inc/tg_app.mk +++ b/solenv/inc/tg_app.mk @@ -177,11 +177,13 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \ @cat $(APP$(TNR)LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP$(TNR)RES)) > $(MISC)$/$(@:b)_all.res windres $(MISC)$/$(@:b)_all.res $(APP$(TNR)RESO) .ENDIF - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ $(APP$(TNR)BASEX) $(APP$(TNR)STACKN) -o $@ $(APP$(TNR)OBJS) \ -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP$(TNR)RESO) \ `$(TYPE) /dev/null $(APP$(TNR)LIBS) | sed s#$(ROUT)#$(OUT)#g` \ - $(APP_LINKTYPE) $(APP$(TNR)LIBSALCPPRT) $(APP$(TNR)STDLIBS) $(APP$(TNR)STDLIB) $(STDLIB$(TNR)) > $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd + $(APP_LINKTYPE) $(APP$(TNR)LIBSALCPPRT) \ + -Wl,--start-group $(APP$(TNR)STDLIBS) -Wl,--end-group $(APP$(TNR)STDLIB) \ + $(STDLIB$(TNR)) $(MINGWSSTDENDOBJ) > $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd @+source $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd @ls -l $@ diff --git a/solenv/inc/tg_def.mk b/solenv/inc/tg_def.mk index 602dfcbf3d22..ff26f53271b2 100644 --- a/solenv/inc/tg_def.mk +++ b/solenv/inc/tg_def.mk @@ -61,7 +61,7 @@ $(DEF$(TNR)EXPORTFILE) : $(SHL$(TNR)VERSIONMAP) # Extract RTTI symbols from all the objects that will be used to build a shared library nm -gP $(SHL$(TNR)OBJS) \ `$(TYPE) /dev/null $(foreach,j,$(SHL$(TNR)LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp @.symbols-regexp.tmp >> $@.exported-symbols + | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols # overwrite the map file generate into the local output tree with the generated # exported symbols list $(RENAME) $@.exported-symbols $@ diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk index 327e205c22f8..3940f4e1311e 100644 --- a/solenv/inc/tg_shl.mk +++ b/solenv/inc/tg_shl.mk @@ -329,24 +329,21 @@ $(SHL$(TNR)TARGETN) : \ .ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL$(TNR)ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def -.IF "$(DEFLIB$(TNR)NAME)"!="" # do not have to include objs @echo dlltool --input-def $(SHL$(TNR)DEF) \ --dllname $(SHL$(TNR)TARGET)$(DLLPOST) \ - --kill-at \ - --output-exp $(MISC)$/$(@:b)_exp.o > $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd + --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd +.IF "$(DEFLIB$(TNR)NAME)"!="" # do not have to include objs + @echo --output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd .ELSE # "$(DEFLIB$(TNR)NAME)"!="" # do not have to include objs - @echo dlltool --input-def $(SHL$(TNR)DEF) \ - --dllname $(SHL$(TNR)TARGET)$(DLLPOST) \ - --kill-at \ - --output-exp $(MISC)$/$(@:b)_exp.o \ + @echo --output-exp $(MISC)$/$(@:b)_exp.o \ $(STDOBJ) $(SHL$(TNR)OBJS) $(SHL$(TNR)LINKRESO) \ - `$(TYPE) /dev/null $(SHL$(TNR)LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd + `$(TYPE) /dev/null $(SHL$(TNR)LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` >> $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd .ENDIF # "$(DEFLIB$(TNR)NAME)"!="" - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ) $(SHL$(TNR)OBJS) $(SHL$(TNR)LINKRESO) \ `$(TYPE) /dev/null $(SHL$(TNR)LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - -Wl,--exclude-libs,ALL $(SHL$(TNR)STDLIBS) $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) \ - $(MISC)$/$(@:b)_exp.o \ + -Wl,--exclude-libs,ALL,--start-group $(SHL$(TNR)STDLIBS) -Wl,--end-group \ + $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd @+source $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd diff --git a/solenv/inc/wntgcci6.mk b/solenv/inc/wntgcci6.mk index 28c16561d89f..9186ea9cc826 100644 --- a/solenv/inc/wntgcci6.mk +++ b/solenv/inc/wntgcci6.mk @@ -81,7 +81,10 @@ CFLAGSNOOPT=-O0 # Compiler flags for describing the output path CFLAGSOUTOBJ=-o #plattform hart setzen -CDEFS+=-DWIN32 -DWINVER=0x500 -D_WIN32_IE=0x500 -D_DLL -D_M_IX86 -DSTLPORT_VERSION=450 -D_NATIVE_WCHAR_T_DEFINED +CDEFS+=-DWIN32 -DWINVER=0x500 -D_WIN32_IE=0x500 -D_M_IX86 -DSTLPORT_VERSION=450 -D_NATIVE_WCHAR_T_DEFINED +.IF "$(DYNAMIC_CRT)"!="" +CDEFS+=-D_DLL +.ENDIF # -Wshadow does not work for C with nested uses of pthread_cleanup_push: CFLAGSWARNCC=-Wall -Wextra -Wendif-labels @@ -117,6 +120,8 @@ MINGWLIBDIR=$(COMPATH)$/lib$/mingw .ELSE MINGWLIBDIR=$(COMPATH)$/lib .ENDIF +MINGWSSTDOBJ=$(MINGW_CLIB_DIR)$/crtbegin.o +MINGWSSTDENDOBJ=$(MINGW_CLIB_DIR)$/crtend.o LINKFLAGSAPPGUI=-mwindows $(MINGWLIBDIR)$/crt2.o LINKFLAGSSHLGUI=--warn-once -mwindows -shared $(MINGWLIBDIR)$/dllcrt2.o LINKFLAGSAPPCUI=-mconsole $(MINGWLIBDIR)$/crt2.o @@ -126,19 +131,33 @@ LINKFLAGSPROF= LINKFLAGSDEBUG=-g LINKFLAGSOPT= +.IF "$(MINGW_SHARED_GXXLIB)"=="YES" && "$(DYNAMIC_CRT)"!="" +STDLIBCPP=-lstdc++_s +.ELSE STDLIBCPP=-lstdc++ +.ENDIF UWINAPILIB*=$(DYNAMIC) -luwinapi +.IF "$(MINGW_SHARED_GCCLIB)"=="YES" && "$(DYNAMIC_CRT)"!="" +MINGW_LIBGCC=-lgcc_s -lgcc +LINKFLAGS+=-shared-libgcc +.ELSE +.IF "$(MINGW_GCCLIB_EH)"=="YES" +MINGW_LIBGCC=-lgcc_eh -lgcc +.ELSE +MINGW_LIBGCC=-lgcc +.ENDIF +.ENDIF STDOBJVCL=$(L)$/salmain.obj STDOBJGUI= STDSLOGUI= STDOBJCUI= STDSLOCUI= -STDLIBGUIMT=-Wl,--start-group CPPRUNTIME -lgcc -STDLIBCUIMT=-Wl,--start-group CPPRUNTIME -lgcc -STDSHLGUIMT=-Wl,--start-group CPPRUNTIME -lgcc -STDSHLCUIMT=-Wl,--start-group CPPRUNTIME -lgcc -.IF "$(MINGW_NODLL)"=="" +STDLIBGUIMT=-Wl,--start-group CPPRUNTIME $(MINGW_LIBGCC) +STDLIBCUIMT=-Wl,--start-group CPPRUNTIME $(MINGW_LIBGCC) +STDSHLGUIMT=-Wl,--start-group CPPRUNTIME $(MINGW_LIBGCC) +STDSHLCUIMT=-Wl,--start-group CPPRUNTIME $(MINGW_LIBGCC) +.IF "$(DYNAMIC_CRT)"!="" STDLIBGUIMT+=-lmingwthrd STDLIBCUIMT+=-lmingwthrd STDSHLGUIMT+=-lmingwthrd @@ -150,7 +169,7 @@ STDSHLGUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -l STDSHLCUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt LIBSTLPORT=-lstlport_gcc -LIBSTLPORTST=-lstlport_gcc_static +LIBSTLPORTST=-lstlport_gcc_static $(STDLIBCPP) LIBMGR=ar LIBFLAGS=-rsu -- cgit From 491476018b252440a477cff272a52993d9a5c4cf Mon Sep 17 00:00:00 2001 From: Release Engineers Date: Wed, 26 Aug 2009 06:41:14 +0000 Subject: CWS-TOOLING: integrate CWS native262 2009-08-18 16:35:06 +0200 is r275118 : #i102939# differ between ok-label and install-label 2009-08-13 17:24:47 +0200 is r274960 : #i102939# mac languagepacks 2009-08-13 17:22:22 +0200 is r274959 : #i102939# mac languagepacks 2009-08-13 17:15:01 +0200 is r274958 : #i102939# mac languagepacks 2009-08-13 17:13:36 +0200 is r274957 : #i102939# mac languagepacks 2009-08-13 17:12:57 +0200 is r274956 : #i102939# mac languagepacks 2009-08-13 17:12:20 +0200 is r274955 : #i102939# mac languagepacks 2009-08-13 17:11:41 +0200 is r274954 : #i102939# mac languagepacks 2009-08-13 17:10:52 +0200 is r274953 : #i102939# mac languagepacks --- instsetoo_native/res/DS_Store_Langpack | Bin 0 -> 12292 bytes instsetoo_native/util/makefile.mk | 6 +- instsetoo_native/util/pack.lst | 4 +- scp2/source/ooo/directory_ooo_macosx.scp | 2 + scp2/source/ooo/scpaction_ooo.scp | 4 +- solenv/bin/make_installer.pl | 14 +- solenv/bin/modules/installer/globals.pm | 2 + solenv/bin/modules/installer/parameter.pm | 11 +- solenv/bin/modules/installer/scriptitems.pm | 60 ++++++ solenv/bin/modules/installer/simplepackage.pm | 299 +++++++++++++++++++++++++- 10 files changed, 388 insertions(+), 14 deletions(-) create mode 100644 instsetoo_native/res/DS_Store_Langpack diff --git a/instsetoo_native/res/DS_Store_Langpack b/instsetoo_native/res/DS_Store_Langpack new file mode 100644 index 000000000000..1b53eba75b74 Binary files /dev/null and b/instsetoo_native/res/DS_Store_Langpack differ diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index 99ca8b140d51..fa9e97e5516e 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -217,8 +217,8 @@ $(MAKETARGETS) : $(ADDDEPS) .ENDIF # "$(BUILD_SPECIAL)"!="" .IF "$(OS)" == "MACOSX" -DMGDEPS=$(BIN)$/{osxdndinstall.png DS_Store} -$(foreach,i,$(alllangiso) {openoffice openofficedev openofficewithjre broffice brofficedev brofficewithjre}_$i) : $(DMGDEPS) +DMGDEPS=$(BIN)$/{osxdndinstall.png DS_Store DS_Store_Langpack} +$(foreach,i,$(alllangiso) {openoffice openofficedev openofficewithjre ooolanguagepack broffice brofficedev brofficewithjre}_$i) : $(DMGDEPS) .ENDIF # "$(OS)" == "MACOSX" .IF "$(PKGFORMAT)"!="" @@ -384,7 +384,7 @@ $(BIN)$/broffice$/intro.zip : $(SOLARCOMMONPCKDIR)$/broffice_nologo$/intro.zip @-$(MKDIR) $(@:d) $(COPY) $< $@ -$(BIN)$/{osxdndinstall.png DS_Store} : $(PRJ)$/res$/$$(@:f) +$(BIN)$/{osxdndinstall.png DS_Store DS_Store_Langpack} : $(PRJ)$/res$/$$(@:f) @$(COPY) $< $@ hack_msitemplates .PHONY: diff --git a/instsetoo_native/util/pack.lst b/instsetoo_native/util/pack.lst index 4b7f1954f084..200bf3708f5a 100755 --- a/instsetoo_native/util/pack.lst +++ b/instsetoo_native/util/pack.lst @@ -17,8 +17,8 @@ OpenOffice_Dev unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxmacxi.pr #OpenOffice_SDK unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12 en-US sdkoo OpenOffice_Dev_SDK unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12 en-US sdkoodev #URE unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngi6,unxsoli4,unxsols4,wntmsci12 en-US ure -OpenOfficeLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro de ooolanguagepack -OpenOfficeLanguagepack unxlngi6,unxsoli4,unxsols4,wntmsci12 de ooolanguagepack +OpenOfficeLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro de ooolanguagepack +OpenOfficeLanguagepack unxlngi6,unxsoli4,unxsols4,wntmsci12,unxmacxi de ooolanguagepack OpenOfficeDevLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro de|fr|ja|ar ooodevlanguagepack #BrOfficeLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro pt-BR broolanguagepack diff --git a/scp2/source/ooo/directory_ooo_macosx.scp b/scp2/source/ooo/directory_ooo_macosx.scp index 409afc0797f2..6bff77e6f355 100755 --- a/scp2/source/ooo/directory_ooo_macosx.scp +++ b/scp2/source/ooo/directory_ooo_macosx.scp @@ -34,6 +34,8 @@ Directory gid_Dir_Bundle ParentID = PD_PROGDIR; HostName = "%PRODUCTNAME.app"; + LangPackHostName = "%PRODUCTNAME %PRODUCTVERSION Language Pack.app"; + PatchHostName = "%PRODUCTNAME %PRODUCTVERSION Patch.app"; End #endif diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp index 76ea41ed06bb..f88737451a5f 100644 --- a/scp2/source/ooo/scpaction_ooo.scp +++ b/scp2/source/ooo/scpaction_ooo.scp @@ -370,8 +370,10 @@ End ScpAction scp_Copy_Ds_Store Copy = "DS_Store"; + LangPackCopy = "DS_Store_Langpack"; + PatchCopy = "DS_Store_Patch"; Name = ".DS_Store"; UnixRights = 444; - Styles = (); + Styles = (FORCELANGUAGEPACK); End #endif diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl index 13052fa1a116..6458fbfdc5cb 100644 --- a/solenv/bin/make_installer.pl +++ b/solenv/bin/make_installer.pl @@ -408,8 +408,12 @@ installer::logger::print_message( "... analyzing directories ... \n" ); my $dirsinproductarrayref = installer::setupscript::get_all_items_from_script($setupscriptref, "Directory"); if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productdirectories1.log", $dirsinproductarrayref); } -if ( $allvariableshashref->{'SHIFT_BASIS_INTO_BRAND_LAYER'} ) { $dirsinproductarrayref = installer::scriptitems::shift_basis_directory_parents($dirsinproductarrayref); } +if ( $installer::globals::languagepack ) { installer::scriptitems::use_langpack_hostname($dirsinproductarrayref); } +if ( $installer::globals::patch ) { installer::scriptitems::use_patch_hostname($dirsinproductarrayref); } if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productdirectories1a.log", $dirsinproductarrayref); } + +if ( $allvariableshashref->{'SHIFT_BASIS_INTO_BRAND_LAYER'} ) { $dirsinproductarrayref = installer::scriptitems::shift_basis_directory_parents($dirsinproductarrayref); } +if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productdirectories1b.log", $dirsinproductarrayref); } if ( $allvariableshashref->{'OFFICEDIRECTORYNAME'} ) { installer::scriptitems::set_officedirectory_name($dirsinproductarrayref, $allvariableshashref->{'OFFICEDIRECTORYNAME'}); } if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productdirectories1b.log", $dirsinproductarrayref); } @@ -472,6 +476,10 @@ if (( ! $allvariableshashref->{'XPDINSTALLER'} ) || ( ! $installer::globals::isx if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions1a.log", $scpactionsinproductarrayref); } } +if ( $installer::globals::languagepack ) { installer::scriptitems::use_langpack_copy_scpaction($scpactionsinproductarrayref); } +if ( $installer::globals::patch ) { installer::scriptitems::use_patch_copy_scpaction($scpactionsinproductarrayref); } +if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions1b.log", $scpactionsinproductarrayref); } + # $scpactionsinproductarrayref = installer::scriptitems::remove_scpactions_without_name($scpactionsinproductarrayref); # if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions2.log", $scpactionsinproductarrayref); } @@ -1008,7 +1016,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) my $profilesinproductlanguageresolvedarrayref; my $profileitemsinproductlanguageresolvedarrayref; - if ((!($installer::globals::is_copy_only_project)) && (!($installer::globals::product =~ /ada/i ))) + if ((!($installer::globals::is_copy_only_project)) && (!($installer::globals::product =~ /ada/i )) && (!($installer::globals::languagepack))) { installer::logger::print_message( "... creating profiles ...\n" ); @@ -1363,7 +1371,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) # try it again later. #################################################### - if (( $installer::globals::patch ) || ( $installer::globals::languagepack ) || ( $installer::globals::packageformat eq "native" )) { $allvariableshashref->{'POOLPRODUCT'} = 0; } + if (( $installer::globals::patch ) || ( $installer::globals::languagepack ) || ( $installer::globals::packageformat eq "native" ) || ( $installer::globals::packageformat eq "osx" )) { $allvariableshashref->{'POOLPRODUCT'} = 0; } if ( $allvariableshashref->{'POOLPRODUCT'} ) { diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm index d9799069e539..8b5f13c7ae5b 100644 --- a/solenv/bin/modules/installer/globals.pm +++ b/solenv/bin/modules/installer/globals.pm @@ -134,6 +134,7 @@ BEGIN $issolarissparcbuild = 0; $issolarisx86build = 0; $isfreebsdpkgbuild = 0; + $ismacdmgbuild = 0; $unpackpath = ""; $idttemplatepath = ""; $idtlanguagepath = ""; @@ -448,6 +449,7 @@ BEGIN @featurecollector =(); $msiassemblyfiles = ""; $nsisfilename = "Nsis"; + $macinstallfilename = "macinstall.ulf"; $nsis204 = 0; $nsis231 = 0; $unicodensis = 0; diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm index bc797d257d14..e4fb19f0c537 100644 --- a/solenv/bin/modules/installer/parameter.pm +++ b/solenv/bin/modules/installer/parameter.pm @@ -293,6 +293,15 @@ sub setglobalvariables $installer::globals::isxpdplatform = 1; } } + + if ( $installer::globals::compiler =~ /unxmacxi/ ) + { + if ( $installer::globals::packageformat eq "dmg" ) + { + $installer::globals::ismacdmgbuild = 1; + } + } + if ( $installer::globals::compiler =~ /unxfbsd/ ) { if ( $installer::globals::packageformat eq "bsd" ) @@ -537,7 +546,7 @@ sub control_required_parameter # for Solaris packages and Linux ####################################### - if (( $installer::globals::patch ) && ( ! $installer::globals::issolarispkgbuild ) && ( ! $installer::globals::islinuxrpmbuild ) && ( ! $installer::globals::islinuxdebbuild ) && ( ! $installer::globals::iswindowsbuild )) + if (( $installer::globals::patch ) && ( ! $installer::globals::issolarispkgbuild ) && ( ! $installer::globals::islinuxrpmbuild ) && ( ! $installer::globals::islinuxdebbuild ) && ( ! $installer::globals::iswindowsbuild ) && ( ! $installer::globals::ismacdmgbuild )) { installer::logger::print_error( "Sorry, Patch flag currently only available for Solaris pkg, Linux RPM and Windows builds!" ); usage(); diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm index 0ef8283705b6..204c009141c6 100644 --- a/solenv/bin/modules/installer/scriptitems.pm +++ b/solenv/bin/modules/installer/scriptitems.pm @@ -590,6 +590,66 @@ sub get_children } } +################################################################################ +# Using different HostName for language packs +################################################################################ + +sub use_langpack_hostname +{ + my ($dirsref) = @_; + + for ( my $i = 0; $i <= $#{$dirsref}; $i++ ) + { + my $onedir = ${$dirsref}[$i]; + if (( $onedir->{'LangPackHostName'} ) && ( $onedir->{'LangPackHostName'} ne "" )) { $onedir->{'HostName'} = $onedir->{'LangPackHostName'}; } + } +} + +################################################################################ +# Using different HostName for language packs +################################################################################ + +sub use_patch_hostname +{ + my ($dirsref) = @_; + + for ( my $i = 0; $i <= $#{$dirsref}; $i++ ) + { + my $onedir = ${$dirsref}[$i]; + if (( $onedir->{'PatchHostName'} ) && ( $onedir->{'PatchHostName'} ne "" )) { $onedir->{'HostName'} = $onedir->{'PatchHostName'}; } + } +} + +################################################################################ +# Using different HostName for language packs +################################################################################ + +sub use_langpack_copy_scpaction +{ + my ($scpactionsref) = @_; + + for ( my $i = 0; $i <= $#{$scpactionsref}; $i++ ) + { + my $onescpaction = ${$scpactionsref}[$i]; + if (( $onescpaction->{'LangPackCopy'} ) && ( $onescpaction->{'LangPackCopy'} ne "" )) { $onescpaction->{'Copy'} = $onescpaction->{'LangPackCopy'}; } + } +} + +################################################################################ +# Using different HostName for language packs +################################################################################ + +sub use_patch_copy_scpaction +{ + my ($scpactionsref) = @_; + + for ( my $i = 0; $i <= $#{$scpactionsref}; $i++ ) + { + my $onescpaction = ${$scpactionsref}[$i]; + if (( $onescpaction->{'PatchCopy'} ) && ( $onescpaction->{'PatchCopy'} ne "" )) { $onescpaction->{'Copy'} = $onescpaction->{'PatchCopy'}; } + } +} + ################################################################################ # Shifting parent directories of URE and Basis layer, so that # these directories are located below the Brand layer. diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index 771e0980c2f5..a543c32c048a 100644 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -181,6 +181,180 @@ sub register_extensions chdir($from); } +######################################################################## +# Getting the translation file for the Mac Language Pack installer +######################################################################## + +sub get_mac_translation_file +{ + my $translationfilename = $installer::globals::maclangpackfilename; + # my $translationfilename = $installer::globals::idtlanguagepath . $installer::globals::separator . $installer::globals::maclangpackfilename; + # if ( $installer::globals::unicodensis ) { $translationfilename = $translationfilename . ".uulf"; } + # else { $translationfilename = $translationfilename . ".mlf"; } + if ( ! -f $translationfilename ) { installer::exiter::exit_program("ERROR: Could not find language file $translationfilename!", "get_mac_translation_file"); } + my $translationfile = installer::files::read_file($translationfilename); + + my $infoline = "Reading translation file: $translationfilename\n"; + push( @installer::globals::logfileinfo, $infoline); + + return $translationfile; +} + +################################################################## +# Collecting all identifier from ulf file +################################################################## + +sub get_identifier +{ + my ( $translationfile ) = @_; + + my @identifier = (); + + for ( my $i = 0; $i <= $#{$translationfile}; $i++ ) + { + my $oneline = ${$translationfile}[$i]; + + if ( $oneline =~ /^\s*\[(.+)\]\s*$/ ) + { + my $identifier = $1; + push(@identifier, $identifier); + } + } + + return \@identifier; +} + +############################################################## +# Returning the complete block in all languages +# for a specified string +############################################################## + +sub get_language_block_from_language_file +{ + my ($searchstring, $languagefile) = @_; + + my @language_block = (); + + for ( my $i = 0; $i <= $#{$languagefile}; $i++ ) + { + if ( ${$languagefile}[$i] =~ /^\s*\[\s*$searchstring\s*\]\s*$/ ) + { + my $counter = $i; + + push(@language_block, ${$languagefile}[$counter]); + $counter++; + + while (( $counter <= $#{$languagefile} ) && (!( ${$languagefile}[$counter] =~ /^\s*\[/ ))) + { + push(@language_block, ${$languagefile}[$counter]); + $counter++; + } + + last; + } + } + + return \@language_block; +} + +############################################################## +# Returning a specific language string from the block +# of all translations +############################################################## + +sub get_language_string_from_language_block +{ + my ($language_block, $language) = @_; + + my $newstring = ""; + + for ( my $i = 0; $i <= $#{$language_block}; $i++ ) + { + if ( ${$language_block}[$i] =~ /^\s*$language\s*\=\s*\"(.*)\"\s*$/ ) + { + $newstring = $1; + last; + } + } + + if ( $newstring eq "" ) + { + $language = "en-US"; # defaulting to english + + for ( my $i = 0; $i <= $#{$language_block}; $i++ ) + { + if ( ${$language_block}[$i] =~ /^\s*$language\s*\=\s*\"(.*)\"\s*$/ ) + { + $newstring = $1; + last; + } + } + } + + return $newstring; +} + +######################################################################## +# Localizing the script for the Mac Language Pack installer +######################################################################## + +sub localize_scriptfile +{ + my ($scriptfile, $translationfile, $languagestringref) = @_; + + # my $translationfile = get_mac_translation_file(); + + my $onelanguage = $$languagestringref; + if ( $onelanguage =~ /^\s*(.*?)_/ ) { $onelanguage = $1; } + + # Analyzing the ulf file, collecting all Identifier + my $allidentifier = get_identifier($translationfile); + + for ( my $i = 0; $i <= $#{$allidentifier}; $i++ ) + { + my $identifier = ${$allidentifier}[$i]; + my $language_block = get_language_block_from_language_file($identifier, $translationfile); + my $newstring = get_language_string_from_language_block($language_block, $onelanguage); + + # removing mask + $newstring =~ s/\\\'/\'/g; + + replace_one_variable_in_shellscript($scriptfile, $newstring, $identifier); + } +} + +################################################################################# +# Replacing one variable in Mac shell script +################################################################################# + +sub replace_one_variable_in_shellscript +{ + my ($scriptfile, $variable, $searchstring) = @_; + + for ( my $i = 0; $i <= $#{$scriptfile}; $i++ ) + { + ${$scriptfile}[$i] =~ s/\[$searchstring\]/$variable/g; + } +} + +############################################# +# Replacing variables in Mac shell script +############################################# + +sub replace_variables_in_scriptfile +{ + my ($scriptfile, $volume_name, $allvariables) = @_; + + replace_one_variable_in_shellscript($scriptfile, $volume_name, "FULLPRODUCTNAME" ); + replace_one_variable_in_shellscript($scriptfile, $allvariables->{'PRODUCTNAME'}, "PRODUCTNAME" ); + replace_one_variable_in_shellscript($scriptfile, $allvariables->{'PRODUCTVERSION'}, "PRODUCTVERSION" ); + + my $scriptname = lc($allvariables->{'PRODUCTNAME'}) . "\.script"; + if ( $allvariables->{'PRODUCTNAME'} eq "OpenOffice.org" ) { $scriptname = "org.openoffice.script"; } + + replace_one_variable_in_shellscript($scriptfile, $scriptname, "SEARCHSCRIPTNAME" ); +} + ############################################# # Creating the "simple" package. # "zip" for Windows @@ -190,7 +364,7 @@ sub register_extensions sub create_package { - my ( $installdir, $packagename, $allvariables, $includepatharrayref ) = @_; + my ( $installdir, $packagename, $allvariables, $includepatharrayref, $languagestringref ) = @_; # moving dir into temporary directory my $pid = $$; # process id @@ -237,8 +411,116 @@ sub create_package my $sla = 'sla.r'; my $ref = installer::scriptitems::get_sourcepath_from_filename_and_includepath( \$sla, $includepatharrayref, 0); - $systemcall = "cd $tempdir && hdiutil makehybrid -hfs -hfs-openfolder $folder $folder -hfs-volume-name \"$volume_name\" -ov -o $installdir/tmp && hdiutil convert -ov -format UDZO $installdir/tmp.dmg -o $archive && "; - if ($$ref ne "") { + my $localtempdir = $tempdir; + + if (( $installer::globals::languagepack ) || ( $installer::globals::patch )) + { + $localtempdir = "$tempdir/$packagename"; + if ( $installer::globals::languagepack ) { $volume_name = "$volume_name Language Pack"; } + if ( $installer::globals::patch ) { $volume_name = "$volume_name Patch"; } + + # Create tar ball named tarball.tar.bz2 + my $appfolder = $localtempdir . "/" . $volume_name . "\.app"; + my $contentsfolder = $appfolder . "/Contents"; + my $tarballname = "tarball.tar.bz2"; + + my $localfrom = cwd(); + chdir $appfolder; + + $systemcall = "tar -cjf $tarballname Contents/"; + + print "... $systemcall ...\n"; + my $localreturnvalue = system($systemcall); + $infoline = "Systemcall: $systemcall\n"; + push( @installer::globals::logfileinfo, $infoline); + + if ($localreturnvalue) + { + $infoline = "ERROR: Could not execute \"$systemcall\"!\n"; + push( @installer::globals::logfileinfo, $infoline); + } + else + { + $infoline = "Success: Executed \"$systemcall\" successfully!\n"; + push( @installer::globals::logfileinfo, $infoline); + } + + my $sourcefile = $appfolder . "/" . $tarballname; + my $destfile = $contentsfolder . "/" . $tarballname; + + installer::systemactions::remove_complete_directory($contentsfolder); + installer::systemactions::create_directory($contentsfolder); + + installer::systemactions::copy_one_file($sourcefile, $destfile); + unlink($sourcefile); + + # Copy two files into installation set next to the tar ball + # 1. "osx_install.applescript" + # 2 "OpenOffice.org Languagepack" + + my $scriptrealfilename = "osx_install.applescript"; + my $scriptfilename = ""; + if ( $installer::globals::languagepack ) { $scriptfilename = "osx_install_languagepack.applescript"; } + if ( $installer::globals::patch ) { $scriptfilename = "osx_install_patch.applescript"; } + my $scripthelpersolverfilename = "mac_install.script"; + my $scripthelperrealfilename = $volume_name; + my $translationfilename = $installer::globals::macinstallfilename; + + # Finding both files in solver + + my $scriptref = installer::scriptitems::get_sourcepath_from_filename_and_includepath( \$scriptfilename, $includepatharrayref, 0); + if ($$scriptref eq "") { installer::exiter::exit_program("ERROR: Could not find Apple script $scriptfilename!", "create_package"); } + my $scripthelperref = installer::scriptitems::get_sourcepath_from_filename_and_includepath( \$scripthelpersolverfilename, $includepatharrayref, 0); + if ($$scripthelperref eq "") { installer::exiter::exit_program("ERROR: Could not find Apple script $scripthelpersolverfilename!", "create_package"); } + my $translationfileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath( \$translationfilename, $includepatharrayref, 0); + if ($$translationfileref eq "") { installer::exiter::exit_program("ERROR: Could not find Apple script translation file $translationfilename!", "create_package"); } + + $scriptfilename = $contentsfolder . "/" . $scriptrealfilename; + $scripthelperrealfilename = $contentsfolder . "/" . $scripthelperrealfilename; + + installer::systemactions::copy_one_file($$scriptref, $scriptfilename); + installer::systemactions::copy_one_file($$scripthelperref, $scripthelperrealfilename); + + # Replacing variables in script $scriptfilename + # Localizing script $scriptfilename + my $scriptfilecontent = installer::files::read_file($scriptfilename); + my $translationfilecontent = installer::files::read_file($$translationfileref); + localize_scriptfile($scriptfilecontent, $translationfilecontent, $languagestringref); + replace_variables_in_scriptfile($scriptfilecontent, $volume_name, $allvariables); + installer::files::save_file($scriptfilename, $scriptfilecontent); + + $systemcall = "chmod 775 " . "\"" . $scriptfilename . "\""; + system($systemcall); + $systemcall = "chmod 775 " . "\"" . $scripthelperrealfilename . "\""; + system($systemcall); + + # Copy also Info.plist and icon file + # Finding both files in solver + my $iconfile = "ooo3_installer.icns"; + my $iconfileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath( \$iconfile, $includepatharrayref, 0); + if ($$iconfileref eq "") { installer::exiter::exit_program("ERROR: Could not find Apple script icon file $iconfile!", "create_package"); } + my $subdir = $contentsfolder . "/" . "Resources"; + if ( ! -d $subdir ) { installer::systemactions::create_directory($subdir); } + $destfile = $subdir . "/" . $iconfile; + installer::systemactions::copy_one_file($$iconfileref, $destfile); + + my $infoplistfile = "Info.plist.langpack"; + my $installname = "Info.plist"; + my $infoplistfileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath( \$infoplistfile, $includepatharrayref, 0); + if ($$infoplistfileref eq "") { installer::exiter::exit_program("ERROR: Could not find Apple script Info.plist: $infoplistfile!", "create_package"); } + $destfile = $contentsfolder . "/" . $installname; + installer::systemactions::copy_one_file($$infoplistfileref, $destfile); + + # Replacing variables in Info.plist + $scriptfilecontent = installer::files::read_file($destfile); + replace_one_variable_in_shellscript($scriptfilecontent, $volume_name, "FULLPRODUCTNAME" ); + installer::files::save_file($destfile, $scriptfilecontent); + + chdir $localfrom; + } + + $systemcall = "cd $localtempdir && hdiutil makehybrid -hfs -hfs-openfolder $folder $folder -hfs-volume-name \"$volume_name\" -ov -o $installdir/tmp && hdiutil convert -ov -format UDZO $installdir/tmp.dmg -o $archive && "; + if ($$ref ne "") { $systemcall .= "hdiutil unflatten $archive && Rez -a $$ref -o $archive && hdiutil flatten $archive &&"; } $systemcall .= "rm -f $installdir/tmp.dmg"; @@ -322,6 +604,8 @@ sub create_simple_package else { $downloadname = installer::ziplist::getinfofromziplist($allsettingsarrayref, "downloadname"); + if ( $installer::globals::languagepack ) { $downloadname = installer::ziplist::getinfofromziplist($allsettingsarrayref, "langpackdownloadname"); } + if ( $installer::globals::patch ) { $downloadname = installer::ziplist::getinfofromziplist($allsettingsarrayref, "patchdownloadname"); } $packagename = installer::download::resolve_variables_in_downloadname($allvariables, $$downloadname, \$locallanguage); } } @@ -374,6 +658,7 @@ sub create_simple_package my $onefile = ${$filesref}[$i]; if (( $onefile->{'Styles'} ) && ( $onefile->{'Styles'} =~ /\bBINARYTABLE_ONLY\b/ )) { next; } + if (( $installer::globals::patch ) && ( $onefile->{'Styles'} ) && ( ! ( $onefile->{'Styles'} =~ /\bPATCH\b/ ))) { next; } my $source = $onefile->{'sourcepath'}; my $destination = $onefile->{'destination'}; @@ -428,6 +713,9 @@ sub create_simple_package for ( my $i = 0; $i <= $#{$linksref}; $i++ ) { my $onelink = ${$linksref}[$i]; + + if (( $installer::globals::patch ) && ( $onelink->{'Styles'} ) && ( ! ( $onelink->{'Styles'} =~ /\bPATCH\b/ ))) { next; } + my $destination = $onelink->{'destination'}; $destination = $subfolderdir . $installer::globals::separator . $destination; my $destinationfile = $onelink->{'destinationfile'}; @@ -442,6 +730,9 @@ sub create_simple_package for ( my $i = 0; $i <= $#{$unixlinksref}; $i++ ) { my $onelink = ${$unixlinksref}[$i]; + + if (( $installer::globals::patch ) && ( $onelink->{'Styles'} ) && ( ! ( $onelink->{'Styles'} =~ /\bPATCH\b/ ))) { next; } + my $target = $onelink->{'Target'}; my $destination = $subfolderdir . $installer::globals::separator . $onelink->{'destination'}; @@ -485,7 +776,7 @@ sub create_simple_package # -> tar.gz for all other platforms installer::logger::print_message( "... creating $installer::globals::packageformat file ...\n" ); installer::logger::include_header_into_logfile("Creating $installer::globals::packageformat file:"); - create_package($installdir, $packagename, $allvariables, $includepatharrayref); + create_package($installdir, $packagename, $allvariables, $includepatharrayref, $languagestringref); } # Analyzing the log file -- cgit From 86792bd0e0f81d1677c1da4888fbeb3f2072131e Mon Sep 17 00:00:00 2001 From: Release Engineers Date: Wed, 26 Aug 2009 08:22:01 +0000 Subject: CWS-TOOLING: integrate CWS jl127 2009-07-30 10:12:10 +0200 jl r274470 : #i100873# switch on checking for symbol definitions. It works with the current xpcom lib. 2009-07-29 09:48:29 +0200 jl r274443 : #i100873# 2009-07-29 09:47:36 +0200 jl r274442 : #i100873# changes after resync with DEV300m53 which contains the seamonkey update 2009-07-28 10:00:03 +0200 jl r274389 : #100873# Patches from tono 2009-07-27 16:59:39 +0200 jl r274372 : CWS-TOOLING: rebase CWS jl127 to trunk@274203 (milestone: DEV300:m53) 2009-07-07 09:08:53 +0200 jl r273768 : #100873# 2009-07-06 17:16:10 +0200 jl r273754 : #100873# 2009-07-01 13:58:09 +0200 jl r273576 : #100873# added to readme 2009-07-01 13:15:02 +0200 jl r273573 : #100873# deliver lib files when building with MS compiler 2009-06-30 11:22:06 +0200 jl r273498 : #i100873# accidentally commented out patch_files 2009-06-30 09:01:10 +0200 jl r273489 : #100873# make rc.exe work in ooo windows build 2009-06-29 09:47:56 +0200 jl r273451 : #i100873# applied mingw patch from tono 2009-06-24 12:52:14 +0200 jl r273332 : #100873# reapplying the configure.in patch on version 273150 2009-06-24 12:51:12 +0200 jl r273331 : #100873# reapplying the patch on version 273150 2009-06-23 17:17:36 +0200 jl r273299 : #100873# manually modified patch from tono 2009-06-22 17:05:41 +0200 jl r273243 : #100873# applying mingw patch from tono 2009-06-22 17:02:30 +0200 jl r273242 : #100873# applying mingw patch from tono 2009-06-22 12:49:57 +0200 jl r273216 : #100873# dependency to stlport 2009-06-19 11:56:16 +0200 jl r273155 : #100873# undoing a previous change, instset_native complained about missing libjpipe.jnilib (jurt) 2009-06-19 10:13:03 +0200 jl r273150 : #100873# ooo builds shall also use the new nss by default 2009-06-18 14:32:07 +0200 jl r273117 : #110873# more debug output when verifying a certificate 2009-06-16 11:23:50 +0200 jl r273012 : #i10873# 2009-06-16 10:57:41 +0200 jl r273011 : #100873# wrong parameter definition in nsscrypto_initialize 2009-06-16 10:56:45 +0200 jl r273010 : #100873# wrong parameter definition in nsscrypto_initialize 2009-06-15 16:20:42 +0200 jl r272996 : #100873# initialization of NSS is now threadsafe 2009-06-10 12:50:46 +0200 jl r272804 : #100873# rename in foreach fails in 4nt 2009-06-09 13:43:00 +0200 jl r272768 : #i100873# deliver only .h from inc/nss otherwise we get a warning when nss/nssck.api is delivered 2009-06-08 16:15:44 +0200 jl r272739 : #i100873# 2009-06-08 16:04:54 +0200 jl r272738 : #i100873# 2009-06-08 15:45:52 +0200 jl r272736 : #i100873# 2009-06-08 15:44:15 +0200 jl r272735 : #i100873# unzipping of nss.tar.z not working with 4nt 2009-06-08 09:45:46 +0200 jl r272720 : #i100873# 2009-06-03 13:53:52 +0200 jl r272562 : #i100873# MOZILLABUILD not correct 2009-06-03 13:17:54 +0200 jl r272557 : #i100873# readme and makefile changes from cws jl125, support of new nss module 2009-06-03 09:57:40 +0200 jl r272544 : #i100873# added readme 2009-06-02 16:47:47 +0200 jl r272512 : #i100873# removed no longer needed stuff regarding jnilibs 2009-06-02 15:54:42 +0200 jl r272510 : #i100873# added NSS to BUILD_TYPE 2009-06-02 15:20:18 +0200 jl r272508 : #i100873# DEREFERENCE option for copy command 2009-06-02 13:00:12 +0200 jl r272496 : #i100873# PATCH_FILE_NAMES is now PATCH_FILES 2009-06-02 12:23:39 +0200 jl r272494 : #i100873# build dependency to nss 2009-05-29 16:21:40 +0200 jl r272470 : #i100873# seting ENABLE_NSS_MODULE==YES and includeing mozilla-build-1.3 folder in environment 2009-05-29 16:03:23 +0200 jl r272468 : #i100873# use intermediate certificates when validating a certificate 2009-05-29 15:57:16 +0200 jl r272466 : #i100873# use intermediate certificates when validating a certificate 2009-05-29 15:49:58 +0200 jl r272464 : #i100873# using ENABLE_NSS_MODULE 2009-05-29 15:33:14 +0200 jl r272463 : #i100873# using ENABLE_NSS_MODULE 2009-05-29 15:28:39 +0200 jl r272461 : #i100873# build dependency to nss module 2009-05-29 15:24:57 +0200 jl r272460 : #i100873# pass additional certificates into verifyCertificate function 2009-05-29 14:49:40 +0200 jl r272458 : #i100873# new NSS module 2009-05-29 14:43:44 +0200 jl r272457 : #i100873# new NSS module --- configure.in | 47 +++++++++++++++++++++++++++++++ set_soenv.in | 4 ++- solenv/bin/macosx-change-install-names.pl | 8 ++++-- solenv/bin/modules/macosxotoolhelper.pm | 2 +- solenv/config/sdev300.ini | 4 ++- solenv/config/ssolar.cmn | 1 + solenv/inc/tg_ext.mk | 8 +++--- solenv/inc/unitools.mk | 7 +++++ 8 files changed, 71 insertions(+), 10 deletions(-) diff --git a/configure.in b/configure.in index d447e30f2fcf..b66be4e664a3 100644 --- a/configure.in +++ b/configure.in @@ -258,6 +258,9 @@ AC_ARG_WITH(mozilla-toolkit, [ --with-mozilla-toolkit Choose which GUI toolkit to use while building mozilla components. Default: gtk2 ],,) +AC_ARG_ENABLE(nss_module, +[ --disable-nss-module Whether to use provided NSS module +],,enable_nss_module=yes) AC_ARG_ENABLE(kde, [ --enable-kde Determines whether to use Qt/KDE vclplug on platforms where Qt and KDE are available. @@ -652,6 +655,12 @@ AC_ARG_WITH(directx-home, Usage: --with-directx-home= ],,) +AC_ARG_WITH(mozilla-build, +[ --with-mozilla-build For Windows users, please supply the path to the + mozilla build tools. + + Usage: --with-mozilla-build= +],[MOZILLABUILD=$withval],) AC_ARG_WITH(local-solenv, [ --with-local-solenv If you have solenv in a location other than ./solenv, please supply the path here. @@ -4071,6 +4080,7 @@ AC_MSG_CHECKING([whether to enable build of Mozilla/Mozilla NSS-using components if test "$enable_mozilla" = "no"; then AC_MSG_RESULT([no]) WITH_MOZILLA=NO + ENABLE_NSS_MODULE=NO else AC_MSG_RESULT([yes]) WITH_MOZILLA=YES @@ -4140,6 +4150,8 @@ AC_MSG_CHECKING([which mozilla to use]) if test -n "$with_system_mozilla" && test "$with_system_mozilla" != "no"; then AC_MSG_RESULT([external]) SYSTEM_MOZILLA=YES + ENABLE_NSS_MODULE=NO + enable_nss_module=no AC_MSG_CHECKING([which Mozilla flavour to use]) if test -n "$with_system_mozilla" && test "$with_system_mozilla" = "libxul"; then MOZ_FLAVOUR=libxul @@ -4226,6 +4238,8 @@ Please recompile $tmp with --enable-ldap or use --with-openldap.]) elif test "$enable_mozilla" = "no"; then AC_MSG_RESULT([none]) WITH_MOZILLA=NO + ENABLE_NSS_MODULE=NO + enable_nss_module=no else AC_MSG_RESULT([internal]) SYSTEM_MOZILLA=NO @@ -4281,6 +4295,37 @@ else AC_MSG_RESULT([no]) fi +AC_MSG_CHECKING([whether to build provided NSS module]) +if test "$enable_nss_module" != "no"; then + ENABLE_NSS_MODULE="YES" + BUILD_TYPE="$BUILD_TYPE NSS" + AC_MSG_RESULT([yes]) + if test "$_os" = "WINNT"; then + AC_MSG_CHECKING([for Mozilla build tooling]) + if test -z "$MOZILLABUILD" ; then +AC_MSG_ERROR([Mozilla build tooling not found. Use --with-mozilla-build=]) + else + if test \( "$WITH_MINGWIN" = "yes" \) ; then + if test ! -d "$MOZILLABUILD" ; then +AC_MSG_ERROR([Mozilla build tooling incomplete!]) + else + AC_MSG_RESULT([ok]) + fi + else + if test ! -d "$MOZILLABUILD/moztools" \ + -o ! -d "$MOZILLABUILD/msys" ; then +AC_MSG_ERROR([Mozilla build tooling incomplete!]) + else + AC_MSG_RESULT([ok]) + fi + fi + fi + fi +else + ENABLE_NSS_MODULE="NO" + AC_MSG_RESULT([no]) +fi + if test "$BUILD_MOZAB" = "TRUE"; then if test "$_os" = "WINNT"; then if test "$WITH_MINGWIN" != "yes"; then @@ -4359,6 +4404,8 @@ fi AC_SUBST(BUILD_MOZAB) fi +AC_SUBST(ENABLE_NSS_MODULE) +AC_SUBST(MOZILLABUILD) AC_SUBST(SYSTEM_MOZILLA) AC_SUBST(MOZ_FLAVOUR) AC_SUBST(MOZ_INC) diff --git a/set_soenv.in b/set_soenv.in index 39f4db5eb023..4fae3c17255d 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -88,7 +88,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $SHELL, $COMP_ENV, $ILIB, $JAVAHOME, $PSDK_HOME, $DIRECTXSDK_LIB, $USE_NEW_SDK, $FRAME_HOME, $USE_DIRECTX5, $ATL_LIB, $ATL_INCLUDE, $MFC_LIB, $MFC_INCLUDE, $NO_HIDS, $TMPDIR, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS, - $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB, + $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB, $MOZILLABUILD, $PROEXT, $SYSTEM_PYTHON, $PYTHONPATH, $SYSTEM_MOZILLA, $EPM_FLAGS); # @@ -1646,6 +1646,8 @@ ToFile( "BUILD_MOZAB", "@BUILD_MOZAB@", "e" ); ToFile( "PREBUILD_MOZAB", $PREBUILD_MOZAB, "e" ); ToFile( "MOZILLA_VERSION", $MOZILLA_VERSION, "e" ); ToFile( "DEFAULT_MOZILLA_TOOLKIT", $MOZILLA_TOOLKIT, "e" ); +ToFile( "ENABLE_NSS_MODULE", "@ENABLE_NSS_MODULE@", "e" ); +ToFile( "MOZILLABUILD", "@MOZILLABUILD@", "e" ); ToFile( "BUILD_VER_STRING", "@BUILD_VER_STRING@", "e" ); ToFile( "ENABLE_VBA", "@ENABLE_VBA@", "e" ); ToFile( "VBA_EXTENSION", "@VBA_EXTENSION@", "e" ); diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl index fcda2621abc5..5e7064631ec0 100644 --- a/solenv/bin/macosx-change-install-names.pl +++ b/solenv/bin/macosx-change-install-names.pl @@ -61,16 +61,18 @@ if ($type eq "extshl") { $type = "shl"; my $change = ""; + my %inames; foreach $file (@ARGV) { - otoolD($file) =~ m'^(.*?([^/]+))\n$' or + my $iname = otoolD($file); + (defined $iname ? $iname : $file . "\n") =~ m'^(.*?([^/]+))\n$' or die "unexpected otool -D output"; $change .= " -change $1 " . action($type, $loc, $loc) . "/$2"; - $iname{$file} = $2; + $inames{$file} = $2; } foreach $file (@ARGV) { - my $call = "install_name_tool$change -id \@__________________________________________________$loc/$iname{$file} $file"; + my $call = "install_name_tool$change -id \@__________________________________________________$loc/$inames{$file} $file"; system($call) == 0 or die "cannot $call"; } } diff --git a/solenv/bin/modules/macosxotoolhelper.pm b/solenv/bin/modules/macosxotoolhelper.pm index 9c787f372dc0..c8d30c52e473 100644 --- a/solenv/bin/modules/macosxotoolhelper.pm +++ b/solenv/bin/modules/macosxotoolhelper.pm @@ -41,7 +41,7 @@ sub otoolD($) { my $line = ; $line =~ /^$file:\n$/ or die "unexpected otool -D output (\"$line\", expecting \"$file:\")"; - $line = or die "unexpected otool -D output"; + $line = ; == undef or die "unexpected otool -D output"; close(IN); return $line; diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index 133646e53bed..f12d91bfd699 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -13,7 +13,7 @@ common BMP_WRITES_FLAG TRUE BTARGET 1 BUILD_SPECIAL TRUE - BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX L10N + BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N common_build TRUE COMMON_OUTDIR common CONFIG_PROJECT config_office @@ -28,6 +28,7 @@ common ENABLE_GTK TRUE ENABLE_MEDIAWIKI YES ENABLE_MINIMIZER YES + ENABLE_NSS_MODULE YES ENABLE_RANDR TRUE ENABLE_REPORTBUILDER YES ENABLE_SVCTAGS YES @@ -3544,6 +3545,7 @@ wntmsci12 GUIBASE WIN GVER NT351 INPATH wntmsci12%PROEXT% + MOZILLABUILD %SOLARROOT%/mozilla-build-1.3 OS WNT OUTPATH wntmsci12 PACKMS %SO_PACK%$/wntmsci12$/MS diff --git a/solenv/config/ssolar.cmn b/solenv/config/ssolar.cmn index aa1442cc649d..2e7e8fb12c79 100644 --- a/solenv/config/ssolar.cmn +++ b/solenv/config/ssolar.cmn @@ -84,6 +84,7 @@ common ENABLE_KDE ENABLE_MEDIAWIKI ENABLE_MINIMIZER + ENABLE_NSS_MODULE ENABLE_PASF ENABLE_RANDR ENABLE_REPORTBUILDER diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk index 058dfadcc608..ced838d44000 100644 --- a/solenv/inc/tg_ext.mk +++ b/solenv/inc/tg_ext.mk @@ -134,13 +134,13 @@ $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.Z $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.gz @-$(RM) $@ - @noop $(assign UNPACKCMD := gzip -d -c $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).tar.gz $(TARFILE_FILTER) | $(TAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ) + @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).tar.gz) $(TARFILE_FILTER) | $(TAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ) @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH) @$(RENAME) $@.$(INPATH) $@ $(MISC)$/%.unpack : $(PRJ)$/download$/%.tgz @-$(RM) $@ - @noop $(assign UNPACKCMD := gzip -d -c $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).tgz $(TARFILE_FILTER) | $(TAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ) + @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).tgz) $(TARFILE_FILTER) | $(TAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ) @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH) @$(RENAME) $@.$(INPATH) $@ @@ -171,7 +171,7 @@ $(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE) : $(PRJ)$/$(ROUT)$/misc$/$(TARFILE_NAME).unpa $(IFEXIST) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR) $(THEN) $(RENAME:s/+//) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)_removeme $(FI) -rm -rf $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)_removeme @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir) - cd $(PACKAGE_DIR)$(fake_root_dir) && ( $(shell @$(TYPE) $(PRJ)$/$(ROUT)$/misc$/$(TARFILE_NAME).unpack)) && $(TOUCH) $(UNTAR_FLAG_FILE) + cd $(PACKAGE_DIR)$(fake_root_dir) && ( $(shell $(TYPE) $(PRJ)$/$(ROUT)$/misc$/$(TARFILE_NAME).unpack)) && $(TOUCH) $(UNTAR_FLAG_FILE) @echo make writeable... .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" @cd $(PACKAGE_DIR) && chmod -R +rw $(TARFILE_ROOTDIR) && $(TOUCH) $(UNTAR_FLAG_FILE) @@ -293,7 +293,7 @@ $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE) @-$(MKDIR) $(foreach,i,$(OUTDIR2INC) $(INCCOM)$/$(i:b)) @echo copied $(foreach,i,$(OUTDIR2INC) $(shell @$(COPY) $(COPYRECURSE) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$i$/* $(INCCOM)$/$(i:b) >& $(NULLDEV) && echo $i)) .ELSE # "$(USE_SHELL)"=="4nt" - $(COPY) $(COPYRECURSE) $(foreach,i,$(OUTDIR2INC) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$i) $(INCCOM) + $(COPY) $(DEREFERENCE) $(COPYRECURSE) $(foreach,i,$(OUTDIR2INC) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$i) $(INCCOM) .ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(OUTDIR2INC)"!="" .IF "$(OUT2BIN)"!="" diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk index 052e4c7d61de..1a684330aa54 100644 --- a/solenv/inc/unitools.mk +++ b/solenv/inc/unitools.mk @@ -128,6 +128,7 @@ CDD=cd # expect cygwin tools to exist COPY*=cp COPYRECURSE=-r +DEREFERENCE=-L COPYUPDATE=-u ECHON=echo -n ECHONL=echo @@ -179,16 +180,22 @@ PERL*=perl TYPE=cat CDD=cd COPY=cp -f +.IF "$(OS)"=="MACOSX" +COPYRECURSE=-R +.ELSE #"$(OS)"=="MACOSX" COPYRECURSE=-r +.ENDIF .IF "$(OS)"=="SOLARIS" AWK*=nawk GNUCOPY*=gnucp GNUPATCH*=gnupatch GNUTAR*=gtar +DEREFERENCE= .ELSE # "$(OS)"=="SOLARIS" AWK*=awk GNUCOPY*=cp GNUPATCH*=patch +DEREFERENCE=-L .ENDIF # "$(OS)"=="SOLARIS" .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" GNUMAKE*=make -- cgit From fc1c052f33367a685a86958d4f51513579a432dd Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Wed, 26 Aug 2009 10:09:17 +0000 Subject: CWS-TOOLING: integrate CWS dba32e 2009-08-10 13:16:25 +0200 fs r274805 : #i84390# typo corrected 2009-08-10 13:04:28 +0200 fs r274804 : #i103741# properly terminate the last token in a string with a 0 byte 2009-07-24 08:54:05 +0200 msc r274286 : #103219# changed long name 2009-07-24 08:42:28 +0200 msc r274285 : #i79649# changed behaviour of the wizard 2009-07-22 14:17:49 +0200 oj r274238 : GrabFocus 2009-07-22 13:38:01 +0200 oj r274232 : #i102934# mixed up 2009-07-22 13:37:16 +0200 oj r274231 : #i102934# mixed up 2009-07-21 12:30:36 +0200 oj r274176 : crash when using distinct 2009-07-21 10:03:44 +0200 oj r274163 : set last char to 0 2009-07-21 09:31:22 +0200 oj r274161 : mediatype corrected 2009-07-20 11:45:33 +0200 fs r274118 : typo in formatting string 2009-07-20 11:40:39 +0200 fs r274117 : removed unused include 2009-07-20 11:40:01 +0200 fs r274116 : class name corrected 2009-07-16 13:41:45 +0200 oj r274046 : i101587 wrong check for embeddeddatabase url in confguration, have to check path 2009-07-16 13:12:05 +0200 tbo r274044 : #i103219# adjust declarion to new hid.lst 2009-07-16 12:43:48 +0200 oj r274041 : #i102497# check also fot longvarchar 2009-07-16 12:15:41 +0200 oj r274039 : #i103030# handle type description and exceptions as well 2009-07-16 11:14:26 +0200 fs r274035 : let SVN ignore output paths 2009-07-16 09:23:43 +0200 fs r274030 : TransforFormComponentProperties: no need to check for attribute equality 2009-07-10 14:16:23 +0200 oj r273892 : CWS-TOOLING: rebase CWS dba32e to trunk@273858 (milestone: DEV300:m52) 2009-07-01 21:41:50 +0200 fs r273614 : #i10000# 2009-07-01 15:01:10 +0200 fs r273589 : Input required doesn't make sense at all in XML form documents 2009-07-01 12:10:31 +0200 fs r273562 : updated 2009-07-01 11:46:12 +0200 fs r273560 : #i103219# add about 100 missing long names 2009-07-01 10:11:41 +0200 fs r273551 : moved from socket/port usage to pipe/name usage, which is more common nowadays 2009-07-01 09:50:03 +0200 fs r273549 : removed obsolete (empty) folder 2009-07-01 09:47:35 +0200 fs r273548 : copied the code for the Accessibility Workbench herein, formerly located in the old CVS repository, at gsl/awb 2009-06-30 10:07:47 +0200 fs r273493 : merging latest changes from CWS dba32d 2009-06-29 20:46:31 +0200 fs r273482 : #i103138# Rectangle conversions 2009-06-29 10:01:13 +0200 fs r273453 : #i103138# refactored the code for positioning/zooming the control Basically, we now allow adjustControlGeometry_throw (formerly known as positionControl_throw and setControlZoom) to take an additional ViewTransformation parameter, describing the transformation to obtain the actual control position/size. Consequently, positionControl itself also allows for a ViewTransformation parameter. This has become necessary since during painting, the device which we created our control for might not necessarily have a proper MapMode set. In this case, if we would use this map mode for calculating the control's position/size, this would lead to wrong results. Note that this problem was introduced by the fix for #i101398#: During the fix, we postponed the control creation to a later time (when it is really needed). At this later time, the MapMode at the device is broken, at the earlier time where we formerly crearted the control (createPrimitive2DSequence), it is not yet broken. Whether or not the MapMode is defined as "broken" might depend on one's point of view, however ... I consider it broken, since: - we need the map mode to obtain the proper zoom level, which is to be forwarded to the control - there are scenarios where the MapMode is *not* set to MAP_PIXEL (in those scenarios, everything works fine), and there are scenarios where it *is* set to MAP_PIXEL (in those the bug 103138 appears). It somehow feels wrong that one cannot rely on the device's map mode this way, but on the other hand one has no possibility to obtain the current zoom by other means. Note that one issue (still to be submitted) is left: In the page pane of a Draw/Impress document, controls have a wrong text size. This is because in this pane, the above-mentioned "broken" map mode is used, which means the controls have a zoom of "1:1" set, which is wrong here. 2009-06-29 09:52:13 +0200 fs r273452 : during #i103138#: belongsToDevice is unused nowadays 2009-06-24 12:40:06 +0200 fs r273329 : #i102888# #i102899# 2009-06-24 12:10:29 +0200 oj r273327 : #i103030# some code changes 2009-06-24 09:44:14 +0200 oj r273311 : #i103030# some code changes 2009-06-24 09:24:42 +0200 oj r273309 : #i103030# add log 2009-06-24 09:03:29 +0200 fs r273308 : if a col's table name is schema.table, properly quote all parts 2009-06-24 08:56:06 +0200 oj r273307 : #i102691# changed string 2009-06-23 13:31:43 +0200 oj r273280 : #i102479# fix date, time and datetime 2009-06-23 12:51:28 +0200 oj r273277 : #i103020# clear old expression when updating to avoid dead pointers in treelist userdata 2009-06-23 12:17:16 +0200 oj r273275 : #i103030# add LogBridge 2009-06-23 11:53:10 +0200 oj r273272 : shawdowed var resolved 2009-06-23 11:48:49 +0200 oj r273270 : #i103030# add :log to uno env if var UNO_ENV_LOG is set 2009-06-23 11:47:47 +0200 oj r273269 : #i103030# add LogBridge 2009-06-23 11:47:11 +0200 oj r273268 : #i103030# add LogBridge 2009-06-23 08:05:08 +0200 oj r273253 : #i102934# add key for collapsing 2009-06-22 13:21:33 +0200 fs r273225 : merging latest changes from CWS dba32d 2009-06-22 13:15:22 +0200 fs r273221 : why restrict to 12 entries? 2009-06-22 08:12:21 +0200 oj r273196 : #i102655# choosen > chosen typo fixed 2009-06-22 08:08:04 +0200 oj r273195 : #i102657# typo fix 2009-06-22 08:06:28 +0200 oj r273194 : #i102934# expanding and collasping of section 2009-06-22 08:05:52 +0200 oj r273193 : #i102930# set focus in treelistbox 2009-06-22 08:04:56 +0200 oj r273192 : #i102929# enable tabstop 2009-06-19 13:18:26 +0200 oj r273157 : remove unused param 2009-06-19 10:07:05 +0200 oj r273149 : CWS-TOOLING: rebase CWS dba32e to trunk@272827 (milestone: DEV300:m50) 2009-06-19 07:32:40 +0200 oj r273146 : merge from dba32d to dba32e 2009-06-19 07:22:56 +0200 oj r273145 : merge from dba32d to dba32e 2009-06-19 07:22:33 +0200 oj r273144 : merge from dba32d to dba32e 2009-06-18 14:09:34 +0200 fs r273116 : merging the latest changes from CWS dba32d (up to revision 273108) herein, which effectively is a rebase to DEV300.m50 2009-06-18 08:50:35 +0200 oj r273098 : #i102894# fix for new line in text 2009-06-18 08:28:48 +0200 oj r273097 : #i102892# check any 2009-06-18 08:21:34 +0200 oj r273096 : check if error is valid 2009-06-16 13:49:28 +0200 fs r273019 : why make a drop down control by default? The form control factory in SVX does this better those days ... 2009-06-10 09:53:20 +0200 oj r272797 : add lic text 2009-06-10 09:48:55 +0200 oj r272796 : test added for i101618 2009-06-09 14:57:39 +0200 oj r272771 : #i101618# access database document only when script container is needed 2009-06-09 12:42:25 +0200 oj r272765 : #i102497# check type property 2009-06-09 12:32:49 +0200 oj r272764 : adjust test cases 2009-06-09 12:31:58 +0200 oj r272763 : adjust test cases 2009-06-09 12:31:22 +0200 oj r272762 : adjust test cases 2009-06-09 11:35:42 +0200 oj r272761 : check if error is valid 2009-06-09 11:29:42 +0200 oj r272760 : #i102497# longvarchar was missing 2009-06-08 14:52:49 +0200 fs r272733 : #i102564# when setting a new field, also set m_nFieldType 2009-06-08 13:51:20 +0200 oj r272730 : add tests 2009-06-05 14:38:01 +0200 oj r272686 : add dep 2009-06-05 14:35:00 +0200 oj r272684 : add new tests 2009-06-05 13:41:18 +0200 oj r272681 : code clean ups 2009-06-05 12:40:51 +0200 oj r272678 : code cleanup 2009-06-05 12:02:57 +0200 oj r272677 : code cleanup 2009-06-05 10:42:38 +0200 oj r272670 : #i49320# impl export of single rows and as RTF and HTML 2009-06-03 14:30:37 +0200 oj r272576 : #i79649# check if file matches filter wildcard 2009-06-03 13:41:57 +0200 oj r272560 : #i102470# impl not b like 'c' --- scp2/source/ooo/ure.scp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 61887e197530..6313fdd188b9 100755 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -410,6 +410,13 @@ File gid_File_Dl_AffineUnoUno // CompID = "CF542EC3-7A51-4EAA-8480-65D5E8906D05"; End +File gid_File_Dl_LogUnoUno + TXT_FILE_BODY; + Dir = SCP2_URE_DL_DIR; + Name = SCP2_URE_DL_NORMAL("log_uno_uno"); + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); +End + #if defined WNT && defined _MSC File gid_File_Dl_Cli_Uno TXT_FILE_BODY; @@ -1147,6 +1154,7 @@ Module gid_Module_Root_Ure_Hidden gid_File_Dl_UrpUno, gid_File_Dl_UnsafeUnoUno, gid_File_Dl_AffineUnoUno, + gid_File_Dl_LogUnoUno, gid_File_Dl_Jpipe, gid_File_Dl_Juh, gid_File_Dl_Juhx, -- cgit From 99e6c346064861f49c0ef1da24fe652fc5da2618 Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Wed, 26 Aug 2009 13:41:26 +0000 Subject: #i10000# Buildtype GRAPHITE added --- solenv/config/sdev300.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index f12d91bfd699..44cc5793c309 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -13,7 +13,7 @@ common BMP_WRITES_FLAG TRUE BTARGET 1 BUILD_SPECIAL TRUE - BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N + BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE common_build TRUE COMMON_OUTDIR common CONFIG_PROJECT config_office -- cgit From 8990690b587ab95de007ef709f4503e768089955 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Wed, 26 Aug 2009 14:24:27 +0000 Subject: CWS-TOOLING: integrate CWS mh132 2009-08-06 12:20:52 +0200 mh r274712 : corrected error handling 2009-08-05 13:41:20 +0200 mh r274661 : #i93040# NetBSD compile issue 2009-08-05 13:40:32 +0200 mh r274660 : #i93040# NetBSD compile issue 2009-08-05 13:38:46 +0200 mh r274659 : #i93040# NetBSD compile issue 2009-08-05 13:29:15 +0200 mh r274658 : #i95193# increase includes limit 2009-08-05 13:22:07 +0200 mh r274657 : #i96811# honor return values of read calls 2009-08-05 13:16:47 +0200 mh r274654 : #i96802# honor return values of write calls 2009-08-05 13:07:06 +0200 mh r274653 : #i99835# do DestroyData 2009-08-05 13:01:42 +0200 mh r274651 : #i68557#: allow more dpi resolutions in scanner dialogue 2009-07-24 14:46:04 +0200 mh r274307 : #i103770# missing fclose added --- soltools/cpp/_tokens.c | 10 +++++++--- soltools/cpp/cpp.h | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/soltools/cpp/_tokens.c b/soltools/cpp/_tokens.c index 77c8bb4384ec..863de2fbef02 100644 --- a/soltools/cpp/_tokens.c +++ b/soltools/cpp/_tokens.c @@ -473,11 +473,13 @@ void if (wbp >= &wbuf[OBS]) { - write(1, wbuf, OBS); + if ( write(1, wbuf, OBS) != -1 ) { if (wbp > &wbuf[OBS]) memcpy(wbuf, wbuf + OBS, wbp - &wbuf[OBS]); wbp -= OBS; } + else exit(1); + } } trp->tp = tp; if (cursource->fd == 0) @@ -489,8 +491,10 @@ void { if (wbp > wbuf) { - write(1, wbuf, wbp - wbuf); - wbp = wbuf; + if ( write(1, wbuf, wbp - wbuf) != -1) + wbp = wbuf; + else + exit(1); } } diff --git a/soltools/cpp/cpp.h b/soltools/cpp/cpp.h index df3070169aa6..da609dbe53c1 100644 --- a/soltools/cpp/cpp.h +++ b/soltools/cpp/cpp.h @@ -3,7 +3,7 @@ #define INS 32768 /* input buffer */ #define OBS 8092 /* outbut buffer */ #define NARG 32 /* Max number arguments to a macro */ -#define NINCLUDE 32 /* Max number of include directories (-I) */ +#define NINCLUDE 48 /* Max number of include directories (-I) */ #define NIF 64 /* depth of nesting of #if */ #define NINC 32 /* depth of nesting of #include */ -- cgit From 8cc653f0612455b9f2730a31ecb7ad001ec05b29 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Thu, 27 Aug 2009 01:14:49 +0000 Subject: CWS-TOOLING: integrate CWS gpc100 2009-08-07 20:21:15 +0200 ka r274784 : CWS-TOOLING: rebase CWS gpc100 to trunk@274622 (milestone: DEV300:m54) 2009-08-07 14:11:35 +0200 ka r274764 : #i75026#: removal of GPC dependency --- configure | 53 ----------------------------------------------------- configure.in | 38 -------------------------------------- set_soenv.in | 1 - solenv/inc/libs.mk | 6 ------ 4 files changed, 98 deletions(-) diff --git a/configure b/configure index 28516ec77d9c..cf1558b367d4 100755 --- a/configure +++ b/configure @@ -722,7 +722,6 @@ GCONF_CFLAGS ENABLE_KDE4 ENABLE_KDE ENABLE_GTK -WITH_GPC ZIP_HOME UNZIP ZIP @@ -1030,7 +1029,6 @@ enable_option_checking with_gnu_patch with_agg with_gnu_cp -with_gpc enable_graphite with_system_graphite enable_ldap @@ -2030,9 +2028,6 @@ Optional Packages: --with-gnu-cp Specify location of GNU cp on Solaris or FreeBSD - --without-gpc Use the internal polygon clipping code instead of - the external GPC polygon clipping library. - --with-system-graphite use graphite library already installed on system --with-openldap Enables the use of the OpenLDAP LDAP SDK instead @@ -2873,14 +2868,6 @@ if test "${with_gnu_cp+set}" = set; then withval=$with_gnu_cp; fi - -# Check whether --with-gpc was given. -if test "${with_gpc+set}" = set; then - withval=$with_gpc; -else - if test ! -e ./external/gpc/gpc.c && test ! -e ./external/gpc/gpc.h; then without_gpc=yes; fi -fi - # Check whether --enable-graphite was given. if test "${enable_graphite+set}" = set; then enableval=$enable_graphite; @@ -25227,46 +25214,6 @@ $as_echo "found and copied" >&6; } fi fi -{ $as_echo "$as_me:$LINENO: checking which polygon clipping code to use" >&5 -$as_echo_n "checking which polygon clipping code to use... " >&6; } -WITH_GPC=NO - -if test "$with_gpc" != "no" && test "$without_gpc" != "yes"; then - WITH_GPC=YES - { $as_echo "$as_me:$LINENO: result: GPC" >&5 -$as_echo "GPC" >&6; } - - { $as_echo "$as_me:$LINENO: checking for GPC files" >&5 -$as_echo_n "checking for GPC files... " >&6; } - if test -f ./external/gpc/gpc.h; then - HAVE_GPC_H="yes" - else - HAVE_GPC_H="no" - fi - if test -f ./external/gpc/gpc.c; then - HAVE_GPC_C="yes" - else - HAVE_GPC_C="no" - fi - - if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then - { $as_echo "$as_me:$LINENO: result: GPC files found" >&5 -$as_echo "GPC files found" >&6; } - else - { { $as_echo "$as_me:$LINENO: error: GPC files not found -ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z and untar in external/gpc, -or use basegfx' implementation using --without-gpc" >&5 -$as_echo "$as_me: error: GPC files not found -ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z and untar in external/gpc, -or use basegfx' implementation using --without-gpc" >&2;} - { (exit 1); exit 1; }; } - fi -else - { $as_echo "$as_me:$LINENO: result: internal" >&5 -$as_echo "internal" >&6; } -fi - - { $as_echo "$as_me:$LINENO: checking which VCLplugs shall be built" >&5 $as_echo_n "checking which VCLplugs shall be built... " >&6; } ENABLE_GTK="" diff --git a/configure.in b/configure.in index b66be4e664a3..8ebcc3dc4a97 100644 --- a/configure.in +++ b/configure.in @@ -25,10 +25,6 @@ AC_ARG_WITH(agg, AC_ARG_WITH(gnu-cp, [ --with-gnu-cp Specify location of GNU cp on Solaris or FreeBSD ],,) -AC_ARG_WITH(gpc, -[ --without-gpc Use the internal polygon clipping code instead of - the external GPC polygon clipping library. -],,if test ! -e ./external/gpc/gpc.c && test ! -e ./external/gpc/gpc.h; then without_gpc=yes; fi) AC_ARG_ENABLE(graphite, [ --enable-graphite Enables the compilation of Graphite smart font rendering ],,) @@ -5364,40 +5360,6 @@ As the automatic detection fails please copy the files to external/msi/.]) fi fi -dnl =================================================================== -dnl Test for the presence of the right polygon clipping code -dnl =================================================================== -AC_MSG_CHECKING([which polygon clipping code to use]) -WITH_GPC=NO - -if test "$with_gpc" != "no" && test "$without_gpc" != "yes"; then - WITH_GPC=YES - AC_MSG_RESULT([GPC]) - - AC_MSG_CHECKING([for GPC files]) - if test -f ./external/gpc/gpc.h; then - HAVE_GPC_H="yes" - else - HAVE_GPC_H="no" - fi - if test -f ./external/gpc/gpc.c; then - HAVE_GPC_C="yes" - else - HAVE_GPC_C="no" - fi - - if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then - AC_MSG_RESULT([GPC files found]) - else - AC_MSG_ERROR([GPC files not found -ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z and untar in external/gpc, -or use basegfx' implementation using --without-gpc]) - fi -else - AC_MSG_RESULT([internal]) -fi -AC_SUBST(WITH_GPC) - dnl =================================================================== dnl Test which vclplugs have to be built. dnl =================================================================== diff --git a/set_soenv.in b/set_soenv.in index 4fae3c17255d..ed9603d9f13f 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -1828,7 +1828,6 @@ ToFile( "SYSTEM_GRAPHITE", "@SYSTEM_GRAPHITE@", "e"); ToFile( "GRAPHITE_LIBS", "@GRAPHITE_LIBS@", "e"); ToFile( "GRAPHITE_CFLAGS", "@GRAPHITE_CFLAGS@", "e"); ToFile( "VC_STANDARD", "@VC_STANDARD@", "e" ); -ToFile( "WITH_GPC", "@WITH_GPC@", "e" ); ToFile( "WITH_MYSPELL_DICTS","@WITH_MYSPELL_DICTS@","e"); ToFile( "SYSTEM_DICTS", "@SYSTEM_DICTS@", "e"); ToFile( "DICT_SYSTEM_DIR", "@DICT_SYSTEM_DIR@", "e"); diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index a0a318230255..1ae4eeb9d11d 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -57,9 +57,6 @@ I18NUTILLIB=-li18nutil$(COMID) .INCLUDE .IGNORE : i18npool$/version.mk I18NISOLANGLIB=-li18nisolang$(ISOLANG_MAJOR)$(COMID) I18NPAPERLIB=-li18npaper$(DLLPOSTFIX) -.IF "$(WITH_GPC)"!="NO" -GPC3RDLIB=-lgpc -.ENDIF .IF "$(GUI)$(COM)"=="WNTGCC" SALHELPERLIB=-lsalhelper$(UDK_MAJOR)$(COMID) .ELSE # "$(GUI)$(COM)"=="WNTGCC" @@ -357,9 +354,6 @@ ICUDATALIB=icudata.lib I18NUTILLIB=ii18nutil.lib I18NISOLANGLIB=ii18nisolang.lib I18NPAPERLIB=ii18npaper.lib -.IF "$(WITH_GPC)"!="NO" -GPC3RDLIB=gpc.lib -.ENDIF SALHELPERLIB=isalhelper.lib XMLSCRIPTLIB=ixcr.lib COMPHELPERLIB=icomphelp.lib -- cgit From 83b60ac3bfadac89db189b8ebf7075e8a1a118af Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Thu, 27 Aug 2009 14:46:36 +0000 Subject: CWS-TOOLING: integrate CWS hr64_DEV300 2009-07-21 13:24:57 +0200 hr r274189 : #i99576#: re-enable optimization for tabcont.cxx 2009-07-21 13:17:18 +0200 hr r274188 : #i99592: disable -xspace optimization for Solaris x86 and SunStudio 12, due to some mis-optimzation in sc and elsewhere. SunStudio 12 update 1 is OK, but needs a few unrelated changes which will be implemented in DEV300 code line --- solenv/inc/unxsoli4.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk index 4567453f29d0..979a2c82671f 100644 --- a/solenv/inc/unxsoli4.mk +++ b/solenv/inc/unxsoli4.mk @@ -72,7 +72,7 @@ CFLAGSSLOCUIMT=-KPIC -mt CFLAGSPROF=-xpg CFLAGSDEBUG=-g CFLAGSDBGUTIL= -CFLAGSOPT=-xarch=generic -xO3 -xspace +CFLAGSOPT=-xarch=generic -xO3 CFLAGSNOOPT= CFLAGSOUTOBJ=-o -- cgit From 9d33939ae08887bca80fb7a11a7104b227ad3573 Mon Sep 17 00:00:00 2001 From: Release Engineers Date: Thu, 27 Aug 2009 14:47:51 +0000 Subject: CWS-TOOLING: integrate CWS hr65 2009-08-26 Jens-Heiner Rechtien #i104521#: implement 'setcurrent'; document --hg option to 'create' 2009-08-26 Jens-Heiner Rechtien #i104521#: SOAP method setSCMName() doesn't return a value 2009-08-26 Jens-Heiner Rechtien #i104521#: implement [set|get]_scm() 2009-08-26 Jens-Heiner Rechtien #i104521#: implement --hg switch to 'cws create' --- solenv/bin/cws.pl | 140 +++++++++++++++++++++++++++++++--------------- solenv/bin/modules/Cws.pm | 53 ++++++++++++++++++ 2 files changed, 149 insertions(+), 44 deletions(-) diff --git a/solenv/bin/cws.pl b/solenv/bin/cws.pl index 288b908ea7fe..ce6eaa015a91 100644 --- a/solenv/bin/cws.pl +++ b/solenv/bin/cws.pl @@ -69,22 +69,24 @@ my @valid_commands = ( 'task', 't', 'integrate', 'cdiff', 'cd', - 'eisclone' + 'eisclone', + 'setcurrent' ); # list the valid options to each command my %valid_options_hash = ( - 'help' => ['help'], - 'create' => ['help', 'milestone', 'migration'], - 'fetch' => ['help', 'switch', 'milestone', 'childworkspace','platforms','quiet', + 'help' => ['help'], + 'create' => ['help', 'milestone', 'migration', 'hg'], + 'fetch' => ['help', 'switch', 'milestone', 'childworkspace','platforms','quiet', 'onlysolver'], - 'rebase' => ['help', 'milestone','commit'], - 'analyze' => ['help'], - 'query' => ['help', 'milestone','masterworkspace','childworkspace'], - 'task' => ['help'], - 'integrate' => ['help', 'childworkspace'], - 'cdiff' => ['help', 'childworkspace', 'masterworkspace', 'files', 'modules'], - 'eisclone' => ['help'] + 'rebase' => ['help', 'milestone','commit'], + 'analyze' => ['help'], + 'query' => ['help', 'milestone','masterworkspace','childworkspace'], + 'task' => ['help'], + 'integrate' => ['help', 'childworkspace'], + 'cdiff' => ['help', 'childworkspace', 'masterworkspace', 'files', 'modules'], + 'setcurrent' => ['help', 'milestone'], + 'eisclone' => ['help'] ); my %valid_commands_hash; @@ -115,6 +117,7 @@ sub parse_command_line Getopt::Long::Configure ("no_auto_abbrev", "no_ignorecase"); my $success = GetOptions(\%options_hash, 'milestone|m=s', 'masterworkspace|master|M=s', + 'hg', 'migration', 'childworkspace|child|c=s', 'debug', @@ -365,6 +368,7 @@ sub get_cws_by_name sub register_child_workspace { my $cws = shift; + my $scm = shift; my $is_promotion = shift; my $milestone = $cws->milestone(); @@ -387,9 +391,9 @@ sub register_child_workspace } if ( $is_promotion ) { - my $rc = $cws->set_subversion_flag(1); + my $rc = $cws->set_scm($scm); if ( !$rc ) { - print_error("Failed to set subversion flag on child workspace '$child'.\nContact EIS administrator!\n", 12); + print_error("Failed to set the SCM property '$scm' on child workspace '$child'.\nContact EIS administrator!\n", 12); } $rc = $cws->promote($vcsid, ""); @@ -410,9 +414,9 @@ sub register_child_workspace print_error("Failed to register child workspace '$child' for master '$master'.", 12); } else { - my $rc = $cws->set_subversion_flag(1); + my $rc = $cws->set_scm($scm); if ( !$rc ) { - print_error("Failed to set subversion flag on child workspace '$child'.\nContact EIS administrator!\n", 12); + print_error("Failed to set the SCM property '$scm' on child workspace '$child'.\nContact EIS administrator!\n", 12); } print "\n***** Successfully ***** registered child workspace '$child'\n"; print "for master workspace '$master' (milestone '$milestone').\n"; @@ -435,7 +439,7 @@ sub query_cws print_error("Can't determine master workspace environment.\n", 30); } - if ( ($query_mode eq 'integratedinto' || $query_mode eq 'incompatible' || $query_mode eq 'taskids' || $query_mode eq 'state' || $query_mode eq 'current' || $query_mode eq 'owner' || $query_mode eq 'qarep' || $query_mode eq 'issubversion' || $query_mode eq 'ispublic' || $query_mode eq 'build') && !defined($childws) ) { + if ( ($query_mode eq 'integratedinto' || $query_mode eq 'incompatible' || $query_mode eq 'taskids' || $query_mode eq 'status' || $query_mode eq 'current' || $query_mode eq 'owner' || $query_mode eq 'qarep' || $query_mode eq 'issubversion' || $query_mode eq 'ispublic' || $query_mode eq 'build') && !defined($childws) ) { print_error("Can't determine child workspace environment.\n", 30); } @@ -512,31 +516,21 @@ sub query_status return; } -sub query_vcs +sub query_scm { my $cws = shift; my $masterws = $cws->master(); my $childws = $cws->child(); if ( is_valid_cws($cws) ) { - my $issvn = $cws->get_subversion_flag(); - if ( !defined($issvn) ) { - print_error("Internal error: can't get isSubVersion flag.", 3); + my $scm = $cws->get_scm(); + if ( !defined($scm) ) { + print_error("Internal error: can't retrieve scm info.", 3); } else { - if ( $issvn==1 ) { - print_message("Child workspace uses SubVersion"); - } else { - print_message("Child workspace uses CVS"); - } + print_message("Child workspace uses '$scm'."); } } - # check if we got a valid child workspace - my $id = $cws->eis_id(); - if ( !$id ) { - print_error("Child workspace '$childws' for master workspace '$masterws' not found in EIS database.", 2); - } - return; } @@ -559,12 +553,6 @@ sub query_ispublic } } - # check if we got a valid child workspace - my $id = $cws->eis_id(); - if ( !$id ) { - print_error("Child workspace '$childws' for master workspace '$masterws' not found in EIS database.", 2); - } - return; } @@ -1248,6 +1236,7 @@ sub do_help print STDERR "\tquery (q)\n"; print STDERR "\ttask (t)\n"; print STDERR "\tcdiff (cd)\n"; + print STDERR "\tsetcurrent\n"; print STDERR "\tintegrate *** release engineers only ***\n"; print STDERR "\teisclone *** release engineers only ***\n"; } @@ -1260,10 +1249,11 @@ sub do_help } elsif ($arg eq 'create') { print STDERR "create: Create a new child workspace\n"; - print STDERR "usage: create [-m milestone] \n"; + print STDERR "usage: create [--hg] [-m milestone] \n"; print STDERR "\t-m milestone: Milestone to base the child workspace on. If ommitted the\n"; print STDERR "\t last published milestone will be used.\n"; print STDERR "\t--milestone milestone: Same as -m milestone.\n"; + print STDERR "\t--hg: Create Mercurial (hg) based CWS.\n"; print STDERR "\t--migration: Used only for the migration of an exitisting CWS from CVS to SVN.\n"; print STDERR "\t Disables existence check in EIS, creates CWS branch in SVN, sets SVN flag.\n"; } @@ -1274,7 +1264,7 @@ sub do_help elsif ($arg eq 'query') { print STDERR "query: Query child workspace for miscellaneous information\n"; print STDERR "usage: query [-M master] [-c child] \n"; - print STDERR " query [-M master] [-c child] \n"; + print STDERR " query [-M master] [-c child] \n"; print STDERR " query [-M master] \n"; print STDERR " query \n"; print STDERR " query [-M master] [-m milestone] \n"; @@ -1308,7 +1298,7 @@ sub do_help print STDERR "\tnominated\tquery nominated CWSs\n"; print STDERR "\tready\t\tquery CWSs ready for QA\n"; print STDERR "\tispublic\tquery public flag of CWS\n"; - print STDERR "\tvcs\t\tquery Version Control System used for CWS (either CVS or SubVersion)\n"; + print STDERR "\tscm\t\tquery Source Control Management (SCM) system used for CWS\n"; print STDERR "\tmasters\t\tquery available MWS\n"; print STDERR "\tmilestones\tquery which milestones are know on the given MWS\n"; print STDERR "\tispublicmaster\tquery public flag of MWS\n"; @@ -1367,6 +1357,14 @@ sub do_help print STDERR "\t--files: Print only file names\n"; print STDERR "\t--modules: Print only top level directories aka modules\n" } + elsif ($arg eq 'setcurrent') { + print STDERR "setcurrent: Set the current milestone for the CWS (only hg based CWSs)\n"; + print STDERR "usage: setcurrent [-m milestone]\n"; + print STDERR "\t-m milestone: Set milestone to to workspace \n"; + print STDERR "\t Use 'latest' for the for lastest published milestone on the current master\n"; + print STDERR "\t For cross master change use the form :\n"; + print STDERR "\t--milestone milestone: Same as -m milestone\n"; + } else { print STDERR "'$arg': unknown subcommand\n"; exit(1); @@ -1389,6 +1387,11 @@ sub do_create $is_migration = 1; } + my $is_hg = 0; + if ( exists $options_ref->{'hg'} ) { + $is_hg = 1; + } + my $master = uc $args_ref->[0]; my $cws_name = $args_ref->[1]; @@ -1449,6 +1452,11 @@ sub do_create # set milestone $cws->milestone($milestone); + # handle mercurial(hg) based CWSs + if ( $is_hg ) { + register_child_workspace($cws, 'hg', $is_promotion); + return; + } my $config = CwsConfig->new(); my $ooo_svn_server = $config->get_ooo_svn_server(); @@ -1550,7 +1558,7 @@ sub do_create } } else { - register_child_workspace($cws, $is_promotion); + register_child_workspace($cws, 'svn', $is_promotion); } return; } @@ -1605,7 +1613,7 @@ sub do_rebase print_error("Can't determine latest milestone of '$old_masterws' available for rebase.", 22); } $new_masterws = $old_masterws; - $new_milestone = $cws->get_current_milestone($old_masterws); + $new_milestone = $latest; } else { ($new_masterws, $new_milestone) = verify_milestone($cws, $milestone); @@ -1695,7 +1703,7 @@ sub do_rebase } - print_message("... updating EIS database\n"); + print_message("... updating EIS database"); my $push_return = $cws->set_master_and_milestone($new_masterws, $new_milestone); # sanity check if ( $$push_return[1] ne $new_milestone) { @@ -1987,7 +1995,7 @@ sub do_query my $options_ref = shift; # list of available query modes - my @query_modes = qw(integratedinto incompatible taskids status latest current owner qarep build buildid integrated approved nominated ready new planned release due due_qa help ui milestones masters vcs ispublic ispublicmaster); + my @query_modes = qw(integratedinto incompatible taskids status latest current owner qarep build buildid integrated approved nominated ready new planned release due due_qa help ui milestones masters scm ispublic ispublicmaster); my %query_modes_hash = (); foreach (@query_modes) { $query_modes_hash{$_}++; @@ -2002,6 +2010,10 @@ sub do_query # with CVS etc. 'state' is still an alias for 'status' $mode = 'status' if $mode eq 'state'; + # cwquery mode 'vcs' has been renamed to 'scm' to be more consistent + # with general use etc. 'vcs' is still an alias for 'scm' + $mode = 'scm' if $mode eq 'vcs'; + # there will be more query modes over time if ( !exists $query_modes_hash{$mode} ) { do_help(['query']); @@ -2172,6 +2184,46 @@ sub do_cdiff } +sub do_setcurrent +{ + my $args_ref = shift; + my $options_ref = shift; + + if ( exists $options_ref->{'help'} || @{$args_ref} != 0) { + do_help(['setcurrent']); + } + + if ( !exists $options_ref->{'milestone'} ) { + do_help(['setcurrent']); + } + + my $cws = get_cws_from_environment(); + my $old_masterws = $cws->master(); + my $new_masterws; + my $new_milestone; + + my $milestone = $options_ref->{'milestone'}; + if ( $milestone eq 'latest' ) { + my $latest = $cws->get_current_milestone($old_masterws); + + if ( !$latest ) { + print_error("Can't determine latest milestone of '$old_masterws'.", 22); + } + $new_masterws = $old_masterws; + $new_milestone = $latest; + } + else { + ($new_masterws, $new_milestone) = verify_milestone($cws, $milestone); + } + + print_message("... updating EIS database"); + my $push_return = $cws->set_master_and_milestone($new_masterws, $new_milestone); + # sanity check + if ( $$push_return[1] ne $new_milestone) { + print_error("Couldn't push new milestone '$new_milestone' to database", 0); + } +} + sub do_eisclone { my $args_ref = shift; diff --git a/solenv/bin/modules/Cws.pm b/solenv/bin/modules/Cws.pm index c40a2ceb673f..d5516bd79e66 100755 --- a/solenv/bin/modules/Cws.pm +++ b/solenv/bin/modules/Cws.pm @@ -493,6 +493,19 @@ sub set_subversion_flag { return $self->set_subversion_flag_in_eis($value); } +sub get_scm { + my $self = shift; + + return $self->get_scm_from_eis(); +} + +sub set_scm { + my $self = shift; + my $scm_name = shift; + + return $self->set_scm_in_eis($scm_name); +} + # Check if milestone exists sub is_milestone @@ -1790,6 +1803,46 @@ sub set_subversion_flag_in_eis return $result; } +sub get_scm_from_eis +{ + my $self = shift; + + # check if child workspace is valid + my $id = $self->eis_id(); + if ( !$id ) { + carp("ERROR: Childworkspace not (yet) registered with EIS.\n"); + return undef; + } + + my $eis = Cws::eis(); + my $result; + eval { $result = $eis->getSCMName($id) }; + if ( $@ ) { + carp("ERROR: get_scm_from_eis(): EIS database transaction failed. Reason:\n$@\n"); + } + return $result; +} + +sub set_scm_in_eis +{ + my $self = shift; + my $scm_name = shift; + + # check if child workspace is valid + my $id = $self->eis_id(); + if ( !$id ) { + carp("ERROR: Childworkspace not (yet) registered with EIS.\n"); + return undef; + } + + my $eis = Cws::eis(); + eval { $eis->setSCMName($id, $scm_name) }; + if ( $@ ) { + carp("ERROR: set_scm_in_eis(): EIS database transaction failed. Reason:\n$@\n"); + return 0; + } + return 1; +} sub is_uirelevant_from_eis { -- cgit From 45addfc147e8c947e428ce8343393f7583e954b4 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Thu, 27 Aug 2009 15:29:51 +0000 Subject: CWS-TOOLING: integrate CWS swapfix01_DEV300 2009-08-17 16:40:04 +0200 cl r275061 : #i104146# added patch flag for svx library 2009-08-17 15:48:01 +0200 cl r275059 : #i104146# force swap in of graphic to avoid getting the unique id from the preview graphic --- scp2/source/ooo/file_library_ooo.scp | 1 - 1 file changed, 1 deletion(-) diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index ceb6c8b38e7b..4508d303be7f 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1485,7 +1485,6 @@ SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Svtmisc, svtmisc.uno ) STD_LIB_FILE_PATCH( gid_File_Lib_Svx_Core, svxcore) STD_LIB_FILE_PATCH( gid_File_Lib_Svx_Msfilter, svxmsfilter) STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Svx, svx) - STD_UNO_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs) STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sw , sw) -- cgit From 4f31e241f6e940a294938288664fb9042139f775 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Thu, 27 Aug 2009 15:58:22 +0000 Subject: CWS-TOOLING: integrate CWS sb114_DEV300 2009-08-12 09:02:01 +0200 sb r274880 : #i104149# missing PATCH flag 2009-08-11 16:39:16 +0200 sb r274864 : #i104149# merged in difference between and (which appears to also apply cleanly to the libxml2 2.6.31 source base checked into OOo) --- scp2/source/ooo/ure.scp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 6313fdd188b9..1c260e2d2508 100755 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -839,7 +839,7 @@ File gid_File_Dl_Libxml2 #else Name = SCP2_URE_DL_VER("xml2", "2"); #endif - Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); + Styles = (PACKED, PATCH, VERSION_INDEPENDENT_COMP_ID); // CompID = "BE6FAD97-F84C-43E3-8392-6FE2CDA04D8E"; End #endif -- cgit From d88a461402515a1dc46e8a90e16a7575b0f8fd8f Mon Sep 17 00:00:00 2001 From: Release Engineers Date: Thu, 27 Aug 2009 17:55:43 +0000 Subject: DEV300 --- solenv/inc/minor.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index 3565d94b0cd5..8ba46f8c5357 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ RSCVERSION=300 -RSCREVISION=300m56(Build:9419) -BUILD=9419 -LAST_MINOR=m56 +RSCREVISION=300m57(Build:9422) +BUILD=9422 +LAST_MINOR=m57 SOURCEVERSION=DEV300 -- cgit From f5709591bc81cbdf8f9b5adf512e457b9144cd40 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Fri, 28 Aug 2009 12:05:11 +0000 Subject: #i10000# regenerated configure --- configure | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 76 insertions(+), 2 deletions(-) diff --git a/configure b/configure index cf1558b367d4..4afd6e3777fe 100755 --- a/configure +++ b/configure @@ -791,6 +791,8 @@ MOZ_LIB MOZ_INC MOZ_FLAVOUR SYSTEM_MOZILLA +MOZILLABUILD +ENABLE_NSS_MODULE BUILD_MOZAB MOZLIBREQ_LIBS MOZLIBREQ_CFLAGS @@ -1078,6 +1080,7 @@ enable_layout enable_build_mozilla with_mozilla_version with_mozilla_toolkit +enable_nss_module enable_kde enable_kdeab enable_kde4 @@ -1169,6 +1172,7 @@ with_nsis_path with_frame_home with_psdk_home with_directx_home +with_mozilla_build with_local_solenv with_local_solver enable_check_only @@ -1954,6 +1958,8 @@ Optional Features: mozilla components from the mozilla source code but take precompiled zips + --disable-nss-module Whether to use provided NSS module + --enable-kde Determines whether to use Qt/KDE vclplug on platforms where Qt and KDE are available. @@ -2294,6 +2300,11 @@ Optional Packages: Usage: --with-directx-home= + --with-mozilla-build For Windows users, please supply the path to the + mozilla build tools. + + Usage: --with-mozilla-build= + --with-local-solenv If you have solenv in a location other than ./solenv, please supply the path here. @@ -3166,6 +3177,13 @@ if test "${with_mozilla_toolkit+set}" = set; then withval=$with_mozilla_toolkit; fi +# Check whether --enable-nss_module was given. +if test "${enable_nss_module+set}" = set; then + enableval=$enable_nss_module; +else + enable_nss_module=yes +fi + # Check whether --enable-kde was given. if test "${enable_kde+set}" = set; then enableval=$enable_kde; @@ -3738,6 +3756,12 @@ if test "${with_directx_home+set}" = set; then fi +# Check whether --with-mozilla-build was given. +if test "${with_mozilla_build+set}" = set; then + withval=$with_mozilla_build; MOZILLABUILD=$withval +fi + + # Check whether --with-local-solenv was given. if test "${with_local_solenv+set}" = set; then withval=$with_local_solenv; @@ -10863,6 +10887,7 @@ $as_echo "no" >&6; } + fi if test "$_os" = "SunOS"; then @@ -11368,8 +11393,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -17226,6 +17250,7 @@ if test "$enable_mozilla" = "no"; then { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } WITH_MOZILLA=NO + ENABLE_NSS_MODULE=NO else { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } @@ -17608,6 +17633,8 @@ if test -n "$with_system_mozilla" && test "$with_system_mozilla" != "no"; then { $as_echo "$as_me:$LINENO: result: external" >&5 $as_echo "external" >&6; } SYSTEM_MOZILLA=YES + ENABLE_NSS_MODULE=NO + enable_nss_module=no { $as_echo "$as_me:$LINENO: checking which Mozilla flavour to use" >&5 $as_echo_n "checking which Mozilla flavour to use... " >&6; } if test -n "$with_system_mozilla" && test "$with_system_mozilla" = "libxul"; then @@ -18366,6 +18393,8 @@ elif test "$enable_mozilla" = "no"; then { $as_echo "$as_me:$LINENO: result: none" >&5 $as_echo "none" >&6; } WITH_MOZILLA=NO + ENABLE_NSS_MODULE=NO + enable_nss_module=no else { $as_echo "$as_me:$LINENO: result: internal" >&5 $as_echo "internal" >&6; } @@ -18431,6 +18460,49 @@ else $as_echo "no" >&6; } fi +{ $as_echo "$as_me:$LINENO: checking whether to build provided NSS module" >&5 +$as_echo_n "checking whether to build provided NSS module... " >&6; } +if test "$enable_nss_module" != "no"; then + ENABLE_NSS_MODULE="YES" + BUILD_TYPE="$BUILD_TYPE NSS" + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + if test "$_os" = "WINNT"; then + { $as_echo "$as_me:$LINENO: checking for Mozilla build tooling" >&5 +$as_echo_n "checking for Mozilla build tooling... " >&6; } + if test -z "$MOZILLABUILD" ; then +{ { $as_echo "$as_me:$LINENO: error: Mozilla build tooling not found. Use --with-mozilla-build=" >&5 +$as_echo "$as_me: error: Mozilla build tooling not found. Use --with-mozilla-build=" >&2;} + { (exit 1); exit 1; }; } + else + if test \( "$WITH_MINGWIN" = "yes" \) ; then + if test ! -d "$MOZILLABUILD" ; then +{ { $as_echo "$as_me:$LINENO: error: Mozilla build tooling incomplete!" >&5 +$as_echo "$as_me: error: Mozilla build tooling incomplete!" >&2;} + { (exit 1); exit 1; }; } + else + { $as_echo "$as_me:$LINENO: result: ok" >&5 +$as_echo "ok" >&6; } + fi + else + if test ! -d "$MOZILLABUILD/moztools" \ + -o ! -d "$MOZILLABUILD/msys" ; then +{ { $as_echo "$as_me:$LINENO: error: Mozilla build tooling incomplete!" >&5 +$as_echo "$as_me: error: Mozilla build tooling incomplete!" >&2;} + { (exit 1); exit 1; }; } + else + { $as_echo "$as_me:$LINENO: result: ok" >&5 +$as_echo "ok" >&6; } + fi + fi + fi + fi +else + ENABLE_NSS_MODULE="NO" + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + if test "$BUILD_MOZAB" = "TRUE"; then if test "$_os" = "WINNT"; then if test "$WITH_MINGWIN" != "yes"; then @@ -19124,6 +19196,8 @@ fi + + { $as_echo "$as_me:$LINENO: checking which sane header to use" >&5 $as_echo_n "checking which sane header to use... " >&6; } if test -n "$with_system_sane_header" -o -n "$with_system_headers" && \ -- cgit From 51a8e2fe0ebcef2b6fea4ecea4896fa1a773a991 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Mon, 31 Aug 2009 08:48:51 +0000 Subject: #i10000# 'deliver' sometimes fails in cases where several platforms simultaneously try to create the same big zip file in solver's 'common.pro' zip directory. --- solenv/bin/deliver.pl | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl index 74ed2020184a..23fe16f2e5e6 100755 --- a/solenv/bin/deliver.pl +++ b/solenv/bin/deliver.pl @@ -1225,7 +1225,19 @@ sub zip_files $work_file =~ s/\.zip$//; $work_file .= (sprintf('.%d-%d', $$, time())) . ".zip"; die "Error: temp file $work_file already exists" if ( -e $work_file); - copy($zip_file, $work_file) if ( -e $zip_file ); + if ( -e $zip_file ) { + if ( -z $zip_file) { + # sometimes there are files of 0 byte size - remove them + unlink $zip_file or print_error("can't remove empty file '$zip_file': $!",0); + } else { + if ( ! copy($zip_file, $work_file)) { + # give a warning, not an error: + # we can zip from scratch instead of just updating the old zip file + print_warning("can't copy'$zip_file' into '$work_file': $!", 0); + unlink $work_file; + } + } + } } else { # No pre processing necessary, working directly on solver. $work_file = $zip_file; @@ -1267,9 +1279,21 @@ sub zip_files } elsif ( $zip_file eq $common_zip_file) { # rename work file back if ( -e $work_file ) { - if (! rename($work_file, $zip_file)) { - print_error("can't rename temporary file to $zip_file: $!",0); - unlink $work_file; + if ( -e $zip_file) { + # do some tricks to be fast. otherwise we may disturb other platforms + # by unlinking a file which just gets copied -> stale file handle. + my $buffer_file=$work_file . '_rm'; + rename($zip_file, $buffer_file) or warn "Warning: can't rename old zip file '$zip_file': $!"; + if (! rename($work_file, $zip_file)) { + print_error("can't rename temporary file to $zip_file: $!",0); + unlink $work_file; + } + unlink $buffer_file; + } else { + if (! rename($work_file, $zip_file)) { + print_error("can't rename temporary file to $zip_file: $!",0); + unlink $work_file; + } } } } -- cgit From 044c31060679f4ed203fc970f4f60141cab526dd Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Mon, 31 Aug 2009 11:32:02 +0000 Subject: #100000#,#160112# MAXPROC missing for cygwin + lucopy --- solenv/config/sdev300.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index 44cc5793c309..1d68384409a7 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -3738,7 +3738,7 @@ wntmsci12 sh { 400: if [ $COPYALL ]; then - 410: perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET + 410: perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC 415: fi 600: umask 002 800: hash -r @@ -3757,7 +3757,7 @@ wntmsci12 } csh { - 400: if ( ${?COPYALL} ) perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET + 400: if ( ${?COPYALL} ) perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR -- cgit From a666eee8da78eddb34ffc967961113f14011466f Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Mon, 31 Aug 2009 15:04:32 +0000 Subject: #i10000#: update unxlngx6 environment --- solenv/config/sdev300.ini | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index 1d68384409a7..d8b87b504010 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -939,7 +939,7 @@ unxlngx6 COPYALL TRUE DEVROOT %SOL_TMP%$/r PCLEAN_PATH %SOLARROOT%/etools - PERL %SOL_TMP%$/r$/bt_linux_libc2.11$/%WORK_STAMP%$/bin$/perl + PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv SOLARROOT %SOL_TMP%$/r SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% @@ -951,7 +951,7 @@ unxlngx6 COPY_PACKED TRUE DEVROOT %SOL_TMP%$/r PCLEAN_PATH %SOLARROOT%/etools - PERL %SOL_TMP%$/r$/bt_linux_libc2.11$/%WORK_STAMP%$/bin$/perl + PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv SOLARROOT %SOL_TMP%$/r SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% @@ -963,7 +963,7 @@ unxlngx6 COPYALL FALSE DEVROOT %SOL_TMP%$/r PCLEAN_PATH %SOL_TMP%$/r/etools - PERL %SOL_TMP%$/r$/bt_linux_libc2.11$/%WORK_STAMP%$/bin$/perl + PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv SOLARROOT %SOL_TMP%$/r SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% @@ -1004,7 +1004,7 @@ unxlngx6 { COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux64_libc3.4.6/ DEVROOT %SOLAR_ENV_ROOT% - PERL %SOLAR_ENV_ROOT%/bt_linux_libc2.11/%WORK_STAMP%/bin/perl + PERL %SOLAR_ENV_ROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin/perl PKGFORMAT rpm PTHREAD_CFLAGS -DNPTL SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv @@ -1013,7 +1013,7 @@ unxlngx6 SOLARROOT %SOLAR_ENV_ROOT% SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP% SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP% - SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.4.2_11 + SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.4.2.32 SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.5.0_15.x64 SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-linux-amd64 SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP% @@ -1024,7 +1024,7 @@ unxlngx6 common2 { ENABLE_GRAPHITE TRUE - BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.11/%WORK_STAMP%/bin + BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin COM GCC COMMON_BUILD_TOOLS %SOLARROOT%$/btools COMMON_ENV_TOOLS %SOLARROOT%$/etools @@ -1033,7 +1033,7 @@ unxlngx6 CVER C341 ENABLE_KAB TRUE ENABLE_KDE TRUE - ENV_TOOLS %SOLARROOT%/et_linux_libc2.11/%WORK_STAMP%/bin + ENV_TOOLS %SOLARROOT%/et_linux_libc2.32/%WORK_STAMP%/bin GLIBC 2REDHAT60 GUI UNX GUIBASE unx -- cgit From 04bfd1562b68800b4678751cc1818ba9d3557b5a Mon Sep 17 00:00:00 2001 From: Release Engineers Date: Tue, 1 Sep 2009 09:25:09 +0000 Subject: #i10000# fix for building locally copied modules --- solenv/bin/build.pl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl index a08b69c3b526..c9c29bf40b72 100644 --- a/solenv/bin/build.pl +++ b/solenv/bin/build.pl @@ -190,8 +190,6 @@ my %lost_client_jobs = (); # hash containing lost jobs my %job_jobdir = (); # hash containing job-dir pairs my %module_paths = (); # hash with absolute module paths - my $source_config = SourceConfig -> new(); - my $source_config_file = $source_config->get_config_file_path(); my %active_modules = (); my $generate_config = 0; my %add_to_config = (); @@ -332,6 +330,8 @@ sub rename_file { }; sub generate_config_file { + my $source_config = SourceConfig -> new(); + my $source_config_file = $source_config->get_config_file_path(); my $temp_config_file = File::Temp::tmpnam($ENV{TMP}); my @config_content_new = (); my $addition_message; @@ -1404,6 +1404,8 @@ sub get_options { }; sub get_module_and_buildlist_paths { + my $source_config = SourceConfig -> new($StandDir); + my $source_config_file = $source_config->get_config_file_path(); $active_modules{$_}++ foreach ($source_config->get_active_modules()); my %active_modules_copy = %active_modules; foreach ($source_config->get_all_modules()) { -- cgit From 9d7d35bce00ec0b2676d0428872300cc257e3288 Mon Sep 17 00:00:00 2001 From: Release Engineers Date: Thu, 3 Sep 2009 10:59:26 +0000 Subject: #100000# revert some unxlngx settings --- solenv/config/sdev300.ini | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index d8b87b504010..a8851fd66f58 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -939,7 +939,7 @@ unxlngx6 COPYALL TRUE DEVROOT %SOL_TMP%$/r PCLEAN_PATH %SOLARROOT%/etools - PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl + PERL %SOL_TMP%$/r$/bt_linux_libc2.11$/%WORK_STAMP%$/bin$/perl SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv SOLARROOT %SOL_TMP%$/r SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% @@ -951,7 +951,7 @@ unxlngx6 COPY_PACKED TRUE DEVROOT %SOL_TMP%$/r PCLEAN_PATH %SOLARROOT%/etools - PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl + PERL %SOL_TMP%$/r$/bt_linux_libc2.11$/%WORK_STAMP%$/bin$/perl SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv SOLARROOT %SOL_TMP%$/r SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% @@ -963,7 +963,7 @@ unxlngx6 COPYALL FALSE DEVROOT %SOL_TMP%$/r PCLEAN_PATH %SOL_TMP%$/r/etools - PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl + PERL %SOL_TMP%$/r$/bt_linux_libc2.11$/%WORK_STAMP%$/bin$/perl SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv SOLARROOT %SOL_TMP%$/r SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP% @@ -1004,7 +1004,7 @@ unxlngx6 { COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux64_libc3.4.6/ DEVROOT %SOLAR_ENV_ROOT% - PERL %SOLAR_ENV_ROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin/perl + PERL %SOLAR_ENV_ROOT%/bt_linux_libc2.11/%WORK_STAMP%/bin/perl PKGFORMAT rpm PTHREAD_CFLAGS -DNPTL SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv @@ -1024,7 +1024,7 @@ unxlngx6 common2 { ENABLE_GRAPHITE TRUE - BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin + BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.11/%WORK_STAMP%/bin COM GCC COMMON_BUILD_TOOLS %SOLARROOT%$/btools COMMON_ENV_TOOLS %SOLARROOT%$/etools @@ -1033,7 +1033,7 @@ unxlngx6 CVER C341 ENABLE_KAB TRUE ENABLE_KDE TRUE - ENV_TOOLS %SOLARROOT%/et_linux_libc2.32/%WORK_STAMP%/bin + ENV_TOOLS %SOLARROOT%/et_linux_libc2.11/%WORK_STAMP%/bin GLIBC 2REDHAT60 GUI UNX GUIBASE unx -- cgit -- cgit