diff options
Diffstat (limited to 'fonts')
| -rw-r--r-- | fonts/fontconfig/Makefile | 14 | ||||
| -rw-r--r-- | fonts/fontconfig/PLIST | 355 | ||||
| -rw-r--r-- | fonts/fontconfig/distinfo | 19 | ||||
| -rw-r--r-- | fonts/fontconfig/patches/patch-aa | 12 | ||||
| -rw-r--r-- | fonts/fontconfig/patches/patch-ab | 13 | ||||
| -rw-r--r-- | fonts/fontconfig/patches/patch-ac | 8 | ||||
| -rw-r--r-- | fonts/fontconfig/patches/patch-ae | 13 | ||||
| -rw-r--r-- | fonts/fontconfig/patches/patch-ca | 6 | ||||
| -rw-r--r-- | fonts/fontconfig/patches/patch-cb | 2600 |
9 files changed, 265 insertions, 2775 deletions
diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile index f1970c2e6f1..11f803bd67c 100644 --- a/fonts/fontconfig/Makefile +++ b/fonts/fontconfig/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.63 2007/08/01 16:33:39 joerg Exp $ +# $NetBSD: Makefile,v 1.64 2007/11/30 22:31:15 wiz Exp $ -DISTNAME= fontconfig-2.4.2 -PKGREVISION= 3 +DISTNAME= fontconfig-2.5.0 CATEGORIES= fonts MASTER_SITES= http://www.fontconfig.org/release/ @@ -47,11 +46,11 @@ CONF_FILES= ${EGDIR}/fonts.conf ${PKG_SYSCONFDIR}/fonts.conf CONF_FILES+= ${EGDIR}/fonts.dtd ${PKG_SYSCONFDIR}/fonts.dtd MAKE_DIRS+= ${PKG_SYSCONFDIR}/conf.d CONF_FILES+= ${EGDIR}/conf.d/20-fix-globaladvance.conf ${PKG_SYSCONFDIR}/conf.d/20-fix-globaladvance.conf -CONF_FILES+= ${EGDIR}/conf.d/20-lohit-gujarati.conf ${PKG_SYSCONFDIR}/conf.d/20-lohit-gujarati.conf CONF_FILES+= ${EGDIR}/conf.d/20-unhint-small-vera.conf ${PKG_SYSCONFDIR}/conf.d/20-unhint-small-vera.conf -CONF_FILES+= ${EGDIR}/conf.d/30-amt-aliases.conf ${PKG_SYSCONFDIR}/conf.d/30-amt-aliases.conf +CONF_FILES+= ${EGDIR}/conf.d/30-metric-aliases.conf ${PKG_SYSCONFDIR}/conf.d/30-metric-aliases.conf CONF_FILES+= ${EGDIR}/conf.d/30-urw-aliases.conf ${PKG_SYSCONFDIR}/conf.d/30-urw-aliases.conf -CONF_FILES+= ${EGDIR}/conf.d/40-generic.conf ${PKG_SYSCONFDIR}/conf.d/40-generic.conf +CONF_FILES+= ${EGDIR}/conf.d/40-nonlatin.conf ${PKG_SYSCONFDIR}/conf.d/40-nonlatin.conf +CONF_FILES+= ${EGDIR}/conf.d/45-latin.conf ${PKG_SYSCONFDIR}/conf.d/45-latin.conf CONF_FILES+= ${EGDIR}/conf.d/49-sansserif.conf ${PKG_SYSCONFDIR}/conf.d/49-sansserif.conf CONF_FILES+= ${EGDIR}/conf.d/50-user.conf ${PKG_SYSCONFDIR}/conf.d/50-user.conf CONF_FILES+= ${EGDIR}/conf.d/51-local.conf ${PKG_SYSCONFDIR}/conf.d/51-local.conf @@ -63,6 +62,7 @@ CONF_FILES+= ${EGDIR}/conf.d/80-delicious.conf ${PKG_SYSCONFDIR}/conf.d/80-delic CONF_FILES+= ${EGDIR}/conf.d/90-synthetic.conf ${PKG_SYSCONFDIR}/conf.d/90-synthetic.conf MAKE_DIRS+= ${VARBASE}/cache +BUILD_DEFS+= VARBASE LIBS+= ${BUILDLINK_LDADD.iconv} @@ -73,7 +73,7 @@ CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q} .endif pre-configure: - echo '#define FC_ARCHITECTURE "@host_cpu@"' > ${WRKSRC}/fc-arch/fcarch.h.in + ${ECHO} '#define FC_ARCHITECTURE "@host_cpu@"' > ${WRKSRC}/fc-arch/fcarch.h.in .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" diff --git a/fonts/fontconfig/PLIST b/fonts/fontconfig/PLIST index 29ec0f9318b..6a9ee403dd5 100644 --- a/fonts/fontconfig/PLIST +++ b/fonts/fontconfig/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.14 2006/12/04 12:41:51 wiz Exp $ +@comment $NetBSD: PLIST,v 1.15 2007/11/30 22:31:16 wiz Exp $ bin/fc-cache bin/fc-cat bin/fc-list @@ -8,6 +8,10 @@ include/fontconfig/fcprivate.h include/fontconfig/fontconfig.h lib/libfontconfig.la lib/pkgconfig/fontconfig.pc +man/man1/fc-cache.1 +man/man1/fc-cat.1 +man/man1/fc-list.1 +man/man1/fc-match.1 man/man3/FcAtomicCreate.3 man/man3/FcAtomicDeleteNew.3 man/man3/FcAtomicDestroy.3 @@ -20,9 +24,15 @@ man/man3/FcBlanksAdd.3 man/man3/FcBlanksCreate.3 man/man3/FcBlanksDestroy.3 man/man3/FcBlanksIsMember.3 +man/man3/FcCacheCopySet.3 +man/man3/FcCacheDir.3 +man/man3/FcCacheNumFont.3 +man/man3/FcCacheNumSubdir.3 +man/man3/FcCacheSubdir.3 man/man3/FcCharSetAddChar.3 man/man3/FcCharSetCopy.3 man/man3/FcCharSetCount.3 +man/man3/FcCharSetCoverage.3 man/man3/FcCharSetCreate.3 man/man3/FcCharSetDestroy.3 man/man3/FcCharSetEqual.3 @@ -31,6 +41,7 @@ man/man3/FcCharSetHasChar.3 man/man3/FcCharSetIntersect.3 man/man3/FcCharSetIntersectCount.3 man/man3/FcCharSetIsSubset.3 +man/man3/FcCharSetNew.3 man/man3/FcCharSetNextPage.3 man/man3/FcCharSetSubtract.3 man/man3/FcCharSetSubtractCount.3 @@ -41,25 +52,34 @@ man/man3/FcConfigAppFontClear.3 man/man3/FcConfigBuildFonts.3 man/man3/FcConfigCreate.3 man/man3/FcConfigDestroy.3 +man/man3/FcConfigEnableHome.3 man/man3/FcConfigFilename.3 man/man3/FcConfigGetBlanks.3 man/man3/FcConfigGetCache.3 +man/man3/FcConfigGetCacheDirs.3 man/man3/FcConfigGetConfigDirs.3 man/man3/FcConfigGetConfigFiles.3 man/man3/FcConfigGetCurrent.3 man/man3/FcConfigGetFontDirs.3 man/man3/FcConfigGetFonts.3 -man/man3/FcConfigGetRescanInverval.3 +man/man3/FcConfigGetRescanInterval.3 +man/man3/FcConfigHome.3 man/man3/FcConfigParseAndLoad.3 man/man3/FcConfigSetCurrent.3 -man/man3/FcConfigSetRescanInverval.3 +man/man3/FcConfigSetRescanInterval.3 man/man3/FcConfigSubstitute.3 man/man3/FcConfigSubstituteWithPat.3 man/man3/FcConfigUptoDate.3 man/man3/FcDefaultSubstitute.3 +man/man3/FcDirCacheLoad.3 +man/man3/FcDirCacheLoadFile.3 +man/man3/FcDirCacheRead.3 +man/man3/FcDirCacheUnlink.3 +man/man3/FcDirCacheUnload.3 man/man3/FcDirCacheValid.3 man/man3/FcDirSave.3 man/man3/FcDirScan.3 +man/man3/FcFileIsDir.3 man/man3/FcFileScan.3 man/man3/FcFini.3 man/man3/FcFontList.3 @@ -68,17 +88,36 @@ man/man3/FcFontRenderPrepare.3 man/man3/FcFontSetAdd.3 man/man3/FcFontSetCreate.3 man/man3/FcFontSetDestroy.3 +man/man3/FcFontSetList.3 +man/man3/FcFontSetMatch.3 +man/man3/FcFontSetPrint.3 +man/man3/FcFontSetSort.3 +man/man3/FcFontSetSortDestroy.3 man/man3/FcFontSort.3 man/man3/FcFreeTypeCharIndex.3 man/man3/FcFreeTypeCharSet.3 +man/man3/FcFreeTypeCharSetAndSpacing.3 man/man3/FcFreeTypeQuery.3 man/man3/FcFreeTypeQueryFace.3 +man/man3/FcGetLangs.3 man/man3/FcGetVersion.3 man/man3/FcInit.3 man/man3/FcInitBringUptoDate.3 man/man3/FcInitLoadConfig.3 man/man3/FcInitLoadConfigAndFonts.3 man/man3/FcInitReinitialize.3 +man/man3/FcIsLower.3 +man/man3/FcIsUpper.3 +man/man3/FcLangGetCharSet.3 +man/man3/FcLangSetAdd.3 +man/man3/FcLangSetCompare.3 +man/man3/FcLangSetContains.3 +man/man3/FcLangSetCopy.3 +man/man3/FcLangSetCreate.3 +man/man3/FcLangSetDestroy.3 +man/man3/FcLangSetEqual.3 +man/man3/FcLangSetHasLang.3 +man/man3/FcLangSetHash.3 man/man3/FcMatrixCopy.3 man/man3/FcMatrixEqual.3 man/man3/FcMatrixInit.3 @@ -106,173 +145,224 @@ man/man3/FcPatternBuild.3 man/man3/FcPatternCreate.3 man/man3/FcPatternDel.3 man/man3/FcPatternDestroy.3 +man/man3/FcPatternDuplicate.3 man/man3/FcPatternEqual.3 man/man3/FcPatternEqualSubset.3 man/man3/FcPatternGet-Type.3 man/man3/FcPatternGet.3 man/man3/FcPatternHash.3 man/man3/FcPatternPrint.3 +man/man3/FcPatternReference.3 man/man3/FcPatternRemove.3 man/man3/FcStrBasename.3 +man/man3/FcStrCmp.3 man/man3/FcStrCmpIgnoreCase.3 man/man3/FcStrCopy.3 man/man3/FcStrCopyFilename.3 -man/man3/FcStrDirname.3 man/man3/FcStrDowncase.3 +man/man3/FcStrFree.3 man/man3/FcStrListCreate.3 man/man3/FcStrListDone.3 man/man3/FcStrListNext.3 +man/man3/FcStrPlus.3 man/man3/FcStrSetAdd.3 man/man3/FcStrSetAddFilename.3 man/man3/FcStrSetCreate.3 man/man3/FcStrSetDel.3 man/man3/FcStrSetDestroy.3 +man/man3/FcStrSetEqual.3 man/man3/FcStrSetMember.3 man/man3/FcStrStr.3 man/man3/FcStrStrIgnoreCase.3 +man/man3/FcToLower.3 man/man3/FcUcs4ToUtf8.3 man/man3/FcUtf16Len.3 man/man3/FcUtf16ToUcs4.3 man/man3/FcUtf8Len.3 man/man3/FcUtf8ToUcs4.3 man/man3/FcValueDestroy.3 +man/man3/FcValueEqual.3 +man/man3/FcValuePrint.3 man/man3/FcValueSave.3 man/man5/fonts-conf.5 share/doc/fontconfig/fontconfig-devel.pdf share/doc/fontconfig/fontconfig-devel.txt share/doc/fontconfig/fontconfig-devel/index.html -share/doc/fontconfig/fontconfig-devel/r1011.html -share/doc/fontconfig/fontconfig-devel/r1038.html -share/doc/fontconfig/fontconfig-devel/r1069.html -share/doc/fontconfig/fontconfig-devel/r1091.html -share/doc/fontconfig/fontconfig-devel/r1117.html -share/doc/fontconfig/fontconfig-devel/r1139.html -share/doc/fontconfig/fontconfig-devel/r1162.html -share/doc/fontconfig/fontconfig-devel/r1186.html -share/doc/fontconfig/fontconfig-devel/r120.html -share/doc/fontconfig/fontconfig-devel/r1209.html -share/doc/fontconfig/fontconfig-devel/r1234.html -share/doc/fontconfig/fontconfig-devel/r1259.html -share/doc/fontconfig/fontconfig-devel/r1284.html +share/doc/fontconfig/fontconfig-devel/r1034.html +share/doc/fontconfig/fontconfig-devel/r1056.html +share/doc/fontconfig/fontconfig-devel/r108.html +share/doc/fontconfig/fontconfig-devel/r1099.html +share/doc/fontconfig/fontconfig-devel/r1127.html +share/doc/fontconfig/fontconfig-devel/r1148.html +share/doc/fontconfig/fontconfig-devel/r1171.html +share/doc/fontconfig/fontconfig-devel/r1192.html +share/doc/fontconfig/fontconfig-devel/r1237.html +share/doc/fontconfig/fontconfig-devel/r1260.html +share/doc/fontconfig/fontconfig-devel/r1283.html +share/doc/fontconfig/fontconfig-devel/r129.html share/doc/fontconfig/fontconfig-devel/r1309.html -share/doc/fontconfig/fontconfig-devel/r1334.html -share/doc/fontconfig/fontconfig-devel/r1356.html -share/doc/fontconfig/fontconfig-devel/r1381.html -share/doc/fontconfig/fontconfig-devel/r1406.html -share/doc/fontconfig/fontconfig-devel/r141.html -share/doc/fontconfig/fontconfig-devel/r1431.html -share/doc/fontconfig/fontconfig-devel/r1458.html -share/doc/fontconfig/fontconfig-devel/r1489.html -share/doc/fontconfig/fontconfig-devel/r1512.html -share/doc/fontconfig/fontconfig-devel/r1535.html -share/doc/fontconfig/fontconfig-devel/r1561.html -share/doc/fontconfig/fontconfig-devel/r1590.html -share/doc/fontconfig/fontconfig-devel/r162.html -share/doc/fontconfig/fontconfig-devel/r1620.html -share/doc/fontconfig/fontconfig-devel/r1650.html -share/doc/fontconfig/fontconfig-devel/r1683.html -share/doc/fontconfig/fontconfig-devel/r1704.html -share/doc/fontconfig/fontconfig-devel/r1725.html -share/doc/fontconfig/fontconfig-devel/r1747.html -share/doc/fontconfig/fontconfig-devel/r1768.html -share/doc/fontconfig/fontconfig-devel/r1790.html -share/doc/fontconfig/fontconfig-devel/r1811.html -share/doc/fontconfig/fontconfig-devel/r183.html -share/doc/fontconfig/fontconfig-devel/r1833.html -share/doc/fontconfig/fontconfig-devel/r1855.html -share/doc/fontconfig/fontconfig-devel/r1877.html -share/doc/fontconfig/fontconfig-devel/r1898.html -share/doc/fontconfig/fontconfig-devel/r1922.html -share/doc/fontconfig/fontconfig-devel/r1943.html -share/doc/fontconfig/fontconfig-devel/r1965.html -share/doc/fontconfig/fontconfig-devel/r1988.html -share/doc/fontconfig/fontconfig-devel/r2011.html -share/doc/fontconfig/fontconfig-devel/r2034.html -share/doc/fontconfig/fontconfig-devel/r204.html -share/doc/fontconfig/fontconfig-devel/r2055.html -share/doc/fontconfig/fontconfig-devel/r2084.html -share/doc/fontconfig/fontconfig-devel/r2109.html -share/doc/fontconfig/fontconfig-devel/r2137.html -share/doc/fontconfig/fontconfig-devel/r2174.html -share/doc/fontconfig/fontconfig-devel/r2205.html -share/doc/fontconfig/fontconfig-devel/r2232.html -share/doc/fontconfig/fontconfig-devel/r225.html +share/doc/fontconfig/fontconfig-devel/r1336.html +share/doc/fontconfig/fontconfig-devel/r1367.html +share/doc/fontconfig/fontconfig-devel/r1389.html +share/doc/fontconfig/fontconfig-devel/r1412.html +share/doc/fontconfig/fontconfig-devel/r1434.html +share/doc/fontconfig/fontconfig-devel/r1460.html +share/doc/fontconfig/fontconfig-devel/r1482.html +share/doc/fontconfig/fontconfig-devel/r150.html +share/doc/fontconfig/fontconfig-devel/r1505.html +share/doc/fontconfig/fontconfig-devel/r1529.html +share/doc/fontconfig/fontconfig-devel/r1552.html +share/doc/fontconfig/fontconfig-devel/r1577.html +share/doc/fontconfig/fontconfig-devel/r1602.html +share/doc/fontconfig/fontconfig-devel/r1627.html +share/doc/fontconfig/fontconfig-devel/r1652.html +share/doc/fontconfig/fontconfig-devel/r1677.html +share/doc/fontconfig/fontconfig-devel/r1699.html +share/doc/fontconfig/fontconfig-devel/r171.html +share/doc/fontconfig/fontconfig-devel/r1724.html +share/doc/fontconfig/fontconfig-devel/r1749.html +share/doc/fontconfig/fontconfig-devel/r1774.html +share/doc/fontconfig/fontconfig-devel/r1801.html +share/doc/fontconfig/fontconfig-devel/r1829.html +share/doc/fontconfig/fontconfig-devel/r1858.html +share/doc/fontconfig/fontconfig-devel/r1883.html +share/doc/fontconfig/fontconfig-devel/r1905.html +share/doc/fontconfig/fontconfig-devel/r192.html +share/doc/fontconfig/fontconfig-devel/r1927.html +share/doc/fontconfig/fontconfig-devel/r1950.html +share/doc/fontconfig/fontconfig-devel/r1976.html +share/doc/fontconfig/fontconfig-devel/r2002.html +share/doc/fontconfig/fontconfig-devel/r2032.html +share/doc/fontconfig/fontconfig-devel/r2057.html +share/doc/fontconfig/fontconfig-devel/r2081.html +share/doc/fontconfig/fontconfig-devel/r2110.html +share/doc/fontconfig/fontconfig-devel/r213.html +share/doc/fontconfig/fontconfig-devel/r2131.html +share/doc/fontconfig/fontconfig-devel/r2155.html +share/doc/fontconfig/fontconfig-devel/r2178.html +share/doc/fontconfig/fontconfig-devel/r2201.html +share/doc/fontconfig/fontconfig-devel/r2227.html share/doc/fontconfig/fontconfig-devel/r2256.html -share/doc/fontconfig/fontconfig-devel/r2282.html -share/doc/fontconfig/fontconfig-devel/r2306.html -share/doc/fontconfig/fontconfig-devel/r2330.html -share/doc/fontconfig/fontconfig-devel/r2355.html -share/doc/fontconfig/fontconfig-devel/r2379.html -share/doc/fontconfig/fontconfig-devel/r2403.html -share/doc/fontconfig/fontconfig-devel/r2425.html -share/doc/fontconfig/fontconfig-devel/r2453.html -share/doc/fontconfig/fontconfig-devel/r2474.html -share/doc/fontconfig/fontconfig-devel/r249.html -share/doc/fontconfig/fontconfig-devel/r2495.html -share/doc/fontconfig/fontconfig-devel/r2518.html +share/doc/fontconfig/fontconfig-devel/r2286.html +share/doc/fontconfig/fontconfig-devel/r2316.html +share/doc/fontconfig/fontconfig-devel/r234.html +share/doc/fontconfig/fontconfig-devel/r2349.html +share/doc/fontconfig/fontconfig-devel/r2370.html +share/doc/fontconfig/fontconfig-devel/r2391.html +share/doc/fontconfig/fontconfig-devel/r2413.html +share/doc/fontconfig/fontconfig-devel/r2434.html +share/doc/fontconfig/fontconfig-devel/r2456.html +share/doc/fontconfig/fontconfig-devel/r2478.html +share/doc/fontconfig/fontconfig-devel/r2501.html +share/doc/fontconfig/fontconfig-devel/r2522.html share/doc/fontconfig/fontconfig-devel/r2544.html share/doc/fontconfig/fontconfig-devel/r2566.html +share/doc/fontconfig/fontconfig-devel/r258.html share/doc/fontconfig/fontconfig-devel/r2588.html -share/doc/fontconfig/fontconfig-devel/r2610.html -share/doc/fontconfig/fontconfig-devel/r2632.html -share/doc/fontconfig/fontconfig-devel/r2654.html -share/doc/fontconfig/fontconfig-devel/r2675.html -share/doc/fontconfig/fontconfig-devel/r2696.html -share/doc/fontconfig/fontconfig-devel/r270.html +share/doc/fontconfig/fontconfig-devel/r2609.html +share/doc/fontconfig/fontconfig-devel/r2631.html +share/doc/fontconfig/fontconfig-devel/r2655.html +share/doc/fontconfig/fontconfig-devel/r2676.html +share/doc/fontconfig/fontconfig-devel/r2698.html share/doc/fontconfig/fontconfig-devel/r2721.html -share/doc/fontconfig/fontconfig-devel/r2757.html -share/doc/fontconfig/fontconfig-devel/r2792.html -share/doc/fontconfig/fontconfig-devel/r2820.html -share/doc/fontconfig/fontconfig-devel/r2845.html -share/doc/fontconfig/fontconfig-devel/r2866.html -share/doc/fontconfig/fontconfig-devel/r2891.html -share/doc/fontconfig/fontconfig-devel/r291.html -share/doc/fontconfig/fontconfig-devel/r2916.html -share/doc/fontconfig/fontconfig-devel/r2941.html -share/doc/fontconfig/fontconfig-devel/r2967.html -share/doc/fontconfig/fontconfig-devel/r2989.html -share/doc/fontconfig/fontconfig-devel/r3011.html -share/doc/fontconfig/fontconfig-devel/r3033.html -share/doc/fontconfig/fontconfig-devel/r3058.html -share/doc/fontconfig/fontconfig-devel/r3087.html -share/doc/fontconfig/fontconfig-devel/r3112.html -share/doc/fontconfig/fontconfig-devel/r3144.html -share/doc/fontconfig/fontconfig-devel/r316.html -share/doc/fontconfig/fontconfig-devel/r3177.html +share/doc/fontconfig/fontconfig-devel/r2744.html +share/doc/fontconfig/fontconfig-devel/r2767.html +share/doc/fontconfig/fontconfig-devel/r2788.html +share/doc/fontconfig/fontconfig-devel/r279.html +share/doc/fontconfig/fontconfig-devel/r2817.html +share/doc/fontconfig/fontconfig-devel/r2842.html +share/doc/fontconfig/fontconfig-devel/r2873.html +share/doc/fontconfig/fontconfig-devel/r2911.html +share/doc/fontconfig/fontconfig-devel/r2942.html +share/doc/fontconfig/fontconfig-devel/r2969.html +share/doc/fontconfig/fontconfig-devel/r2993.html +share/doc/fontconfig/fontconfig-devel/r301.html +share/doc/fontconfig/fontconfig-devel/r3021.html +share/doc/fontconfig/fontconfig-devel/r3045.html +share/doc/fontconfig/fontconfig-devel/r3069.html +share/doc/fontconfig/fontconfig-devel/r3094.html +share/doc/fontconfig/fontconfig-devel/r3118.html +share/doc/fontconfig/fontconfig-devel/r3142.html +share/doc/fontconfig/fontconfig-devel/r3164.html +share/doc/fontconfig/fontconfig-devel/r3192.html share/doc/fontconfig/fontconfig-devel/r3213.html -share/doc/fontconfig/fontconfig-devel/r3236.html -share/doc/fontconfig/fontconfig-devel/r3258.html -share/doc/fontconfig/fontconfig-devel/r3281.html -share/doc/fontconfig/fontconfig-devel/r3306.html -share/doc/fontconfig/fontconfig-devel/r3333.html -share/doc/fontconfig/fontconfig-devel/r3360.html -share/doc/fontconfig/fontconfig-devel/r3382.html +share/doc/fontconfig/fontconfig-devel/r323.html +share/doc/fontconfig/fontconfig-devel/r3234.html +share/doc/fontconfig/fontconfig-devel/r3257.html +share/doc/fontconfig/fontconfig-devel/r3283.html +share/doc/fontconfig/fontconfig-devel/r3305.html +share/doc/fontconfig/fontconfig-devel/r3327.html +share/doc/fontconfig/fontconfig-devel/r3349.html +share/doc/fontconfig/fontconfig-devel/r3371.html +share/doc/fontconfig/fontconfig-devel/r3393.html +share/doc/fontconfig/fontconfig-devel/r3414.html +share/doc/fontconfig/fontconfig-devel/r3435.html share/doc/fontconfig/fontconfig-devel/r344.html -share/doc/fontconfig/fontconfig-devel/r365.html -share/doc/fontconfig/fontconfig-devel/r393.html -share/doc/fontconfig/fontconfig-devel/r422.html -share/doc/fontconfig/fontconfig-devel/r497.html -share/doc/fontconfig/fontconfig-devel/r527.html -share/doc/fontconfig/fontconfig-devel/r614.html -share/doc/fontconfig/fontconfig-devel/r655.html -share/doc/fontconfig/fontconfig-devel/r678.html -share/doc/fontconfig/fontconfig-devel/r703.html -share/doc/fontconfig/fontconfig-devel/r724.html -share/doc/fontconfig/fontconfig-devel/r752.html -share/doc/fontconfig/fontconfig-devel/r774.html -share/doc/fontconfig/fontconfig-devel/r798.html -share/doc/fontconfig/fontconfig-devel/r819.html -share/doc/fontconfig/fontconfig-devel/r840.html -share/doc/fontconfig/fontconfig-devel/r866.html -share/doc/fontconfig/fontconfig-devel/r887.html -share/doc/fontconfig/fontconfig-devel/r910.html -share/doc/fontconfig/fontconfig-devel/r931.html -share/doc/fontconfig/fontconfig-devel/r965.html -share/doc/fontconfig/fontconfig-devel/r988.html -share/doc/fontconfig/fontconfig-devel/r99.html +share/doc/fontconfig/fontconfig-devel/r3460.html +share/doc/fontconfig/fontconfig-devel/r3496.html +share/doc/fontconfig/fontconfig-devel/r3518.html +share/doc/fontconfig/fontconfig-devel/r3553.html +share/doc/fontconfig/fontconfig-devel/r3581.html +share/doc/fontconfig/fontconfig-devel/r3607.html +share/doc/fontconfig/fontconfig-devel/r3629.html +share/doc/fontconfig/fontconfig-devel/r3656.html +share/doc/fontconfig/fontconfig-devel/r3683.html +share/doc/fontconfig/fontconfig-devel/r369.html +share/doc/fontconfig/fontconfig-devel/r3708.html +share/doc/fontconfig/fontconfig-devel/r3733.html +share/doc/fontconfig/fontconfig-devel/r3755.html +share/doc/fontconfig/fontconfig-devel/r3778.html +share/doc/fontconfig/fontconfig-devel/r3805.html +share/doc/fontconfig/fontconfig-devel/r3827.html +share/doc/fontconfig/fontconfig-devel/r3852.html +share/doc/fontconfig/fontconfig-devel/r3873.html +share/doc/fontconfig/fontconfig-devel/r3898.html +share/doc/fontconfig/fontconfig-devel/r3923.html +share/doc/fontconfig/fontconfig-devel/r3948.html +share/doc/fontconfig/fontconfig-devel/r397.html +share/doc/fontconfig/fontconfig-devel/r3973.html +share/doc/fontconfig/fontconfig-devel/r3999.html +share/doc/fontconfig/fontconfig-devel/r4021.html +share/doc/fontconfig/fontconfig-devel/r4043.html +share/doc/fontconfig/fontconfig-devel/r4065.html +share/doc/fontconfig/fontconfig-devel/r4090.html +share/doc/fontconfig/fontconfig-devel/r4119.html +share/doc/fontconfig/fontconfig-devel/r4144.html +share/doc/fontconfig/fontconfig-devel/r4176.html +share/doc/fontconfig/fontconfig-devel/r418.html +share/doc/fontconfig/fontconfig-devel/r4209.html +share/doc/fontconfig/fontconfig-devel/r4245.html +share/doc/fontconfig/fontconfig-devel/r4267.html +share/doc/fontconfig/fontconfig-devel/r4289.html +share/doc/fontconfig/fontconfig-devel/r4311.html +share/doc/fontconfig/fontconfig-devel/r4334.html +share/doc/fontconfig/fontconfig-devel/r4356.html +share/doc/fontconfig/fontconfig-devel/r4380.html +share/doc/fontconfig/fontconfig-devel/r4405.html +share/doc/fontconfig/fontconfig-devel/r4430.html +share/doc/fontconfig/fontconfig-devel/r4457.html +share/doc/fontconfig/fontconfig-devel/r446.html +share/doc/fontconfig/fontconfig-devel/r4484.html +share/doc/fontconfig/fontconfig-devel/r4509.html +share/doc/fontconfig/fontconfig-devel/r4530.html +share/doc/fontconfig/fontconfig-devel/r475.html +share/doc/fontconfig/fontconfig-devel/r570.html +share/doc/fontconfig/fontconfig-devel/r600.html +share/doc/fontconfig/fontconfig-devel/r707.html +share/doc/fontconfig/fontconfig-devel/r759.html +share/doc/fontconfig/fontconfig-devel/r782.html +share/doc/fontconfig/fontconfig-devel/r807.html +share/doc/fontconfig/fontconfig-devel/r828.html +share/doc/fontconfig/fontconfig-devel/r856.html +share/doc/fontconfig/fontconfig-devel/r878.html +share/doc/fontconfig/fontconfig-devel/r902.html +share/doc/fontconfig/fontconfig-devel/r923.html +share/doc/fontconfig/fontconfig-devel/r944.html +share/doc/fontconfig/fontconfig-devel/r967.html +share/doc/fontconfig/fontconfig-devel/r999.html +share/doc/fontconfig/fontconfig-devel/x102.html share/doc/fontconfig/fontconfig-devel/x19.html share/doc/fontconfig/fontconfig-devel/x31.html -share/doc/fontconfig/fontconfig-devel/x93.html share/doc/fontconfig/fontconfig-user.html share/doc/fontconfig/fontconfig-user.pdf share/doc/fontconfig/fontconfig-user.txt @@ -284,11 +374,12 @@ share/examples/fontconfig/conf.avail/10-sub-pixel-vbgr.conf share/examples/fontconfig/conf.avail/10-sub-pixel-vrgb.conf share/examples/fontconfig/conf.avail/10-unhinted.conf share/examples/fontconfig/conf.avail/20-fix-globaladvance.conf -share/examples/fontconfig/conf.avail/20-lohit-gujarati.conf share/examples/fontconfig/conf.avail/20-unhint-small-vera.conf -share/examples/fontconfig/conf.avail/30-amt-aliases.conf +share/examples/fontconfig/conf.avail/25-unhint-nonlatin.conf +share/examples/fontconfig/conf.avail/30-metric-aliases.conf share/examples/fontconfig/conf.avail/30-urw-aliases.conf -share/examples/fontconfig/conf.avail/40-generic.conf +share/examples/fontconfig/conf.avail/40-nonlatin.conf +share/examples/fontconfig/conf.avail/45-latin.conf share/examples/fontconfig/conf.avail/49-sansserif.conf share/examples/fontconfig/conf.avail/50-user.conf share/examples/fontconfig/conf.avail/51-local.conf @@ -302,11 +393,11 @@ share/examples/fontconfig/conf.avail/80-delicious.conf share/examples/fontconfig/conf.avail/90-synthetic.conf share/examples/fontconfig/conf.avail/README share/examples/fontconfig/conf.d/20-fix-globaladvance.conf -share/examples/fontconfig/conf.d/20-lohit-gujarati.conf share/examples/fontconfig/conf.d/20-unhint-small-vera.conf -share/examples/fontconfig/conf.d/30-amt-aliases.conf +share/examples/fontconfig/conf.d/30-metric-aliases.conf share/examples/fontconfig/conf.d/30-urw-aliases.conf -share/examples/fontconfig/conf.d/40-generic.conf +share/examples/fontconfig/conf.d/40-nonlatin.conf +share/examples/fontconfig/conf.d/45-latin.conf share/examples/fontconfig/conf.d/49-sansserif.conf share/examples/fontconfig/conf.d/50-user.conf share/examples/fontconfig/conf.d/51-local.conf diff --git a/fonts/fontconfig/distinfo b/fonts/fontconfig/distinfo index 94c55814341..03b225731e6 100644 --- a/fonts/fontconfig/distinfo +++ b/fonts/fontconfig/distinfo @@ -1,11 +1,10 @@ -$NetBSD: distinfo,v 1.26 2007/08/01 16:33:39 joerg Exp $ +$NetBSD: distinfo,v 1.27 2007/11/30 22:31:16 wiz Exp $ -SHA1 (fontconfig-2.4.2.tar.gz) = cd5e30625680a0435563b586275156eaf8d0d34a -RMD160 (fontconfig-2.4.2.tar.gz) = c953020a5193500080c9eceef47b76e61c41b188 -Size (fontconfig-2.4.2.tar.gz) = 1278340 bytes -SHA1 (patch-aa) = 1f33848449251839366d85fcc2134cdddc522a28 -SHA1 (patch-ab) = 455e20719e7ad300ebe95748165eeb7e25897dd5 -SHA1 (patch-ac) = 965087ba6e457daf17c55fc3573b51fd6425be93 -SHA1 (patch-ae) = 9bd0bf5cdbdf9e1e075d248fd33a156cd4cde909 -SHA1 (patch-ca) = ff3457cb7150015d31ba7932cd5e824f7ce3b3aa -SHA1 (patch-cb) = 5c80a81c5fc85f2423a66505db05a35122b57d72 +SHA1 (fontconfig-2.5.0.tar.gz) = 9ffad5f5eb2c5dd277bfed1cafc6e62aa0172842 +RMD160 (fontconfig-2.5.0.tar.gz) = 2c61ba3adc49aa5dd4eb081e13a849cc1d62d9da +Size (fontconfig-2.5.0.tar.gz) = 1385058 bytes +SHA1 (patch-aa) = dcba787c07758c9d20945338be7b4f9bb5b439c2 +SHA1 (patch-ac) = 759ec3251ba24b98db646a24e9a2ce7195ecc00e +SHA1 (patch-ae) = 7348e85cfa2d0b97649b4648346e6ea906b02769 +SHA1 (patch-ca) = 8d3abf96af648a44494afad8495635fceb6098ec +SHA1 (patch-cb) = e9988f401b07d338bf314b2df9b07f11e296d37c diff --git a/fonts/fontconfig/patches/patch-aa b/fonts/fontconfig/patches/patch-aa index a0f73b67d28..4f25e6aa4f5 100644 --- a/fonts/fontconfig/patches/patch-aa +++ b/fonts/fontconfig/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.11 2007/08/01 16:33:39 joerg Exp $ +$NetBSD: patch-aa,v 1.12 2007/11/30 22:31:16 wiz Exp $ ---- Makefile.in.orig 2006-12-03 00:27:34.000000000 +0100 +--- Makefile.in.orig 2007-11-14 02:57:09.000000000 +0000 +++ Makefile.in -@@ -258,7 +258,7 @@ sbindir = @sbindir@ +@@ -259,7 +259,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.11 2007/08/01 16:33:39 joerg Exp $ fc-cache fc-cat fc-list fc-match conf.d $(DOCSRC) test EXTRA_DIST = fontconfig.pc.in fonts.conf.in fonts.dtd \ -@@ -274,10 +274,11 @@ MAINTAINERCLEANFILES = $(srcdir)/aclocal +@@ -275,10 +275,11 @@ MAINTAINERCLEANFILES = $(srcdir)/aclocal -type f -name Makefile.in -print` ChangeLog pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = fontconfig.pc @@ -24,8 +24,8 @@ $NetBSD: patch-aa,v 1.11 2007/08/01 16:33:39 joerg Exp $ all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive -@@ -785,7 +786,8 @@ $(srcdir)/ChangeLog: - .PHONY: ChangeLog $(srcdir)/ChangeLog +@@ -783,7 +784,8 @@ ChangeLog: + .PHONY: ChangeLog install-data-local: - $(mkinstalldirs) $(DESTDIR)$(configdir) $(DESTDIR)$(fc_cachedir) diff --git a/fonts/fontconfig/patches/patch-ab b/fonts/fontconfig/patches/patch-ab deleted file mode 100644 index daea12742db..00000000000 --- a/fonts/fontconfig/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.8 2007/01/30 16:42:21 tv Exp $ - ---- src/makealias.orig 2006-12-02 16:11:26.000000000 -0500 -+++ src/makealias -@@ -15,7 +15,7 @@ while read name; do - hattr='__attribute((visibility("hidden")))' - echo "extern __typeof ($name) $alias $hattr;" >> $HEAD - echo "#define $name $alias" >> $HEAD -- grep -l '^'$name'\>' "$SRCDIR"/*.c | head -1 | sed -e 's/^.*\/\([^.]*\)\.c/#ifdef __\1__/' >> $TAIL -+ grep -l '^'$name'[^A-Za-z0-9_]' "$SRCDIR"/*.c | head -1 | sed -e 's/^.*\/\([^.]*\)\.c/#ifdef __\1__/' >> $TAIL - echo "#undef $name" >> $TAIL - cattr='__attribute((alias("'$alias'"), visibility("default")))' - echo "extern __typeof ($name) $name $cattr;" >> $TAIL diff --git a/fonts/fontconfig/patches/patch-ac b/fonts/fontconfig/patches/patch-ac index 56aa969cdf7..f98f1bede8e 100644 --- a/fonts/fontconfig/patches/patch-ac +++ b/fonts/fontconfig/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.7 2006/09/11 18:53:16 wiz Exp $ +$NetBSD: patch-ac,v 1.8 2007/11/30 22:31:16 wiz Exp $ ---- conf.d/Makefile.in.orig 2006-09-10 05:04:45.000000000 +0000 +--- conf.d/Makefile.in.orig 2007-11-14 02:57:06.000000000 +0000 +++ conf.d/Makefile.in -@@ -228,7 +228,7 @@ program_transform_name = @program_transf +@@ -229,7 +229,7 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.7 2006/09/11 18:53:16 wiz Exp $ target_alias = @target_alias@ CONF_FILES = \ README \ -@@ -276,8 +276,8 @@ CONF_LINKS = \ +@@ -278,8 +278,8 @@ CONF_LINKS = \ EXTRA_DIST = $(CONF_FILES) configdir = $(CONFDIR) diff --git a/fonts/fontconfig/patches/patch-ae b/fonts/fontconfig/patches/patch-ae index 775c12a0133..4e88d1647b0 100644 --- a/fonts/fontconfig/patches/patch-ae +++ b/fonts/fontconfig/patches/patch-ae @@ -1,6 +1,6 @@ -$NetBSD: patch-ae,v 1.7 2007/01/30 17:03:50 tv Exp $ +$NetBSD: patch-ae,v 1.8 2007/11/30 22:31:17 wiz Exp $ ---- src/fcint.h.orig 2006-12-02 16:52:09.000000000 -0500 +--- src/fcint.h.orig 2007-11-13 23:23:39.000000000 +0000 +++ src/fcint.h @@ -35,6 +35,21 @@ #include <inttypes.h> @@ -24,12 +24,3 @@ $NetBSD: patch-ae,v 1.7 2007/01/30 17:03:50 tv Exp $ #else #error missing C99 integer data types #endif -@@ -111,7 +126,7 @@ - #define FC_BANK_LANGS 0xfcfcfcfc - - /* slim_internal.h */ --#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__) -+#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__) && !defined(__sun) - #define FcPrivate __attribute__((__visibility__("hidden"))) - #define HAVE_GNUC_ATTRIBUTE 1 - #include "fcalias.h" diff --git a/fonts/fontconfig/patches/patch-ca b/fonts/fontconfig/patches/patch-ca index cb7c7183ff9..9d8294065d2 100644 --- a/fonts/fontconfig/patches/patch-ca +++ b/fonts/fontconfig/patches/patch-ca @@ -1,6 +1,6 @@ -$NetBSD: patch-ca,v 1.1 2007/08/01 16:33:39 joerg Exp $ +$NetBSD: patch-ca,v 1.2 2007/11/30 22:31:17 wiz Exp $ ---- configure.in.orig 2006-12-03 00:24:39.000000000 +0100 +--- configure.in.orig 2007-11-14 02:54:45.000000000 +0000 +++ configure.in @@ -137,22 +137,6 @@ AC_SUBST(EXEEXT_FOR_BUILD) @@ -25,7 +25,7 @@ $NetBSD: patch-ca,v 1.1 2007/08/01 16:33:39 joerg Exp $ # Checks for header files. AC_HEADER_DIRENT AC_HEADER_STDC -@@ -561,6 +545,7 @@ fc-lang/Makefile +@@ -565,6 +549,7 @@ fc-lang/Makefile fc-glyphname/Makefile fc-case/Makefile fc-arch/Makefile diff --git a/fonts/fontconfig/patches/patch-cb b/fonts/fontconfig/patches/patch-cb index 29fd66cb914..62d839d172b 100644 --- a/fonts/fontconfig/patches/patch-cb +++ b/fonts/fontconfig/patches/patch-cb @@ -1,140 +1,8 @@ -$NetBSD: patch-cb,v 1.1 2007/08/01 16:33:39 joerg Exp $ +$NetBSD: patch-cb,v 1.2 2007/11/30 22:31:17 wiz Exp $ ---- configure.orig 2006-12-03 00:27:35.000000000 +0100 +--- configure.orig 2007-11-14 02:57:10.000000000 +0000 +++ configure -@@ -1,6 +1,6 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.60a. -+# 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. -@@ -10,7 +10,8 @@ - ## 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=: -@@ -19,10 +20,13 @@ if test -n "${ZSH_VERSION+set}" && (emul - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST - else -- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; -+esac -+ - fi --BIN_SH=xpg4; export BIN_SH # for Tru64 --DUALCASE=1; export DUALCASE # for MKS sh -+ -+ - - - # PATH needs CR -@@ -215,7 +219,7 @@ test \$exitcode = 0) || { (exit 1); exit - else - as_candidate_shells= - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -@@ -233,7 +237,6 @@ IFS=$as_save_IFS - # 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 --# Be Bourne compatible - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -@@ -242,10 +245,12 @@ if test -n "${ZSH_VERSION+set}" && (emul - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST - else -- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; -+esac -+ - fi --BIN_SH=xpg4; export BIN_SH # for Tru64 --DUALCASE=1; export DUALCASE # for MKS sh -+ - - : - _ASEOF -@@ -253,7 +258,6 @@ _ASEOF - CONFIG_SHELL=$as_shell - as_have_required=yes - if { "$as_shell" 2> /dev/null <<\_ASEOF --# Be Bourne compatible - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -@@ -262,10 +266,12 @@ if test -n "${ZSH_VERSION+set}" && (emul - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST - else -- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; -+esac -+ - fi --BIN_SH=xpg4; export BIN_SH # for Tru64 --DUALCASE=1; export DUALCASE # for MKS sh -+ - - : - (as_func_return () { -@@ -512,19 +518,28 @@ else - as_mkdir_p=false - fi - --# Find out whether ``test -x'' works. Don't use a zero-byte file, as --# systems may use methods other than mode bits to determine executability. --cat >conf$$.file <<_ASEOF --#! /bin/sh --exit 0 --_ASEOF --chmod +x conf$$.file --if test -x conf$$.file >/dev/null 2>&1; then -- as_executable_p="test -x" -+if test -x / >/dev/null 2>&1; then -+ as_test_x='test -x' - else -- as_executable_p=: -+ 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 --rm -f conf$$.file -+as_executable_p=$as_test_x - - # 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'" -@@ -872,7 +887,6 @@ CROSS_COMPILING_TRUE +@@ -888,7 +888,6 @@ CROSS_COMPILING_TRUE CROSS_COMPILING_FALSE CC_FOR_BUILD EXEEXT_FOR_BUILD @@ -142,65 +10,7 @@ $NetBSD: patch-cb,v 1.1 2007/08/01 16:33:39 joerg Exp $ ICONV_LIBS ft_config FREETYPE_LIBS -@@ -910,6 +924,7 @@ target_alias - CC - CFLAGS - LDFLAGS -+LIBS - CPPFLAGS - CPP - CXX -@@ -1026,10 +1041,10 @@ do - -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'` -+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=no ;; - - -docdir | --docdir | --docdi | --doc | --do) -@@ -1045,10 +1060,10 @@ do - -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'` -+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=\$ac_optarg ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ -@@ -1242,19 +1257,19 @@ 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'` -+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - 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'` -+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=no ;; - - --x) -@@ -1517,7 +1532,6 @@ Optional Packages: +@@ -1534,7 +1533,6 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-tags[=TAGS] include additional configurations [automatic] @@ -208,1504 +18,7 @@ $NetBSD: patch-cb,v 1.1 2007/08/01 16:33:39 joerg Exp $ --with-freetype-config=PROG Use FreeType configuration program PROG --with-expat=DIR Use Expat in DIR --with-expat-includes=DIR Use Expat includes in DIR -@@ -1533,6 +1547,7 @@ Some influential environment variables: - CFLAGS C compiler flags - LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a - nonstandard directory <lib dir> -+ LIBS libraries to pass to the linker, e.g. -l<library> - CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if - you have headers in a nonstandard directory <include dir> - CPP C preprocessor -@@ -1611,7 +1626,7 @@ test -n "$ac_init_help" && exit $ac_stat - if $ac_init_version; then - cat <<\_ACEOF - configure --generated by GNU Autoconf 2.60a -+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. -@@ -1625,7 +1640,7 @@ This file contains any messages produced - running configure, to aid debugging if configure makes a mistake. - - It was created by $as_me, which was --generated by GNU Autoconf 2.60a. Invocation command line was -+generated by GNU Autoconf 2.61. Invocation command line was - - $ $0 $@ - -@@ -2039,7 +2054,7 @@ case $as_dir/ in - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then -+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. -@@ -2205,7 +2220,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_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 - break 2 -@@ -2340,7 +2355,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_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_STRIP="${ac_tool_prefix}strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -2380,7 +2395,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_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_STRIP="strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -2498,7 +2513,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_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 - break 2 -@@ -2538,7 +2553,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_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 - break 2 -@@ -2595,7 +2610,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_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 - break 2 -@@ -2636,7 +2651,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_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 -@@ -2694,7 +2709,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_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 - break 2 -@@ -2738,7 +2753,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_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 - break 2 -@@ -3101,27 +3116,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (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 -+ (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 -@@ -3176,27 +3174,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (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 -+ (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 -@@ -3231,27 +3212,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (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 -+ (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 -@@ -3287,27 +3251,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (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 -+ (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 -@@ -3423,27 +3370,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (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 -+ (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 - echo "$as_me: failed program was:" >&5 -@@ -3690,7 +3620,7 @@ case $as_dir/ in - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then -+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. -@@ -3980,7 +3910,7 @@ do - 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_executable_p "$ac_path_GREP"; } || continue -+ { 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 -@@ -4062,7 +3992,7 @@ do - 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_executable_p "$ac_path_EGREP"; } || continue -+ { 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 -@@ -4656,27 +4586,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - lt_cv_cc_needs_belf=yes - else - echo "$as_me: failed program was:" >&5 -@@ -4739,7 +4653,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_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_DLLTOOL="${ac_tool_prefix}dlltool" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -4779,7 +4693,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_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_DLLTOOL="dlltool" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -4835,7 +4749,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_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_AS="${ac_tool_prefix}as" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -4875,7 +4789,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_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_AS="as" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -4931,7 +4845,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_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_OBJDUMP="${ac_tool_prefix}objdump" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -4971,7 +4885,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_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_OBJDUMP="objdump" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -5069,17 +4983,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - 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 -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (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 -@@ -5113,17 +5020,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - 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 -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (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 -@@ -5188,17 +5088,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - 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 -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (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 -@@ -5232,17 +5125,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - 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 -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (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 -@@ -5313,27 +5199,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (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 -+ (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 -@@ -5509,27 +5378,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (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 -+ (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 -@@ -5592,27 +5444,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (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 -+ (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 -@@ -5648,17 +5483,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - 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 -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (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 -@@ -5745,7 +5573,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_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 - break 2 -@@ -5789,7 +5617,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_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 - break 2 -@@ -5902,27 +5730,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (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 -+ (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 -@@ -5977,27 +5788,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (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 -+ (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 -@@ -6032,27 +5826,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (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 -+ (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 -@@ -6088,27 +5865,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (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 -+ (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 -@@ -6311,17 +6071,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - 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 -- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (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 -@@ -6355,17 +6108,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - 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 -- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (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 -@@ -6430,17 +6176,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - 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 -- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (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 -@@ -6474,17 +6213,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - 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 -- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (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 -@@ -6525,7 +6257,7 @@ ac_compile='$F77 -c $FFLAGS conftest.$ac - ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_f77_compiler_gnu - if test -n "$ac_tool_prefix"; then -- for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn -+ for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn - 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 -@@ -6543,7 +6275,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_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_F77="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -6569,7 +6301,7 @@ fi - fi - if test -z "$F77"; then - ac_ct_F77=$F77 -- for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn -+ for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 -@@ -6587,7 +6319,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_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_F77="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -6694,27 +6426,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_f77_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes - else - echo "$as_me: failed program was:" >&5 -@@ -6757,27 +6472,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_f77_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_prog_f77_g=yes - else - echo "$as_me: failed program was:" >&5 -@@ -7232,7 +6930,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_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_AR="${ac_tool_prefix}ar" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -7272,7 +6970,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_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_AR="ar" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -7328,7 +7026,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_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_RANLIB="${ac_tool_prefix}ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -7368,7 +7066,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_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_RANLIB="ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -7424,7 +7122,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_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_STRIP="${ac_tool_prefix}strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -7464,7 +7162,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_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_STRIP="strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -8634,27 +8332,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -+ (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 - - aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } - }'` -@@ -8709,27 +8391,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -+ (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 - - aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } - }'` -@@ -9979,27 +9645,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -+ (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 - ac_cv_lib_dl_dlopen=yes - else - echo "$as_me: failed program was:" >&5 -@@ -10090,27 +9740,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -+ (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 - ac_cv_func_shl_load=yes - else - echo "$as_me: failed program was:" >&5 -@@ -10169,27 +9803,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -+ (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 - ac_cv_lib_dld_shl_load=yes - else - echo "$as_me: failed program was:" >&5 -@@ -10270,27 +9888,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -+ (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 - ac_cv_func_dlopen=yes - else - echo "$as_me: failed program was:" >&5 -@@ -10349,27 +9951,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -+ (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 - ac_cv_lib_dl_dlopen=yes - else - echo "$as_me: failed program was:" >&5 -@@ -10429,27 +10015,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -+ (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 - ac_cv_lib_svld_dlopen=yes - else - echo "$as_me: failed program was:" >&5 -@@ -10509,27 +10079,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -+ (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 - ac_cv_lib_dld_dld_link=yes - else - echo "$as_me: failed program was:" >&5 -@@ -11781,27 +11335,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -+ (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 - - aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } - }'` -@@ -11857,27 +11395,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -+ (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 - - aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } - }'` -@@ -15302,27 +14824,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -+ (exit $ac_status); } && { -+ test -z "$ac_f77_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - - aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } - }'` -@@ -15367,27 +14873,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -+ (exit $ac_status); } && { -+ test -z "$ac_f77_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - - aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } - }'` -@@ -17903,27 +17393,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -+ (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 - - aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } - }'` -@@ -17978,27 +17452,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -+ (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 - - aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } - }'` -@@ -20172,7 +19630,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_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_ms_librarian="yes" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -20255,7 +19713,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_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_FOR_BUILD="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -20323,31 +19781,6 @@ echo "${ECHO_T}$EXEEXT_FOR_BUILD" >&6; } +@@ -20043,31 +20041,6 @@ echo "${ECHO_T}$EXEEXT_FOR_BUILD" >&6; } @@ -1737,813 +50,7 @@ $NetBSD: patch-cb,v 1.1 2007/08/01 16:33:39 joerg Exp $ # Checks for header files. -@@ -20393,27 +19826,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (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 -+ (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 -@@ -20486,27 +19902,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -+ (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 - ac_cv_search_opendir=$ac_res - else - echo "$as_me: failed program was:" >&5 -@@ -20586,27 +19986,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -+ (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 - ac_cv_search_opendir=$ac_res - else - echo "$as_me: failed program was:" >&5 -@@ -20676,27 +20060,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (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 -+ (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 -@@ -20872,27 +20239,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (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 -+ (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 -@@ -20928,17 +20278,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - 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 -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (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 -@@ -21081,27 +20424,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_c_const=yes - else - echo "$as_me: failed program was:" >&5 -@@ -21155,27 +20481,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_c_inline=$ac_kw - else - echo "$as_me: failed program was:" >&5 -@@ -21245,27 +20554,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_type_pid_t=yes - else - echo "$as_me: failed program was:" >&5 -@@ -21357,27 +20649,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -+ (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 - eval "$as_ac_var=yes" - else - echo "$as_me: failed program was:" >&5 -@@ -21460,27 +20736,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -+ (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 - ac_cv_func__doprnt=yes - else - echo "$as_me: failed program was:" >&5 -@@ -21546,27 +20806,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (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 -+ (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 -@@ -21602,17 +20845,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - 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 -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (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 -@@ -21738,27 +20974,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -+ (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 - eval "$as_ac_var=yes" - else - echo "$as_me: failed program was:" >&5 -@@ -22050,27 +21270,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -+ (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 - eval "$as_ac_var=yes" - else - echo "$as_me: failed program was:" >&5 -@@ -22128,27 +21332,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -+ (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 - use_iconv=1 - else - echo "$as_me: failed program was:" >&5 -@@ -22195,27 +21383,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -+ (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 - use_iconv=true - else - echo "$as_me: failed program was:" >&5 -@@ -22277,7 +21449,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_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_ft_config="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -22398,27 +21570,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -+ (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 - eval "$as_ac_var=yes" - else - echo "$as_me: failed program was:" >&5 -@@ -22478,27 +21634,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_member_FT_Bitmap_Size_y_ppem=yes - else - echo "$as_me: failed program was:" >&5 -@@ -22536,27 +21675,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_member_FT_Bitmap_Size_y_ppem=yes - else - echo "$as_me: failed program was:" >&5 -@@ -22694,27 +21816,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (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 -+ (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 -@@ -22750,17 +21855,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - 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 -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (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 -@@ -22847,27 +21945,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (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 -+ (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 -@@ -22903,17 +21984,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - 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 -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (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 -@@ -23056,27 +22130,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -- { (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); }; } && -- { ac_try='test -s 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 -+ (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 - eval "$as_ac_var=yes" - else - echo "$as_me: failed program was:" >&5 -@@ -23166,7 +22224,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_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 - break 2 -@@ -23209,7 +22267,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_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_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -23581,7 +22639,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_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_HASDOCBOOK="yes" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -23684,7 +22742,7 @@ fi +@@ -23033,7 +23006,7 @@ fi @@ -2552,92 +59,7 @@ $NetBSD: patch-cb,v 1.1 2007/08/01 16:33:39 joerg Exp $ cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure -@@ -23869,7 +22927,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF - ## 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=: -@@ -23878,10 +22937,13 @@ if test -n "${ZSH_VERSION+set}" && (emul - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST - else -- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; -+esac -+ - fi --BIN_SH=xpg4; export BIN_SH # for Tru64 --DUALCASE=1; export DUALCASE # for MKS sh -+ -+ - - - # PATH needs CR -@@ -24105,19 +23167,28 @@ else - as_mkdir_p=false - fi - --# Find out whether ``test -x'' works. Don't use a zero-byte file, as --# systems may use methods other than mode bits to determine executability. --cat >conf$$.file <<_ASEOF --#! /bin/sh --exit 0 --_ASEOF --chmod +x conf$$.file --if test -x conf$$.file >/dev/null 2>&1; then -- as_executable_p="test -x" -+if test -x / >/dev/null 2>&1; then -+ as_test_x='test -x' - else -- as_executable_p=: -+ 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 --rm -f conf$$.file -+as_executable_p=$as_test_x - - # 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'" -@@ -24133,7 +23204,7 @@ exec 6>&1 - # values after options handling. - ac_log=" - This file was extended by $as_me, which was --generated by GNU Autoconf 2.60a. Invocation command line was -+generated by GNU Autoconf 2.61. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS -@@ -24186,7 +23257,7 @@ _ACEOF - cat >>$CONFIG_STATUS <<_ACEOF - ac_cs_version="\\ - config.status --configured by $0, generated by GNU Autoconf 2.60a, -+configured by $0, generated by GNU Autoconf 2.61, - with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" - - Copyright (C) 2006 Free Software Foundation, Inc. -@@ -24306,6 +23377,7 @@ do +@@ -23668,6 +23641,7 @@ do "fc-glyphname/Makefile") CONFIG_FILES="$CONFIG_FILES fc-glyphname/Makefile" ;; "fc-case/Makefile") CONFIG_FILES="$CONFIG_FILES fc-case/Makefile" ;; "fc-arch/Makefile") CONFIG_FILES="$CONFIG_FILES fc-arch/Makefile" ;; @@ -2645,7 +67,7 @@ $NetBSD: patch-cb,v 1.1 2007/08/01 16:33:39 joerg Exp $ "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "conf.d/Makefile") CONFIG_FILES="$CONFIG_FILES conf.d/Makefile" ;; "fc-cache/Makefile") CONFIG_FILES="$CONFIG_FILES fc-cache/Makefile" ;; -@@ -24542,7 +23614,6 @@ CROSS_COMPILING_TRUE!$CROSS_COMPILING_TR +@@ -23905,7 +23879,6 @@ CROSS_COMPILING_TRUE!$CROSS_COMPILING_TR CROSS_COMPILING_FALSE!$CROSS_COMPILING_FALSE$ac_delim CC_FOR_BUILD!$CC_FOR_BUILD$ac_delim EXEEXT_FOR_BUILD!$EXEEXT_FOR_BUILD$ac_delim @@ -2653,12 +75,12 @@ $NetBSD: patch-cb,v 1.1 2007/08/01 16:33:39 joerg Exp $ ICONV_LIBS!$ICONV_LIBS$ac_delim ft_config!$ft_config$ac_delim FREETYPE_LIBS!$FREETYPE_LIBS$ac_delim -@@ -24575,7 +23646,7 @@ LIBOBJS!$LIBOBJS$ac_delim +@@ -23938,7 +23911,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF -- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 54; then -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 53; then +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 55; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 54; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 |