support for external libtiff
[email protected] Thu, 6 Oct 2005 12:35:32 -0700
| Newsgroups | gmane.comp.lib.ivtools.patches |
|---|---|
| Message-ID | <[email protected]> |
--Apple-Mail-1--3722562 Content-Transfer-Encoding: 7bit Content-Type: application/octet-stream; x-unix-mode=0644; name="ivtools-051006-johnston-011" Content-Disposition: attachment; filename=ivtools-051006-johnston-011 Patch: ivtools-051006-johnston-011 For: ivtools-1.2.2 Author: [email protected] Subject: add support for external libtiff Requires: This is an intermediate patch to ivtools-1.2.2. To apply, cd to the top-level directory of the ivtools source tree (the directory with src and config subdirs), and apply like this: patch -p0 <ThisFile Summary of Changes: - add support for an external libtiff with a --with-tiff (and -with-tiff-lib) configure arguments. Index: bdvtable/Imakefile diff -c bdvtable/Imakefile:1.1 bdvtable/Imakefile:1.2 *** bdvtable/Imakefile:1.1 Tue Jun 15 08:54:39 2004 --- src/glyphs/bdvtable/Imakefile Thu Oct 6 12:27:02 2005 *************** *** 13,18 **** --- 13,19 ---- #if HasDynamicSharedLibraries APP_CCDEPLIBS = $(DEPIVGLYPH) #endif + OTHER_CCLDLIBS = $(TIFF_CCLDLIBS) Use_libInterViews() Index: comdraw/Imakefile diff -c comdraw/Imakefile:1.1 comdraw/Imakefile:1.2 *** comdraw/Imakefile:1.1 Tue Jun 15 08:56:32 2004 --- src/comdraw/Imakefile Thu Oct 6 12:27:20 2005 *************** *** 36,42 **** OTHER_CCDEFINES = $(ACE_CCDEFINES) OTHER_CCINCLUDES = $(ACE_CCINCLUDES) ! OTHER_CCLDLIBS = $(CLIPPOLY_CCLDLIBS) $(ACE_CCLDLIBS) Use_libUnidraw() Use_2_6() --- 36,42 ---- OTHER_CCDEFINES = $(ACE_CCDEFINES) OTHER_CCINCLUDES = $(ACE_CCINCLUDES) ! OTHER_CCLDLIBS = $(CLIPPOLY_CCLDLIBS) $(ACE_CCLDLIBS) $(TIFF_CCLDLIBS) Use_libUnidraw() Use_2_6() Index: config_ivtools/config.defs.in diff -c config_ivtools/config.defs.in:1.1 config_ivtools/config.defs.in:1.2 *** config_ivtools/config.defs.in:1.1 Tue Jun 15 08:58:30 2004 --- config/config.defs.in Thu Oct 6 12:27:35 2005 *************** *** 45,50 **** --- 45,56 ---- #define QtIncDir @QTINCS@ #endif + #if @TIFF_ENABLED@ + #define TiffDir @TIFF@ + #define TiffLibDir @TIFFLIBS@ + #define TiffIncDir @TIFFINCS@ + #endif + #undef CCDriver #define CCDriver @CXX@ Index: config_ivtools/params.def diff -c config_ivtools/params.def:1.4 config_ivtools/params.def:1.5 *** config_ivtools/params.def:1.4 Tue Oct 4 10:37:02 2005 --- config/params.def Thu Oct 6 12:27:35 2005 *************** *** 489,496 **** #endif #endif #ifndef OtherCCDefines ! #define OtherCCDefines $(CLIPPOLY_CCDEFINES) $(ACE_CCDEFINES) $(IUE_DEFINES) $(QT_DEFINES) #endif CCDEFINES = CCDefines --- 489,504 ---- #endif #endif + #ifndef TiffCCDefines + #ifdef TiffDir + #define TiffCCDefines -DEXTERN_TIFF + #else + #define TiffCCDefines /**/ + #endif + #endif + #ifndef OtherCCDefines ! #define OtherCCDefines $(CLIPPOLY_CCDEFINES) $(ACE_CCDEFINES) $(IUE_DEFINES) $(QT_DEFINES) $(TIFF_CCDEFINES) #endif CCDEFINES = CCDefines *************** *** 508,513 **** --- 516,522 ---- ACE_CCDEFINES = AceCCDefines IUE_CCDEFINES = IueCCDefines QT_CCDEFINES = QtCCDefines + TIFF_CCDEFINES = TiffCCDefines /* * Define the includes passed to the CC driver when we compile a C++ file. *************** *** 578,585 **** #endif #endif #ifndef OtherCCIncludes ! #define OtherCCIncludes $(CLIPPOLY_CCINCLUDES) $(ACE_CCINCLUDES) $(IUE_CCINCLUDES) $(QT_CCINCLUDES) #endif CCINCLUDES = CCIncludes --- 587,602 ---- #endif #endif + #ifndef TiffCCIncludes + #ifdef TiffDir + #define TiffCCIncludes -I$(TIFFINCS) + #else + #define TiffCCIncludes /**/ + #endif + #endif + #ifndef OtherCCIncludes ! #define OtherCCIncludes $(CLIPPOLY_CCINCLUDES) $(ACE_CCINCLUDES) $(IUE_CCINCLUDES) $(QT_CCINCLUDES) $(TIFF_CCINCLUDES) #endif CCINCLUDES = CCIncludes *************** *** 1033,1040 **** #define QtLibBase libQt.so /* only for installing symbolic link */ #endif #ifndef OtherCCLdLibs ! #define OtherCCLdLibs $(CLIPPOLY_CCLDLIBS) $(ACE_CCLDLIBS) $(IUE_CCLDLIBS) $(QT_CCLDLIBS) #endif #ifndef SharedCCLdLibs --- 1050,1077 ---- #define QtLibBase libQt.so /* only for installing symbolic link */ #endif + #ifndef TiffCCLdLibs + #ifdef TiffLibDir + #define TiffCCLdLibs -L$(TIFFLIBDIR) -lTIFF + #else + #define TiffCCLdLibs /**/ + #endif + #endif + + #ifndef TiffLibDir + #ifdef TiffDir + #define TiffLibDir TiffDir/tiff + #else + #define TiffLibDir /**/ + #endif + #endif + + #ifndef TiffLibBase + #define TiffLibBase libTIFF.so /* only for installing symbolic link */ + #endif + #ifndef OtherCCLdLibs ! #define OtherCCLdLibs $(CLIPPOLY_CCLDLIBS) $(ACE_CCLDLIBS) $(IUE_CCLDLIBS) $(QT_CCLDLIBS) $(TIFF_CCLDLIBS) #endif #ifndef SharedCCLdLibs *************** *** 1065,1070 **** --- 1102,1110 ---- QT_CCLDLIBS = QtCCLdLibs QTLIBDIR = QtLibDir QTLIBBASE = QtLibBase + TIFF_CCLDLIBS = TiffCCLdLibs + TIFFLIBDIR = TiffLibDir + TIFFLIBBASE = TiffLibBase /* * Define how to install a program, library, header, man page, or data file. Index: dclock/Imakefile diff -c dclock/Imakefile:1.1 dclock/Imakefile:1.2 *** dclock/Imakefile:1.1 Tue Jun 15 08:54:17 2004 --- src/dclock/Imakefile Thu Oct 6 12:26:58 2005 *************** *** 7,12 **** --- 7,13 ---- #ifdef InObjectCodeDir CLIPPOLY_CCLDLIBS = + OTHER_CCLDLIBS = $(TIFF_CCLDLIBS) Use_libInterViews() Use_2_6() Index: drawserv_/Imakefile diff -c drawserv_/Imakefile:1.1 drawserv_/Imakefile:1.2 *** drawserv_/Imakefile:1.1 Tue Jun 15 08:56:53 2004 --- src/drawserv_/Imakefile Thu Oct 6 12:27:23 2005 *************** *** 42,48 **** OTHER_CCDEFINES = $(ACE_CCDEFINES) OTHER_CCINCLUDES = $(ACE_CCINCLUDES) ! OTHER_CCLDLIBS = $(CLIPPOLY_CCLDLIBS) $(ACE_CCLDLIBS) Use_libUnidraw() Use_2_6() --- 42,48 ---- OTHER_CCDEFINES = $(ACE_CCDEFINES) OTHER_CCINCLUDES = $(ACE_CCINCLUDES) ! OTHER_CCLDLIBS = $(CLIPPOLY_CCLDLIBS) $(ACE_CCLDLIBS) $(TIFF_CCLDLIBS) Use_libUnidraw() Use_2_6() Index: drawtool/Imakefile diff -c drawtool/Imakefile:1.1 drawtool/Imakefile:1.2 *** drawtool/Imakefile:1.1 Tue Jun 15 08:56:26 2004 --- src/drawtool/Imakefile Thu Oct 6 12:27:19 2005 *************** *** 34,40 **** OTHER_CCDEFINES = $(ACE_CCDEFINES) OTHER_CCINCLUDES = $(ACE_CCINCLUDES) ! OTHER_CCLDLIBS = $(CLIPPOLY_CCLDLIBS) $(ACE_CCLDLIBS) Use_libUnidraw() Use_2_6() --- 34,40 ---- OTHER_CCDEFINES = $(ACE_CCDEFINES) OTHER_CCINCLUDES = $(ACE_CCINCLUDES) ! OTHER_CCLDLIBS = $(CLIPPOLY_CCLDLIBS) $(ACE_CCLDLIBS) $(TIFF_CCLDLIBS) Use_libUnidraw() Use_2_6() Index: flipbook/Imakefile diff -c flipbook/Imakefile:1.1 flipbook/Imakefile:1.2 *** flipbook/Imakefile:1.1 Tue Jun 15 08:56:38 2004 --- src/flipbook/Imakefile Thu Oct 6 12:27:21 2005 *************** *** 38,44 **** OTHER_CCDEFINES = $(ACE_CCDEFINES) OTHER_CCINCLUDES = $(ACE_CCINCLUDES) ! OTHER_CCLDLIBS = $(CLIPPOLY_CCLDLIBS) $(ACE_CCLDLIBS) Use_libUnidraw() Use_2_6() --- 38,44 ---- OTHER_CCDEFINES = $(ACE_CCDEFINES) OTHER_CCINCLUDES = $(ACE_CCINCLUDES) ! OTHER_CCLDLIBS = $(CLIPPOLY_CCLDLIBS) $(ACE_CCLDLIBS) $(TIFF_CCLDLIBS) Use_libUnidraw() Use_2_6() Index: formdemo/Imakefile diff -c formdemo/Imakefile:1.1 formdemo/Imakefile:1.2 *** formdemo/Imakefile:1.1 Tue Jun 15 08:54:41 2004 --- src/glyphs/formdemo/Imakefile Thu Oct 6 12:27:03 2005 *************** *** 13,18 **** --- 13,19 ---- #if HasDynamicSharedLibraries APP_CCDEPLIBS = $(DEPIVGLYPH) #endif + OTHER_CCLDLIBS = $(TIFF_CCLDLIBS) Use_libInterViews() Index: gclock/Imakefile diff -c gclock/Imakefile:1.1 gclock/Imakefile:1.2 *** gclock/Imakefile:1.1 Tue Jun 15 08:54:43 2004 --- src/glyphs/gclock/Imakefile Thu Oct 6 12:27:04 2005 *************** *** 13,18 **** --- 13,19 ---- #if HasDynamicSharedLibraries APP_CCDEPLIBS = $(DEPTIME) $(DEPIVGLYPH) #endif + OTHER_CCLDLIBS = $(TIFF_CCLDLIBS) Use_libInterViews() Index: glyph_morpher/Imakefile diff -c glyph_morpher/Imakefile:1.1 glyph_morpher/Imakefile:1.2 *** glyph_morpher/Imakefile:1.1 Tue Jun 15 08:54:48 2004 --- src/glyphs/morpher/Imakefile Thu Oct 6 12:27:06 2005 *************** *** 12,17 **** --- 12,18 ---- #if HasDynamicSharedLibraries APP_CCDEPLIBS = $(DEPIVGLYPH) #endif + OTHER_CCLDLIBS = $(TIFF_CCLDLIBS) Use_libInterViews() ComplexProgramTargetNoInstall(imorpher) Index: glyphterp/Imakefile diff -c glyphterp/Imakefile:1.1 glyphterp/Imakefile:1.2 *** glyphterp/Imakefile:1.1 Tue Jun 15 08:55:51 2004 --- src/glyphterp/Imakefile Thu Oct 6 12:27:16 2005 *************** *** 13,19 **** #endif OTHER_CCDEFINES = $(ACE_CCDEFINES) OTHER_CCINCLUDES = $(ACE_CCINCLUDES) ! OTHER_CCLDLIBS = $(ACE_CCLDLIBS) Use_libInterViews() --- 13,19 ---- #endif OTHER_CCDEFINES = $(ACE_CCDEFINES) OTHER_CCINCLUDES = $(ACE_CCINCLUDES) ! OTHER_CCLDLIBS = $(ACE_CCLDLIBS) $(TIFF_CCLDLIBS) Use_libInterViews() Index: graphdraw/Imakefile diff -c graphdraw/Imakefile:1.1 graphdraw/Imakefile:1.2 *** graphdraw/Imakefile:1.1 Tue Jun 15 08:56:45 2004 --- src/graphdraw/Imakefile Thu Oct 6 12:27:22 2005 *************** *** 37,43 **** OTHER_CCDEFINES = $(ACE_CCDEFINES) OTHER_CCINCLUDES = $(ACE_CCINCLUDES) ! OTHER_CCLDLIBS = $(CLIPPOLY_CCLDLIBS) $(ACE_CCLDLIBS) Use_libUnidraw() Use_2_6() --- 37,43 ---- OTHER_CCDEFINES = $(ACE_CCDEFINES) OTHER_CCINCLUDES = $(ACE_CCINCLUDES) ! OTHER_CCLDLIBS = $(CLIPPOLY_CCLDLIBS) $(ACE_CCLDLIBS) $(TIFF_CCLDLIBS) Use_libUnidraw() Use_2_6() Index: iclass/Imakefile diff -c iclass/Imakefile:1.1 iclass/Imakefile:1.2 *** iclass/Imakefile:1.1 Tue Jun 15 08:54:20 2004 --- src/iclass/Imakefile Thu Oct 6 12:26:59 2005 *************** *** 7,12 **** --- 7,13 ---- #ifdef InObjectCodeDir CLIPPOLY_CCLDLIBS = + OTHER_CCLDLIBS = $(TIFF_CCLDLIBS) Use_libInterViews() Use_2_6() Index: idemo/Imakefile diff -c idemo/Imakefile:1.1 idemo/Imakefile:1.2 *** idemo/Imakefile:1.1 Tue Jun 15 08:54:22 2004 --- src/idemo/Imakefile Thu Oct 6 12:27:00 2005 *************** *** 7,12 **** --- 7,13 ---- #ifdef InObjectCodeDir CLIPPOLY_CCLDLIBS = + OTHER_CCLDLIBS = $(TIFF_CCLDLIBS) Use_libInterViews() ComplexProgramTarget(idemo) Index: idraw/Imakefile diff -c idraw/Imakefile:1.1 idraw/Imakefile:1.2 *** idraw/Imakefile:1.1 Tue Jun 15 08:56:07 2004 --- src/idraw/Imakefile Thu Oct 6 12:27:17 2005 *************** *** 12,17 **** --- 12,18 ---- #if HasDynamicSharedLibraries APP_CCDEPLIBS = $(DEPUNIIDRAW) #endif + OTHER_CCLDLIBS = $(TIFF_CCLDLIBS) Use_libUnidraw() Use_2_6() Index: ivtext/Imakefile diff -c ivtext/Imakefile:1.1 ivtext/Imakefile:1.2 *** ivtext/Imakefile:1.1 Tue Jun 15 08:54:34 2004 --- src/ivtext/Imakefile Thu Oct 6 12:27:01 2005 *************** *** 12,17 **** --- 12,18 ---- #if HasDynamicSharedLibraries APP_CCDEPLIBS = $(DEPIVGLYPH) #endif + OTHER_CCLDLIBS = $(TIFF_CCLDLIBS) Use_libInterViews() ComplexProgramTarget(ivtext) Index: meter/Imakefile diff -c meter/Imakefile:1.1 meter/Imakefile:1.2 *** meter/Imakefile:1.1 Tue Jun 15 08:54:45 2004 --- src/glyphs/meter/Imakefile Thu Oct 6 12:27:05 2005 *************** *** 13,18 **** --- 13,19 ---- #if HasDynamicSharedLibraries APP_CCDEPLIBS = $(DEPIVGLYPH) #endif + OTHER_CCLDLIBS = $(TIFF_CCLDLIBS) Use_libInterViews() Index: radiogroup/Imakefile diff -c radiogroup/Imakefile:1.1 radiogroup/Imakefile:1.2 *** radiogroup/Imakefile:1.1 Tue Jun 15 08:54:50 2004 --- src/glyphs/radiogroup/Imakefile Thu Oct 6 12:27:07 2005 *************** *** 13,18 **** --- 13,19 ---- #if HasDynamicSharedLibraries APP_CCDEPLIBS = $(DEPIVGLYPH) #endif + OTHER_CCLDLIBS = $(TIFF_CCLDLIBS) Use_libInterViews() Index: scrollable/Imakefile diff -c scrollable/Imakefile:1.1 scrollable/Imakefile:1.2 *** scrollable/Imakefile:1.1 Tue Jun 15 08:54:52 2004 --- src/glyphs/scrollable/Imakefile Thu Oct 6 12:27:08 2005 *************** *** 12,17 **** --- 12,18 ---- #if HasDynamicSharedLibraries APP_CCDEPLIBS = $(DEPIVGLYPH) #endif + OTHER_CCLDLIBS = $(TIFF_CCLDLIBS) Use_libInterViews() ComplexProgramTargetNoInstall(scrollable) Index: scrollfield/Imakefile diff -c scrollfield/Imakefile:1.1 scrollfield/Imakefile:1.2 *** scrollfield/Imakefile:1.1 Tue Jun 15 08:54:54 2004 --- src/glyphs/scrollfield/Imakefile Thu Oct 6 12:27:09 2005 *************** *** 12,17 **** --- 12,18 ---- #if HasDynamicSharedLibraries APP_CCDEPLIBS = $(DEPIVGLYPH) #endif + OTHER_CCLDLIBS = $(TIFF_CCLDLIBS) Use_libInterViews() ComplexProgramTargetNoInstall(scrollfield) Index: src_interviews/tiff.c diff -c src_interviews/tiff.c:1.1 src_interviews/tiff.c:1.2 *** src_interviews/tiff.c:1.1 Tue Jun 15 08:53:55 2004 --- src/InterViews/tiff.c Thu Oct 6 12:26:55 2005 *************** *** 25,31 **** --- 25,35 ---- #include <InterViews/color.h> #include <InterViews/raster.h> #include <InterViews/tiff.h> + #ifdef EXTERN_TIFF + #include <tiffio.h> + #else #include <TIFF/tiffio.h> + #endif #include <stdlib.h> #if defined(howmany) *************** *** 41,51 **** class TIFFRasterImpl; ! typedef void (TIFFRasterImpl::*tileContigRoutine)( u_long*, const u_char*, const RGBvalue*, u_long, u_long, int, int ); ! typedef void (TIFFRasterImpl::*tileSeparateRoutine)( u_long*, const u_char*, const u_char*, const u_char*, const RGBvalue*, u_long, u_long, int, int ); --- 45,55 ---- class TIFFRasterImpl; ! typedef void (TIFFRasterImpl::*tileContigRoutineIv)( u_long*, const u_char*, const RGBvalue*, u_long, u_long, int, int ); ! typedef void (TIFFRasterImpl::*tileSeparateRoutineIv)( u_long*, const u_char*, const u_char*, const u_char*, const RGBvalue*, u_long, u_long, int, int ); *************** *** 135,142 **** const RGBvalue* Map, u_long w, u_long h, int fromskew, int toskew ); ! tileContigRoutine pickTileContigCase(const RGBvalue* Map); ! tileSeparateRoutine pickTileSeparateCase(const RGBvalue* Map); }; TIFFRasterImpl::TIFFRasterImpl() {} --- 139,146 ---- const RGBvalue* Map, u_long w, u_long h, int fromskew, int toskew ); ! tileContigRoutineIv pickTileContigCase(const RGBvalue* Map); ! tileSeparateRoutineIv pickTileSeparateCase(const RGBvalue* Map); }; TIFFRasterImpl::TIFFRasterImpl() {} *************** *** 373,379 **** TIFFError(TIFFFileName(tif_), "No space for tile buffer"); return false; } ! tileContigRoutine put = pickTileContigCase(Map); u_long tw; TIFFGetField(tif_, TIFFTAG_TILEWIDTH, &tw); u_long th; --- 377,383 ---- TIFFError(TIFFFileName(tif_), "No space for tile buffer"); return false; } ! tileContigRoutineIv put = pickTileContigCase(Map); u_long tw; TIFFGetField(tif_, TIFFTAG_TILEWIDTH, &tw); u_long th; *************** *** 426,432 **** u_char* r = buf; u_char* g = r + tilesize; u_char* b = g + tilesize; ! tileSeparateRoutine put = pickTileSeparateCase(Map); u_long tw; TIFFGetField(tif_, TIFFTAG_TILEWIDTH, &tw); u_long th; --- 430,436 ---- u_char* r = buf; u_char* g = r + tilesize; u_char* b = g + tilesize; ! tileSeparateRoutineIv put = pickTileSeparateCase(Map); u_long tw; TIFFGetField(tif_, TIFFTAG_TILEWIDTH, &tw); u_long th; *************** *** 482,488 **** TIFFError(TIFFFileName(tif_), "No space for strip buffer"); return (false); } ! tileContigRoutine put = pickTileContigCase(Map); u_long y = setorientation(h); int toskew = (int)(orientation_ == ORIENTATION_TOPLEFT ? -w + -w : -w + w); u_long rowsperstrip = (u_long) -1L; --- 486,492 ---- TIFFError(TIFFFileName(tif_), "No space for strip buffer"); return (false); } ! tileContigRoutineIv put = pickTileContigCase(Map); u_long y = setorientation(h); int toskew = (int)(orientation_ == ORIENTATION_TOPLEFT ? -w + -w : -w + w); u_long rowsperstrip = (u_long) -1L; *************** *** 519,525 **** u_char* r = buf; u_char* g = r + stripsize; u_char* b = g + stripsize; ! tileSeparateRoutine put = pickTileSeparateCase(Map); u_long y = setorientation(h); int toskew = (int)(orientation_ == ORIENTATION_TOPLEFT ? -w + -w : -w + w); u_long rowsperstrip = (u_long) -1L; --- 523,529 ---- u_char* r = buf; u_char* g = r + stripsize; u_char* b = g + stripsize; ! tileSeparateRoutineIv put = pickTileSeparateCase(Map); u_long y = setorientation(h); int toskew = (int)(orientation_ == ORIENTATION_TOPLEFT ? -w + -w : -w + w); u_long rowsperstrip = (u_long) -1L; *************** *** 1004,1011 **** /* * Select the appropriate conversion routine for packed data. */ ! tileContigRoutine TIFFRasterImpl::pickTileContigCase(const RGBvalue*) { ! tileContigRoutine put = 0; switch (photometric_) { case PHOTOMETRIC_RGB: if (bitspersample_ == 8) { --- 1008,1015 ---- /* * Select the appropriate conversion routine for packed data. */ ! tileContigRoutineIv TIFFRasterImpl::pickTileContigCase(const RGBvalue*) { ! tileContigRoutineIv put = 0; switch (photometric_) { case PHOTOMETRIC_RGB: if (bitspersample_ == 8) { *************** *** 1041,1047 **** * NB: we assume that unpacked single channel data is directed * to the "packed routines. */ ! tileSeparateRoutine TIFFRasterImpl::pickTileSeparateCase(const RGBvalue*) { if (bitspersample_ == 8) { return &TIFFRasterImpl::putRGBseparate8bittile; } --- 1045,1051 ---- * NB: we assume that unpacked single channel data is directed * to the "packed routines. */ ! tileSeparateRoutineIv TIFFRasterImpl::pickTileSeparateCase(const RGBvalue*) { if (bitspersample_ == 8) { return &TIFFRasterImpl::putRGBseparate8bittile; } Index: src_iv/Imakefile diff -c src_iv/Imakefile:1.1 src_iv/Imakefile:1.2 *** src_iv/Imakefile:1.1 Tue Jun 15 08:53:48 2004 --- src/IV/Imakefile Thu Oct 6 12:26:54 2005 *************** *** 6,11 **** --- 6,16 ---- #ifdef InObjectCodeDir + #ifdef TiffDir + OTHER_CCDEFINES = $(TIFF_CCDEFINES) + OTHER_CCINCLUDES = $(TIFF_CCINCLUDES) + #endif + #if BuildIV_2_6 #define IV_2_6Srcs $(IV_2_6)$(SLASH)*.$(CCSUFFIX) #else *************** *** 217,222 **** --- 222,228 ---- OSObjFlags(string,$(OPTIMIZE_CCFLAGS)) OSObj(ustring) + #ifndef TiffDir #include <InterViews/TIFF.def> #define TIFFObj(file) TIFFObjFlags(file,NullParameter) #define TIFFObjFlags(file,f)\ *************** *** 260,265 **** --- 266,272 ---- ./mkg3states > g3states.h clean:: $(RM) mkg3states g3states.h + #endif InstallXDefaultAs(../InterViews.defaults,$(LIBALLDIR),InterViews) Index: src_iv-2_6/rubrect.c diff -c src_iv-2_6/rubrect.c:1.1 src_iv-2_6/rubrect.c:1.2 *** src_iv-2_6/rubrect.c:1.1 Tue Jun 15 08:54:00 2004 --- src/IV-2_6/rubrect.c Thu Oct 6 12:26:56 2005 *************** *** 36,44 **** --- 36,46 ---- #include <float.h> #else #include <math.h> + #ifndef MAXFLOAT #define MAXFLOAT HUGE_VAL #endif #endif + #endif RubberRect::RubberRect( Painter* p, Canvas* c, IntCoord x0, IntCoord y0, IntCoord x1, IntCoord y1, Index: strchooser/Imakefile diff -c strchooser/Imakefile:1.1 strchooser/Imakefile:1.2 *** strchooser/Imakefile:1.1 Tue Jun 15 08:54:56 2004 --- src/glyphs/strchooser/Imakefile Thu Oct 6 12:27:10 2005 *************** *** 12,17 **** --- 12,18 ---- #if HasDynamicSharedLibraries APP_CCDEPLIBS = $(DEPIVGLYPH) #endif + OTHER_CCLDLIBS = $(TIFF_CCLDLIBS) Use_libInterViews() Index: timestamp/Imakefile diff -c timestamp/Imakefile:1.1 timestamp/Imakefile:1.2 *** timestamp/Imakefile:1.1 Tue Jun 15 08:54:58 2004 --- src/glyphs/timestamp/Imakefile Thu Oct 6 12:27:11 2005 *************** *** 13,18 **** --- 13,19 ---- #if HasDynamicSharedLibraries APP_CCDEPLIBS = $(DEPTIME) $(DEPIVGLYPH) #endif + OTHER_CCLDLIBS = $(TIFF_CCLDLIBS) Use_libInterViews() Index: top_ivtools/configure diff -c top_ivtools/configure:1.1 top_ivtools/configure:1.2 *** top_ivtools/configure:1.1 Tue Jun 15 08:53:20 2004 --- ./configure Thu Oct 6 12:26:49 2005 *************** *** 1,9 **** #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.57. # ! # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 ! # Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## --- 1,8 ---- #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.59. # ! # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## *************** *** 20,28 **** elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi # Support unset when possible. ! if (FOO=FOO; unset FOO) >/dev/null 2>&1; then as_unset=unset else as_unset=false --- 19,28 ---- elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi + DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. ! if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then as_unset=unset else as_unset=false *************** *** 41,47 **** LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ LC_TELEPHONE LC_TIME do ! if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else $as_unset $as_var --- 41,47 ---- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ LC_TELEPHONE LC_TIME do ! if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else $as_unset $as_var *************** *** 218,233 **** if mkdir -p . 2>/dev/null; then as_mkdir_p=: else as_mkdir_p=false fi as_executable_p="test -f" # Sed expression to map a string onto a valid CPP name. ! as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" # Sed expression to map a string onto a valid variable name. ! as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" # IFS --- 218,234 ---- if mkdir -p . 2>/dev/null; then as_mkdir_p=: else + test -d ./-p && rmdir ./-p as_mkdir_p=false fi as_executable_p="test -f" # 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'" # Sed expression to map a string onto a valid variable name. ! as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" # IFS *************** *** 271,277 **** PACKAGE_BUGREPORT= ac_unique_file="configure.in" ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC CXXCPP RANLIB ac_ct_RANLIB CPP CXX_INCLUDE_DIR LIBSTDCPLUSPLUS2 LIBSTDCPLUSPLUS3 x_includes x_libraries ACE ACE_LIBS ACE_ENABLED CLIPPOLY CLIPPOLY_LIBS CLIPPOLY_ENABLED FRESCOLIBS FRESCOINCS FRESCO_ENABLED IUE IUELIBS IUEINCS IUE_ENABLED QT QTLIBS QTINCS QT_ENABLED IV IV_LIBS NO_BOOL PWD INSTALLRELATIVE USERPATH INSTALLSUBDIR ac_cv_type_socklen_t LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. --- 272,278 ---- PACKAGE_BUGREPORT= ac_unique_file="configure.in" ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC CXXCPP RANLIB ac_ct_RANLIB CPP CXX_INCLUDE_DIR LIBSTDCPLUSPLUS2 LIBSTDCPLUSPLUS3 x_includes x_libraries ACE ACE_LIBS ACE_ENABLED CLIPPOLY CLIPPOLY_LIBS CLIPPOLY_ENABLED TIFF TIFFLIBS TIFFINCS TIFF_ENABLED IUE IUELIBS IUEINCS IUE_ENABLED QT QTLIBS QTINCS QT_ENABLED IV IV_LIBS NO_BOOL PWD INSTALLRELATIVE USERPATH INSTALLSUBDIR ac_cv_type_socklen_t LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. *************** *** 630,636 **** # Be sure to have absolute paths. for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ ! localstatedir libdir includedir oldincludedir infodir mandir do eval ac_val=$`echo $ac_var` case $ac_val in --- 631,637 ---- # Be sure to have absolute paths. for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ ! localstatedir libdir includedir oldincludedir infodir mandir do eval ac_val=$`echo $ac_var` case $ac_val in *************** *** 670,679 **** # Try the directory containing this script, then its parent. ac_confdir=`(dirname "$0") 2>/dev/null || $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ! X"$0" : 'X\(//\)[^/]' \| \ ! X"$0" : 'X\(//\)$' \| \ ! X"$0" : 'X\(/\)' \| \ ! . : '\(.\)' 2>/dev/null || echo X"$0" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } --- 671,680 ---- # Try the directory containing this script, then its parent. ac_confdir=`(dirname "$0") 2>/dev/null || $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ! X"$0" : 'X\(//\)[^/]' \| \ ! X"$0" : 'X\(//\)$' \| \ ! X"$0" : 'X\(/\)' \| \ ! . : '\(.\)' 2>/dev/null || echo X"$0" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } *************** *** 777,824 **** cat <<_ACEOF Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX ! [$ac_default_prefix] ! --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX ! [PREFIX] ! ! By default, \`make install' will install all the files in ! \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify ! an installation prefix other than \`$ac_default_prefix' using \`--prefix', ! for instance \`--prefix=\$HOME'. ! ! For better control, use the options below. ! ! Fine tuning of the installation directories: ! --bindir=DIR user executables [EPREFIX/bin] ! --sbindir=DIR system admin executables [EPREFIX/sbin] ! --libexecdir=DIR program executables [EPREFIX/libexec] ! --datadir=DIR read-only architecture-independent data [PREFIX/share] ! --sysconfdir=DIR read-only single-machine data [PREFIX/etc] ! --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] ! --localstatedir=DIR modifiable single-machine data [PREFIX/var] ! --libdir=DIR object code libraries [EPREFIX/lib] ! --includedir=DIR C header files [PREFIX/include] ! --oldincludedir=DIR C header files for non-gcc [/usr/include] ! --infodir=DIR info documentation [PREFIX/info] ! --mandir=DIR man documentation [PREFIX/man] ! _ACEOF ! ! cat <<\_ACEOF ! ! X features: ! --x-includes=DIR X include files are in DIR ! --x-libraries=DIR X library files are in DIR ! ! System types: ! --build=BUILD configure for building on BUILD [guessed] ! --host=HOST cross-compile to build programs to run on HOST [BUILD] ! _ACEOF ! fi ! ! if test -n "$ac_init_help"; then ! ! cat <<\_ACEOF ! Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --- 778,784 ---- cat <<_ACEOF Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX ! [$ac_default_prefix] Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] *************** *** 833,840 **** --with-ace-libs=<path> Path to ACE libraries --with-clippoly=<path> Path to clippoly include file --with-clippoly-libs=<path> Path to clippoly libraries ! --with-fresco=<path> path to Fresco include files (not-used) ! --with-fresco-libs=<path> path to compiled Fresco libs (not-used) --with-iue=<path> path to IUE directory --with-iue-libs=<path> path to compiled IUE libs --with-qt=<path> path to QT directory --- 793,800 ---- --with-ace-libs=<path> Path to ACE libraries --with-clippoly=<path> Path to clippoly include file --with-clippoly-libs=<path> Path to clippoly libraries ! --with-tiff=<path> path to installed Tiff files ! --with-tiff-libs=<path> path to compiled Tiff libs --with-iue=<path> path to IUE directory --with-iue-libs=<path> path to compiled IUE libs --with-qt=<path> path to QT directory *************** *** 889,900 **** ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac ! # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be ! # absolute. ! ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` ! ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` ! ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` ! ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` cd $ac_dir # Check for guested configure; otherwise get Cygnus style configure. --- 849,893 ---- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac ! ! # Do not use `cd foo && pwd` to compute absolute paths, because ! # the directories may not exist. ! case `pwd` in ! .) ac_abs_builddir="$ac_dir";; ! *) ! case "$ac_dir" in ! .) ac_abs_builddir=`pwd`;; ! [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; ! *) ac_abs_builddir=`pwd`/"$ac_dir";; ! esac;; ! esac ! case $ac_abs_builddir in ! .) ac_abs_top_builddir=${ac_top_builddir}.;; ! *) ! case ${ac_top_builddir}. in ! .) ac_abs_top_builddir=$ac_abs_builddir;; ! [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; ! *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; ! esac;; ! esac ! case $ac_abs_builddir in ! .) ac_abs_srcdir=$ac_srcdir;; ! *) ! case $ac_srcdir in ! .) ac_abs_srcdir=$ac_abs_builddir;; ! [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; ! *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; ! esac;; ! esac ! case $ac_abs_builddir in ! .) ac_abs_top_srcdir=$ac_top_srcdir;; ! *) ! case $ac_top_srcdir in ! .) ac_abs_top_srcdir=$ac_abs_builddir;; ! [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; ! *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; ! esac;; ! esac cd $ac_dir # Check for guested configure; otherwise get Cygnus style configure. *************** *** 905,911 **** echo $SHELL $ac_srcdir/configure --help=recursive elif test -f $ac_srcdir/configure.ac || ! test -f $ac_srcdir/configure.in; then echo $ac_configure --help else --- 898,904 ---- echo $SHELL $ac_srcdir/configure --help=recursive elif test -f $ac_srcdir/configure.ac || ! test -f $ac_srcdir/configure.in; then echo $ac_configure --help else *************** *** 919,926 **** if $ac_init_version; then cat <<\_ACEOF ! Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 ! Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF --- 912,918 ---- if $ac_init_version; then cat <<\_ACEOF ! Copyright (C) 2003 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF *************** *** 932,938 **** running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was ! generated by GNU Autoconf 2.57. Invocation command line was $ $0 $@ --- 924,930 ---- running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was ! generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ *************** *** 1009,1027 **** 2) ac_configure_args1="$ac_configure_args1 '$ac_arg'" if test $ac_must_keep_next = true; then ! ac_must_keep_next=false # Got value, back to normal. else ! case $ac_arg in ! *=* | --config-cache | -C | -disable-* | --disable-* \ ! | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ ! | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ ! | -with-* | --with-* | -without-* | --without-* | --x) ! case "$ac_configure_args0 " in ! "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; ! esac ! ;; ! -* ) ac_must_keep_next=true ;; ! esac fi ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" # Get rid of the leading space. --- 1001,1019 ---- 2) ac_configure_args1="$ac_configure_args1 '$ac_arg'" if test $ac_must_keep_next = true; then ! ac_must_keep_next=false # Got value, back to normal. else ! case $ac_arg in ! *=* | --config-cache | -C | -disable-* | --disable-* \ ! | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ ! | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ ! | -with-* | --with-* | -without-* | --without-* | --x) ! case "$ac_configure_args0 " in ! "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; ! esac ! ;; ! -* ) ac_must_keep_next=true ;; ! esac fi ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" # Get rid of the leading space. *************** *** 1055,1066 **** case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in *ac_space=\ *) sed -n \ ! "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; ! s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" ;; *) sed -n \ ! "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; } --- 1047,1058 ---- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in *ac_space=\ *) sed -n \ ! "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; ! s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" ;; *) sed -n \ ! "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; } *************** *** 1089,1095 **** for ac_var in $ac_subst_files do eval ac_val=$`echo $ac_var` ! echo "$ac_var='"'"'$ac_val'"'"'" done | sort echo fi --- 1081,1087 ---- for ac_var in $ac_subst_files do eval ac_val=$`echo $ac_var` ! echo "$ac_var='"'"'$ac_val'"'"'" done | sort echo fi *************** *** 1108,1114 **** echo "$as_me: caught signal $ac_signal" echo "$as_me: exit $exit_status" } >&5 ! rm -f core core.* *.core && rm -rf conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status ' 0 --- 1100,1106 ---- echo "$as_me: caught signal $ac_signal" echo "$as_me: exit $exit_status" } >&5 ! rm -f core *.core && rm -rf conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status ' 0 *************** *** 1188,1194 **** # value. ac_cache_corrupted=false for ac_var in `(set) 2>&1 | ! sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do eval ac_old_set=\$ac_cv_env_${ac_var}_set eval ac_new_set=\$ac_env_${ac_var}_set eval ac_old_val="\$ac_cv_env_${ac_var}_value" --- 1180,1186 ---- # value. ac_cache_corrupted=false for ac_var in `(set) 2>&1 | ! sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do eval ac_old_set=\$ac_cv_env_${ac_var}_set eval ac_new_set=\$ac_env_${ac_var}_set eval ac_old_val="\$ac_cv_env_${ac_var}_value" *************** *** 1205,1217 **** ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then ! { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ! { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} ! { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} ! ac_cache_corrupted=: fi;; esac # Pass precious variables to config.status. --- 1197,1209 ---- ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then ! { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ! { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} ! { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} ! ac_cache_corrupted=: fi;; esac # Pass precious variables to config.status. *************** *** 1473,1536 **** ! FRESCO_ENABLED=0 ! FRESCO="" ! FRESCOLIBS="" ! ! # Check whether --with-fresco or --without-fresco was given. ! if test "${with_fresco+set}" = set; then ! withval="$with_fresco" ! FRESCO=$withval ! if test x"$FRESCOLIBS" = x then ! if test -d "$FRESCO"/lib then ! FRESCOLIBS=$FRESCO/lib else ! FRESCOLIBS=$FRESCO/Build/lib fi fi fi; ! # Check whether --with-fresco-libs or --without-fresco-libs was given. ! if test "${with_fresco_libs+set}" = set; then ! withval="$with_fresco_libs" ! FRESCOLIBS=$withval fi; ! ## Check fresco ! if test x"$FRESCO" = x then echo "" ! echo "No Fresco path specified." ! echo "Use --with-fresco=<path> to point to Fresco installed directory." else ! if test ! -f "$FRESCO"/Fresco/X11/X11Display.h then echo "" ! echo "Verify your Fresco environment and try it again." ! echo "(Couldn't find $FRESCO/Fresco/X11/X11Display.h!)" ! echo "Use --with-fresco=<path> to point to Fresco (or set it in the env)." ! echo "<path> points to the installed Fresco version or to a source tree." ! echo "You may also use --with-fresco-libs to specify the lib directory." else ! FRESCOINCS="$FRESCO" fi ! if test ! -d "$FRESCOLIBS" then ! echo "Fresco directory '$FRESCOLIBS' does not exist (or is not readable)." ! echo "Use --with-fresco-libs to point to it." fi ! echo "Building with Fresco support" ! echo "FRESCO includes = $FRESCOINCS" ! echo "FRESCO libs = $FRESCOLIBS" ! FRESCO_ENABLED=1 fi --- 1465,1528 ---- ! TIFF_ENABLED=0 ! TIFF="" ! TIFFLIBS="" ! ! # Check whether --with-tiff or --without-tiff was given. ! if test "${with_tiff+set}" = set; then ! withval="$with_tiff" ! TIFF=$withval ! if test x"$TIFFLIBS" = x then ! if test -d "$TIFF"/lib then ! TIFFLIBS=$TIFF/lib else ! TIFFLIBS=$TIFF/Build/lib fi fi fi; ! # Check whether --with-tiff-libs or --without-tiff-libs was given. ! if test "${with_tiff_libs+set}" = set; then ! withval="$with_tiff_libs" ! TIFFLIBS=$withval fi; ! ## Check tiff ! if test x"$TIFF" = x then echo "" ! echo "No Tiff path specified." ! echo "Use --with-tiff=<path> to point to Tiff installed directory." else ! if test ! -f "$TIFF"/include/tiff.h then echo "" ! echo "Verify your Tiff environment and try it again." ! echo "(Couldn't find $TIFF/include/tiff.h!)" ! echo "Use --with-tiff=<path> to point to Tiff (or set it in the env)." ! echo "<path> points to the installed Tiff version or to a source tree." ! echo "You may also use --with-tiff-libs to specify the lib directory." else ! TIFFINCS="$TIFF"/include fi ! if test ! -d "$TIFFLIBS" then ! echo "Tiff directory '$TIFFLIBS' does not exist (or is not readable)." ! echo "Use --with-tiff-libs to point to it." fi ! echo "Building with external Tiff support" ! echo "TIFF includes = $TIFFINCS" ! echo "TIFF libs = $TIFFLIBS" ! TIFF_ENABLED=1 fi *************** *** 1771,1777 **** (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext --- 1763,1768 ---- *************** *** 1791,1798 **** # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. ! echo "$as_me:$LINENO: checking for C++ compiler default output" >&5 ! echo $ECHO_N "checking for C++ compiler default output... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 --- 1782,1789 ---- # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. ! echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5 ! echo $ECHO_N "checking for C++ compiler default output file name... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 *************** *** 1812,1834 **** test -f "$ac_file" || continue case $ac_file in *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ! ;; conftest.$ac_ext ) ! # This is the source file. ! ;; [ab].out ) ! # We found the default executable, but exeext='' is most ! # certainly right. ! break;; *.* ) ! ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` ! # FIXME: I believe we export ac_cv_exeext for Libtool, ! # but it would be cool to find out if it's true. Does anybody ! # maintain Libtool? --akim. ! export ac_cv_exeext ! break;; * ) ! break;; esac done else --- 1803,1825 ---- test -f "$ac_file" || continue case $ac_file in *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ! ;; conftest.$ac_ext ) ! # This is the source file. ! ;; [ab].out ) ! # We found the default executable, but exeext='' is most ! # certainly right. ! break;; *.* ) ! ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` ! # FIXME: I believe we export ac_cv_exeext for Libtool, ! # but it would be cool to find out if it's true. Does anybody ! # maintain Libtool? --akim. ! export ac_cv_exeext ! break;; * ) ! break;; esac done else *************** *** 1902,1909 **** case $ac_file in *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` ! export ac_cv_exeext ! break;; * ) break;; esac done --- 1893,1900 ---- case $ac_file in *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` ! export ac_cv_exeext ! break;; * ) break;; esac done *************** *** 1928,1934 **** echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext --- 1919,1924 ---- *************** *** 1979,1985 **** echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext --- 1969,1974 ---- *************** *** 1999,2009 **** _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ! (eval $ac_compile) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 1988,2008 ---- _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ! (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_cxx_werror_flag" ! || test ! -s conftest.err' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; } && ! { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 2016,2022 **** ac_compiler_gnu=no fi ! rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi --- 2015,2021 ---- ac_compiler_gnu=no fi ! rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi *************** *** 2032,2038 **** echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext --- 2031,2036 ---- *************** *** 2049,2059 **** _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ! (eval $ac_compile) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 2047,2067 ---- _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ! (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_cxx_werror_flag" ! || test ! -s conftest.err' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; } && ! { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 2066,2072 **** ac_cv_prog_cxx_g=no fi ! rm -f conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 --- 2074,2080 ---- ac_cv_prog_cxx_g=no fi ! rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 *************** *** 2086,2093 **** fi fi for ac_declaration in \ ! ''\ ! '#include <stdlib.h>' \ 'extern "C" void std::exit (int) throw (); using std::exit;' \ 'extern "C" void std::exit (int); using std::exit;' \ 'extern "C" void exit (int) throw ();' \ --- 2094,2100 ---- fi fi for ac_declaration in \ ! '' \ 'extern "C" void std::exit (int) throw (); using std::exit;' \ 'extern "C" void std::exit (int); using std::exit;' \ 'extern "C" void exit (int) throw ();' \ *************** *** 2095,2108 **** 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include <stdlib.h> $ac_declaration int main () { --- 2102,2114 ---- 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_declaration + #include <stdlib.h> int main () { *************** *** 2113,2123 **** _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ! (eval $ac_compile) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 2119,2139 ---- _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ! (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_cxx_werror_flag" ! || test ! -s conftest.err' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; } && ! { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 2130,2138 **** continue fi ! rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext --- 2146,2153 ---- continue fi ! rm -f conftest.err conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext *************** *** 2149,2159 **** _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ! (eval $ac_compile) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 2164,2184 ---- _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ! (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_cxx_werror_flag" ! || test ! -s conftest.err' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; } && ! { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 2165,2171 **** sed 's/^/| /' conftest.$ac_ext >&5 fi ! rm -f conftest.$ac_objext conftest.$ac_ext done rm -f conftest* if test -n "$ac_declaration"; then --- 2190,2196 ---- sed 's/^/| /' conftest.$ac_ext >&5 fi ! rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done rm -f conftest* if test -n "$ac_declaration"; then *************** *** 2522,2528 **** echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext --- 2547,2552 ---- *************** *** 2542,2552 **** _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ! (eval $ac_compile) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 2566,2586 ---- _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ! (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; } && ! { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 2559,2565 **** ac_compiler_gnu=no fi ! rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi --- 2593,2599 ---- ac_compiler_gnu=no fi ! rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi *************** *** 2575,2581 **** echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext --- 2609,2614 ---- *************** *** 2592,2602 **** _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ! (eval $ac_compile) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 2625,2645 ---- _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ! (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; } && ! { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 2609,2615 **** ac_cv_prog_cc_g=no fi ! rm -f conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 --- 2652,2658 ---- ac_cv_prog_cc_g=no fi ! rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 *************** *** 2636,2642 **** ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext --- 2679,2684 ---- *************** *** 2664,2669 **** --- 2706,2721 ---- va_end (v); return s; } + + /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std1 is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std1. */ + int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + int test (int i, double x); struct s1 {int (*f) (int a);}; struct s2 {int (*f) (double a);}; *************** *** 2690,2700 **** CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ! (eval $ac_compile) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 2742,2762 ---- CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ! (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; } && ! { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 2707,2713 **** sed 's/^/| /' conftest.$ac_ext >&5 fi ! rm -f conftest.$ac_objext done rm -f conftest.$ac_ext conftest.$ac_objext CC=$ac_save_CC --- 2769,2775 ---- sed 's/^/| /' conftest.$ac_ext >&5 fi ! rm -f conftest.err conftest.$ac_objext done rm -f conftest.$ac_ext conftest.$ac_objext CC=$ac_save_CC *************** *** 2735,2753 **** _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ! (eval $ac_compile) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ ! ''\ ! '#include <stdlib.h>' \ 'extern "C" void std::exit (int) throw (); using std::exit;' \ 'extern "C" void std::exit (int); using std::exit;' \ 'extern "C" void exit (int) throw ();' \ --- 2797,2824 ---- _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ! (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; } && ! { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ ! '' \ 'extern "C" void std::exit (int) throw (); using std::exit;' \ 'extern "C" void std::exit (int); using std::exit;' \ 'extern "C" void exit (int) throw ();' \ *************** *** 2755,2768 **** 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include <stdlib.h> $ac_declaration int main () { --- 2826,2838 ---- 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_declaration + #include <stdlib.h> int main () { *************** *** 2773,2783 **** _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ! (eval $ac_compile) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 2843,2863 ---- _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ! (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; } && ! { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 2790,2798 **** continue fi ! rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext --- 2870,2877 ---- continue fi ! rm -f conftest.err conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext *************** *** 2809,2819 **** _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ! (eval $ac_compile) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 2888,2908 ---- _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ! (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; } && ! { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 2825,2831 **** sed 's/^/| /' conftest.$ac_ext >&5 fi ! rm -f conftest.$ac_objext conftest.$ac_ext done rm -f conftest* if test -n "$ac_declaration"; then --- 2914,2920 ---- sed 's/^/| /' conftest.$ac_ext >&5 fi ! rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done rm -f conftest* if test -n "$ac_declaration"; then *************** *** 2839,2845 **** sed 's/^/| /' conftest.$ac_ext >&5 fi ! rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --- 2928,2934 ---- sed 's/^/| /' conftest.$ac_ext >&5 fi ! rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' *************** *** 2871,2877 **** # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext --- 2960,2965 ---- *************** *** 2882,2888 **** #else # include <assert.h> #endif ! Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 --- 2970,2976 ---- #else # include <assert.h> #endif ! Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 *************** *** 2894,2899 **** --- 2982,2988 ---- (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 *************** *** 2914,2920 **** # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext --- 3003,3008 ---- *************** *** 2932,2937 **** --- 3020,3026 ---- (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 *************** *** 2978,2984 **** # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext --- 3067,3072 ---- *************** *** 2989,2995 **** #else # include <assert.h> #endif ! Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 --- 3077,3083 ---- #else # include <assert.h> #endif ! Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 *************** *** 3001,3006 **** --- 3089,3095 ---- (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 *************** *** 3021,3027 **** # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext --- 3110,3115 ---- *************** *** 3039,3044 **** --- 3127,3133 ---- (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 *************** *** 3188,3194 **** # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext --- 3277,3282 ---- *************** *** 3199,3205 **** #else # include <assert.h> #endif ! Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 --- 3287,3293 ---- #else # include <assert.h> #endif ! Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 *************** *** 3211,3216 **** --- 3299,3305 ---- (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 *************** *** 3231,3237 **** # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext --- 3320,3325 ---- *************** *** 3249,3254 **** --- 3337,3343 ---- (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 *************** *** 3295,3301 **** # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext --- 3384,3389 ---- *************** *** 3306,3312 **** #else # include <assert.h> #endif ! Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 --- 3394,3400 ---- #else # include <assert.h> #endif ! Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 *************** *** 3318,3323 **** --- 3406,3412 ---- (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 *************** *** 3338,3344 **** # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext --- 3427,3432 ---- *************** *** 3356,3361 **** --- 3444,3450 ---- (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 *************** *** 3432,3439 **** # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. for ac_extension in a so sl; do if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && ! test -f $ac_im_libdir/libX11.$ac_extension; then ! ac_im_usrlibdir=$ac_im_libdir; break fi done # Screen out bogus values from the imake configuration. They are --- 3521,3528 ---- # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. for ac_extension in a so sl; do if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && ! test -f $ac_im_libdir/libX11.$ac_extension; then ! ac_im_usrlibdir=$ac_im_libdir; break fi done # Screen out bogus values from the imake configuration. They are *************** *** 3493,3499 **** # Guess where to find include files, by looking for Intrinsic.h. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext --- 3582,3587 ---- *************** *** 3511,3516 **** --- 3599,3605 ---- (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 *************** *** 3541,3547 **** ac_save_LIBS=$LIBS LIBS="-lXt $LIBS" cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext --- 3630,3635 ---- *************** *** 3558,3568 **** _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ! (eval $ac_link) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 3646,3666 ---- _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ! (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; } && ! { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 3587,3593 **** done done fi ! rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi # $ac_x_libraries = no if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then --- 3685,3692 ---- done done fi ! rm -f conftest.err conftest.$ac_objext \ ! conftest$ac_exeext conftest.$ac_ext fi # $ac_x_libraries = no if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then *************** *** 3596,3602 **** else # Record where we found X for the cache. ac_cv_have_x="have_x=yes \ ! ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" fi fi --- 3695,3701 ---- else # Record where we found X for the cache. ac_cv_have_x="have_x=yes \ ! ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" fi fi *************** *** 3637,3643 **** ac_check_lib_save_LIBS=$LIBS LIBS="-lstdc++ $LIBS" cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext --- 3736,3741 ---- *************** *** 3661,3671 **** _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ! (eval $ac_link) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 3759,3779 ---- _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ! (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; } && ! { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 3678,3684 **** ac_cv_lib_stdcpp_peek__7istream=no fi ! rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_stdcpp_peek__7istream" >&5 --- 3786,3793 ---- ac_cv_lib_stdcpp_peek__7istream=no fi ! rm -f conftest.err conftest.$ac_objext \ ! conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_stdcpp_peek__7istream" >&5 *************** *** 3697,3703 **** ac_check_lib_save_LIBS=$LIBS LIBS="-lstdc++ $LIBS" cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext --- 3806,3811 ---- *************** *** 3721,3731 **** _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ! (eval $ac_link) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 3829,3849 ---- _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ! (eval $ac_link) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; } && ! { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 3738,3744 **** ac_cv_lib_stdcpp__ZNSi4peekEv=no fi ! rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_stdcpp__ZNSi4peekEv" >&5 --- 3856,3863 ---- ac_cv_lib_stdcpp__ZNSi4peekEv=no fi ! rm -f conftest.err conftest.$ac_objext \ ! conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi echo "$as_me:$LINENO: result: $ac_cv_lib_stdcpp__ZNSi4peekEv" >&5 *************** *** 3836,3842 **** else cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext --- 3955,3960 ---- *************** *** 3854,3864 **** _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ! (eval $ac_compile) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? --- 3972,3992 ---- _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ! (eval $ac_compile) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && ! { ac_try='test -z "$ac_c_werror_flag" ! || test ! -s conftest.err' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; } && ! { ac_try='test -s conftest.$ac_objext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? *************** *** 3871,3877 **** ac_cv_type_socklen_t=NO fi ! rm -f conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_type_socklen_t" >&5 --- 3999,4005 ---- ac_cv_type_socklen_t=NO fi ! rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_type_socklen_t" >&5 *************** *** 3915,3920 **** --- 4043,4049 ---- + #AC_SUBST(no_x) *************** *** 3955,3967 **** # `set' does not quote correctly, so add quotes (double-quote # substitution turns \\\\ into \\, and sed turns \\ into \). sed -n \ ! "s/'/'\\\\''/g; ! s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" ;; *) # `set' quotes correctly as required by POSIX, so do not add quotes. sed -n \ ! "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; } | --- 4084,4096 ---- # `set' does not quote correctly, so add quotes (double-quote # substitution turns \\\\ into \\, and sed turns \\ into \). sed -n \ ! "s/'/'\\\\''/g; ! s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" ;; *) # `set' quotes correctly as required by POSIX, so do not add quotes. sed -n \ ! "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; } | *************** *** 3991,4003 **** # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then ! ac_vpsub='/^[ ]*VPATH[ ]*=/{ s/:*\$(srcdir):*/:/; s/:*\${srcdir}:*/:/; s/:*@srcdir@:*/:/; ! s/^\([^=]*=[ ]*\):*/\1/; s/:*$//; ! s/^[^=]*=[ ]*$//; }' fi --- 4120,4132 ---- # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then ! ac_vpsub='/^[ ]*VPATH[ ]*=/{ s/:*\$(srcdir):*/:/; s/:*\${srcdir}:*/:/; s/:*@srcdir@:*/:/; ! s/^\([^=]*=[ ]*\):*/\1/; s/:*$//; ! s/^[^=]*=[ ]*$//; }' fi *************** *** 4011,4023 **** cat >confdef2opt.sed <<\_ACEOF t clear : clear ! s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g t quote ! s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g t quote d : quote ! s,[ `~#$^&*(){}\\|;'"<>?],\\&,g s,\[,\\&,g s,\],\\&,g s,\$,$$,g --- 4140,4152 ---- cat >confdef2opt.sed <<\_ACEOF t clear : clear ! s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g t quote ! s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g t quote d : quote ! s,[ `~#$^&*(){}\\|;'"<>?],\\&,g s,\[,\\&,g s,\],\\&,g s,\$,$$,g *************** *** 4039,4045 **** for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_i=`echo "$ac_i" | ! sed 's/\$U\././;s/\.o$//;s/\.obj$//'` # 2. Add them. ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' --- 4168,4174 ---- for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_i=`echo "$ac_i" | ! sed 's/\$U\././;s/\.o$//;s/\.obj$//'` # 2. Add them. ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' *************** *** 4083,4091 **** elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi # Support unset when possible. ! if (FOO=FOO; unset FOO) >/dev/null 2>&1; then as_unset=unset else as_unset=false --- 4212,4221 ---- elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi + DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. ! if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then as_unset=unset else as_unset=false *************** *** 4104,4110 **** LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ LC_TELEPHONE LC_TIME do ! if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else $as_unset $as_var --- 4234,4240 ---- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ LC_TELEPHONE LC_TIME do ! if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else $as_unset $as_var *************** *** 4283,4298 **** if mkdir -p . 2>/dev/null; then as_mkdir_p=: else as_mkdir_p=false fi as_executable_p="test -f" # Sed expression to map a string onto a valid CPP name. ! as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" # Sed expression to map a string onto a valid variable name. ! as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" # IFS --- 4413,4429 ---- if mkdir -p . 2>/dev/null; then as_mkdir_p=: else + test -d ./-p && rmdir ./-p as_mkdir_p=false fi as_executable_p="test -f" # 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'" # Sed expression to map a string onto a valid variable name. ! as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" # IFS *************** *** 4319,4325 **** cat >&5 <<_CSEOF This file was extended by $as_me, which was ! generated by GNU Autoconf 2.57. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS --- 4450,4456 ---- cat >&5 <<_CSEOF This file was extended by $as_me, which was ! generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS *************** *** 4363,4369 **** -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] ! instantiate the configuration file FILE Configuration files: $config_files --- 4494,4500 ---- -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] ! instantiate the configuration file FILE Configuration files: $config_files *************** *** 4374,4384 **** cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status ! configured by $0, generated by GNU Autoconf 2.57, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" ! Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 ! Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." srcdir=$srcdir --- 4505,4514 ---- cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status ! configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" ! Copyright (C) 2003 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." srcdir=$srcdir *************** *** 4593,4601 **** s,@CLIPPOLY@,$CLIPPOLY,;t t s,@CLIPPOLY_LIBS@,$CLIPPOLY_LIBS,;t t s,@CLIPPOLY_ENABLED@,$CLIPPOLY_ENABLED,;t t ! s,@FRESCOLIBS@,$FRESCOLIBS,;t t ! s,@FRESCOINCS@,$FRESCOINCS,;t t ! s,@FRESCO_ENABLED@,$FRESCO_ENABLED,;t t s,@IUE@,$IUE,;t t s,@IUELIBS@,$IUELIBS,;t t s,@IUEINCS@,$IUEINCS,;t t --- 4723,4732 ---- s,@CLIPPOLY@,$CLIPPOLY,;t t s,@CLIPPOLY_LIBS@,$CLIPPOLY_LIBS,;t t s,@CLIPPOLY_ENABLED@,$CLIPPOLY_ENABLED,;t t ! s,@TIFF@,$TIFF,;t t ! s,@TIFFLIBS@,$TIFFLIBS,;t t ! s,@TIFFINCS@,$TIFFINCS,;t t ! s,@TIFF_ENABLED@,$TIFF_ENABLED,;t t s,@IUE@,$IUE,;t t s,@IUELIBS@,$IUELIBS,;t t s,@IUEINCS@,$IUEINCS,;t t *************** *** 4643,4651 **** (echo ':t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed if test -z "$ac_sed_cmds"; then ! ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" else ! ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" fi ac_sed_frag=`expr $ac_sed_frag + 1` ac_beg=$ac_end --- 4774,4782 ---- (echo ':t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed if test -z "$ac_sed_cmds"; then ! ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" else ! ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" fi ac_sed_frag=`expr $ac_sed_frag + 1` ac_beg=$ac_end *************** *** 4663,4683 **** # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case $ac_file in - | *:- | *:-:* ) # input from stdin ! cat >$tmp/stdin ! ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` ! ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` ! ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; * ) ac_file_in=$ac_file.in ;; esac # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. ac_dir=`(dirname "$ac_file") 2>/dev/null || $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ! X"$ac_file" : 'X\(//\)[^/]' \| \ ! X"$ac_file" : 'X\(//\)$' \| \ ! X"$ac_file" : 'X\(/\)' \| \ ! . : '\(.\)' 2>/dev/null || echo X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } --- 4794,4814 ---- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case $ac_file in - | *:- | *:-:* ) # input from stdin ! cat >$tmp/stdin ! ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` ! ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` ! ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; * ) ac_file_in=$ac_file.in ;; esac # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. ac_dir=`(dirname "$ac_file") 2>/dev/null || $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ! X"$ac_file" : 'X\(//\)[^/]' \| \ ! X"$ac_file" : 'X\(//\)$' \| \ ! X"$ac_file" : 'X\(/\)' \| \ ! . : '\(.\)' 2>/dev/null || echo X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } *************** *** 4693,4702 **** as_dirs="$as_dir $as_dirs" as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ! X"$as_dir" : 'X\(//\)[^/]' \| \ ! X"$as_dir" : 'X\(//\)$' \| \ ! X"$as_dir" : 'X\(/\)' \| \ ! . : '\(.\)' 2>/dev/null || echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } --- 4824,4833 ---- as_dirs="$as_dir $as_dirs" as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ! X"$as_dir" : 'X\(//\)[^/]' \| \ ! X"$as_dir" : 'X\(//\)$' \| \ ! X"$as_dir" : 'X\(/\)' \| \ ! . : '\(.\)' 2>/dev/null || echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } *************** *** 4734,4745 **** ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac ! # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be ! # absolute. ! ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` ! ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` ! ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` ! ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` --- 4865,4909 ---- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac ! ! # Do not use `cd foo && pwd` to compute absolute paths, because ! # the directories may not exist. ! case `pwd` in ! .) ac_abs_builddir="$ac_dir";; ! *) ! case "$ac_dir" in ! .) ac_abs_builddir=`pwd`;; ! [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; ! *) ac_abs_builddir=`pwd`/"$ac_dir";; ! esac;; ! esac ! case $ac_abs_builddir in ! .) ac_abs_top_builddir=${ac_top_builddir}.;; ! *) ! case ${ac_top_builddir}. in ! .) ac_abs_top_builddir=$ac_abs_builddir;; ! [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; ! *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; ! esac;; ! esac ! case $ac_abs_builddir in ! .) ac_abs_srcdir=$ac_srcdir;; ! *) ! case $ac_srcdir in ! .) ac_abs_srcdir=$ac_abs_builddir;; ! [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; ! *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; ! esac;; ! esac ! case $ac_abs_builddir in ! .) ac_abs_top_srcdir=$ac_top_srcdir;; ! *) ! case $ac_top_srcdir in ! .) ac_abs_top_srcdir=$ac_abs_builddir;; ! [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; ! *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; ! esac;; ! esac *************** *** 4757,4763 **** configure_input="$ac_file. " fi configure_input=$configure_input"Generated from `echo $ac_file_in | ! sed 's,.*/,,'` by configure." # First look for the input files in the build tree, otherwise in the # src tree. --- 4921,4927 ---- configure_input="$ac_file. " fi configure_input=$configure_input"Generated from `echo $ac_file_in | ! sed 's,.*/,,'` by configure." # First look for the input files in the build tree, otherwise in the # src tree. *************** *** 4766,4789 **** case $f in -) echo $tmp/stdin ;; [\\/$]*) ! # Absolute (can't be DOS-style, as IFS=:) ! test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } ! echo $f;; *) # Relative ! if test -f "$f"; then ! # Build tree ! echo $f ! elif test -f "$srcdir/$f"; then ! # Source tree ! echo $srcdir/$f ! else ! # /dev/null tree ! { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } ! fi;; esac done` || { (exit 1); exit 1; } _ACEOF --- 4930,4953 ---- case $f in -) echo $tmp/stdin ;; [\\/$]*) ! # Absolute (can't be DOS-style, as IFS=:) ! test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } ! echo "$f";; *) # Relative ! if test -f "$f"; then ! # Build tree ! echo "$f" ! elif test -f "$srcdir/$f"; then ! # Source tree ! echo "$srcdir/$f" ! else ! # /dev/null tree ! { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } ! fi;; esac done` || { (exit 1); exit 1; } _ACEOF Index: top_ivtools/configure.in diff -c top_ivtools/configure.in:1.1 top_ivtools/configure.in:1.2 *** top_ivtools/configure.in:1.1 Tue Jun 15 08:53:20 2004 --- ./configure.in Thu Oct 6 12:26:50 2005 *************** *** 107,162 **** ! FRESCO_ENABLED=0 ! FRESCO="" ! FRESCOLIBS="" ! AC_ARG_WITH(fresco, [ --with-fresco=<path> path to Fresco include files (not-used)], ! FRESCO=$withval ! if test x"$FRESCOLIBS" = x then ! if test -d "$FRESCO"/lib then ! FRESCOLIBS=$FRESCO/lib else ! FRESCOLIBS=$FRESCO/Build/lib fi fi ) ! AC_ARG_WITH(fresco-libs,[ --with-fresco-libs=<path> path to compiled Fresco libs (not-used)], ! FRESCOLIBS=$withval ) ! ## Check fresco ! if test x"$FRESCO" = x then echo "" ! echo "No Fresco path specified." ! echo "Use --with-fresco=<path> to point to Fresco installed directory." else ! if test ! -f "$FRESCO"/Fresco/X11/X11Display.h then echo "" ! echo "Verify your Fresco environment and try it again." ! echo "(Couldn't find $FRESCO/Fresco/X11/X11Display.h!)" ! echo "Use --with-fresco=<path> to point to Fresco (or set it in the env)." ! echo "<path> points to the installed Fresco version or to a source tree." ! echo "You may also use --with-fresco-libs to specify the lib directory." else ! FRESCOINCS="$FRESCO" fi ! if test ! -d "$FRESCOLIBS" then ! echo "Fresco directory '$FRESCOLIBS' does not exist (or is not readable)." ! echo "Use --with-fresco-libs to point to it." fi ! echo "Building with Fresco support" ! echo "FRESCO includes = $FRESCOINCS" ! echo "FRESCO libs = $FRESCOLIBS" ! FRESCO_ENABLED=1 fi --- 107,162 ---- ! TIFF_ENABLED=0 ! TIFF="" ! TIFFLIBS="" ! AC_ARG_WITH(tiff, [ --with-tiff=<path> path to installed Tiff files], ! TIFF=$withval ! if test x"$TIFFLIBS" = x then ! if test -d "$TIFF"/lib then ! TIFFLIBS=$TIFF/lib else ! TIFFLIBS=$TIFF/Build/lib fi fi ) ! AC_ARG_WITH(tiff-libs,[ --with-tiff-libs=<path> path to compiled Tiff libs], ! TIFFLIBS=$withval ) ! ## Check tiff ! if test x"$TIFF" = x then echo "" ! echo "No Tiff path specified." ! echo "Use --with-tiff=<path> to point to Tiff installed directory." else ! if test ! -f "$TIFF"/include/tiff.h then echo "" ! echo "Verify your Tiff environment and try it again." ! echo "(Couldn't find $TIFF/include/tiff.h!)" ! echo "Use --with-tiff=<path> to point to Tiff (or set it in the env)." ! echo "<path> points to the installed Tiff version or to a source tree." ! echo "You may also use --with-tiff-libs to specify the lib directory." else ! TIFFINCS="$TIFF"/include fi ! if test ! -d "$TIFFLIBS" then ! echo "Tiff directory '$TIFFLIBS' does not exist (or is not readable)." ! echo "Use --with-tiff-libs to point to it." fi ! echo "Building with external Tiff support" ! echo "TIFF includes = $TIFFINCS" ! echo "TIFF libs = $TIFFLIBS" ! TIFF_ENABLED=1 fi *************** *** 366,374 **** AC_SUBST(CLIPPOLY) AC_SUBST(CLIPPOLY_LIBS) AC_SUBST(CLIPPOLY_ENABLED) ! AC_SUBST(FRESCOLIBS) ! AC_SUBST(FRESCOINCS) ! AC_SUBST(FRESCO_ENABLED) AC_SUBST(IUE) AC_SUBST(IUELIBS) AC_SUBST(IUEINCS) --- 366,375 ---- AC_SUBST(CLIPPOLY) AC_SUBST(CLIPPOLY_LIBS) AC_SUBST(CLIPPOLY_ENABLED) ! AC_SUBST(TIFF) ! AC_SUBST(TIFFLIBS) ! AC_SUBST(TIFFINCS) ! AC_SUBST(TIFF_ENABLED) AC_SUBST(IUE) AC_SUBST(IUELIBS) AC_SUBST(IUEINCS) Index: y2k_test/Imakefile diff -c y2k_test/Imakefile:1.1 y2k_test/Imakefile:1.2 *** y2k_test/Imakefile:1.1 Tue Jun 15 08:58:04 2004 --- src/tests/y2k/Imakefile Thu Oct 6 12:27:31 2005 *************** *** 15,20 **** --- 15,21 ---- #if HasDynamicSharedLibraries APP_CCDEPLIBS = $(DEPTIME) $(DEPIVGLYPH) #endif + OTHER_CCLDLIBS = $(TIFF_CCLDLIBS) ComplexProgramTargetNoInstall(y2ktest) *** /dev/null Thu Oct 6 12:27:38 PDT 2005 --- patches/ivtools-051006-johnston-011 *************** patches/ivtools-051006-johnston-011 *** 0 **** --- 1 ---- + ivtools-051006-johnston-011 --Apple-Mail-1--3722562-- ------------------------------------------------------- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl