From a984fda881ef98281627614e4ddae2936c12bf73 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Mon, 9 Jun 2008 21:02:13 +0000 Subject: [PATCH] * README.CVS: Updated. * builds/unix/configure.raw: Updated for newer versions of autoconf and friends. --- ChangeLog | 7 ++ README.CVS | 8 +- builds/unix/configure.raw | 201 +++++++++++++++++++------------------- 3 files changed, 114 insertions(+), 102 deletions(-) diff --git a/ChangeLog b/ChangeLog index a5552ae95..336eb3009 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-06-09 Werner Lemberg + + * README.CVS: Updated. + + * builds/unix/configure.raw: Updated for newer versions of autoconf + and friends. + 2008-06-08 Werner Lemberg * src/type1/t1parse.h (T1_ParserRec): Make `base_len' and diff --git a/README.CVS b/README.CVS index 63afddfbb..2764ae95f 100644 --- a/README.CVS +++ b/README.CVS @@ -5,9 +5,9 @@ UNIXish platforms. To generate them say which in turn depends on the following packages: - automake (1.9.6) - libtool (1.5.22) - autoconf (2.59c) + automake (1.10.1) + libtool (2.2.4) + autoconf (2.62) The versions given in parentheses are known to work. Newer versions should work too, of course. Note that autogen.sh also sets up proper @@ -37,7 +37,7 @@ should work on all platforms which have GNU make (or makepp). ---------------------------------------------------------------------- -Copyright 2005, 2006, 2007 by +Copyright 2005, 2006, 2007, 2008 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw index f231cdb4a..7839e0137 100644 --- a/builds/unix/configure.raw +++ b/builds/unix/configure.raw @@ -182,7 +182,8 @@ if test x$with_old_mac_fonts = xyes; then AC_MSG_CHECKING([CoreServices & ApplicationServices of Mac OS X]) FT2_EXTRA_LIBS="-Wl,-framework,CoreServices -Wl,-framework,ApplicationServices" LDFLAGS="$LDFLAGS $FT2_EXTRA_LIBS" - AC_TRY_LINK([ + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([ #if defined(__GNUC__) && defined(__APPLE_CC__) # include @@ -192,20 +193,21 @@ if test x$with_old_mac_fonts = xyes; then # include #endif - ], - [ + ], + [ - short res = 0; + short res = 0; - UseResFile( res ); + UseResFile( res ); - ], + ])], [AC_MSG_RESULT([ok]) AC_MSG_CHECKING([OS_INLINE macro is ANSI compatible]) orig_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $XX_CFLAGS $XX_ANSIFLAGS" - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM([ #if defined(__GNUC__) && defined(__APPLE_CC__) # include @@ -215,25 +217,24 @@ if test x$with_old_mac_fonts = xyes; then # include #endif - ], - [ + ], + [ - /* OSHostByteOrder() is typed as OS_INLINE */ - int32_t os_byte_order = OSHostByteOrder(); + /* OSHostByteOrder() is typed as OS_INLINE */ + int32_t os_byte_order = OSHostByteOrder(); - if ( OSBigEndian != os_byte_order ) - return 1; + if ( OSBigEndian != os_byte_order ) + return 1; - ], + ])], [AC_MSG_RESULT([ok]) CFLAGS="$orig_CFLAGS" CFLAGS="$CFLAGS -DHAVE_ANSI_OS_INLINE=1" ], [AC_MSG_RESULT([no, ANSI incompatible]) CFLAGS="$orig_CFLAGS" - ]) - ], + ])], [AC_MSG_RESULT([not found]) LDFLAGS="${orig_LDFLAGS}" CFLAGS="$CFLAGS -DDARWIN_NO_CARBON"]) @@ -257,7 +258,8 @@ if test x$with_fsspec = xno; then CFLAGS="$CFLAGS -DHAVE_FSSPEC=0" elif test x$with_old_mac_fonts = xyes -a x$with_fsspec != x; then AC_MSG_CHECKING([FSSpec-based FileManager]) - AC_TRY_LINK([ + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([ #if defined(__GNUC__) && defined(__APPLE_CC__) # include @@ -267,21 +269,21 @@ elif test x$with_old_mac_fonts = xyes -a x$with_fsspec != x; then # include #endif - ], - [ + ], + [ - FCBPBPtr paramBlock; - short vRefNum; - long dirID; - ConstStr255Param fileName; - FSSpec* spec; + FCBPBPtr paramBlock; + short vRefNum; + long dirID; + ConstStr255Param fileName; + FSSpec* spec; - /* FSSpec functions: deprecated since Mac OS X 10.4 */ - PBGetFCBInfoSync( paramBlock ); - FSMakeFSSpec( vRefNum, dirID, fileName, spec ); + /* FSSpec functions: deprecated since Mac OS X 10.4 */ + PBGetFCBInfoSync( paramBlock ); + FSMakeFSSpec( vRefNum, dirID, fileName, spec ); - ], + ])], [AC_MSG_RESULT([ok]) CFLAGS="$CFLAGS -DHAVE_FSSPEC=1"], [AC_MSG_RESULT([not found]) @@ -303,7 +305,8 @@ if test x$with_fsref = xno; then CFLAGS="$CFLAGS -DHAVE_FSREF=0" elif test x$with_old_mac_fonts = xyes -a x$with_fsref != x; then AC_MSG_CHECKING([FSRef-based FileManager]) - AC_TRY_LINK([ + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([ #if defined(__GNUC__) && defined(__APPLE_CC__) # include @@ -313,41 +316,41 @@ elif test x$with_old_mac_fonts = xyes -a x$with_fsref != x; then # include #endif - ], - [ + ], + [ - short vRefNum; - long dirID; - ConstStr255Param fileName; + short vRefNum; + long dirID; + ConstStr255Param fileName; - Boolean* isDirectory; - UInt8* path; - SInt16 desiredRefNum; - SInt16* iterator; - SInt16* actualRefNum; - HFSUniStr255* outForkName; - FSVolumeRefNum volume; - FSCatalogInfoBitmap whichInfo; - FSCatalogInfo* catalogInfo; - FSForkInfo* forkInfo; - FSRef* ref; + Boolean* isDirectory; + UInt8* path; + SInt16 desiredRefNum; + SInt16* iterator; + SInt16* actualRefNum; + HFSUniStr255* outForkName; + FSVolumeRefNum volume; + FSCatalogInfoBitmap whichInfo; + FSCatalogInfo* catalogInfo; + FSForkInfo* forkInfo; + FSRef* ref; #if HAVE_FSSPEC - FSSpec* spec; + FSSpec* spec; #endif - /* FSRef functions: no need to check? */ - FSGetForkCBInfo( desiredRefNum, volume, iterator, - actualRefNum, forkInfo, ref, - outForkName ); - FSPathMakeRef( path, ref, isDirectory ); + /* FSRef functions: no need to check? */ + FSGetForkCBInfo( desiredRefNum, volume, iterator, + actualRefNum, forkInfo, ref, + outForkName ); + FSPathMakeRef( path, ref, isDirectory ); #if HAVE_FSSPEC - FSpMakeFSRef ( spec, ref ); - FSGetCatalogInfo( ref, whichInfo, catalogInfo, - outForkName, spec, ref ); + FSpMakeFSRef ( spec, ref ); + FSGetCatalogInfo( ref, whichInfo, catalogInfo, + outForkName, spec, ref ); #endif - ], + ])], [AC_MSG_RESULT([ok]) CFLAGS="$CFLAGS -DHAVE_FSREF=1"], [AC_MSG_RESULT([not found]) @@ -365,7 +368,8 @@ if test x$with_quickdraw_toolbox = xno; then CFLAGS="$CFLAGS -DHAVE_QUICKDRAW_TOOLBOX=0" elif test x$with_old_mac_fonts = xyes -a x$with_quickdraw_toolbox != x; then AC_MSG_CHECKING([QuickDraw FontManager functions in ToolBox]) - AC_TRY_LINK([ + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([ #if defined(__GNUC__) && defined(__APPLE_CC__) # include @@ -375,20 +379,20 @@ elif test x$with_old_mac_fonts = xyes -a x$with_quickdraw_toolbox != x; then # include #endif - ], - [ + ], + [ - Str255 familyName; - SInt16 familyID = 0; - FMInput* fmIn = NULL; - FMOutput* fmOut = NULL; + Str255 familyName; + SInt16 familyID = 0; + FMInput* fmIn = NULL; + FMOutput* fmOut = NULL; - GetFontName( familyID, familyName ); - GetFNum( familyName, &familyID ); - fmOut = FMSwapFont( fmIn ); + GetFontName( familyID, familyName ); + GetFNum( familyName, &familyID ); + fmOut = FMSwapFont( fmIn ); - ], + ])], [AC_MSG_RESULT([ok]) CFLAGS="$CFLAGS -DHAVE_QUICKDRAW_TOOLBOX=1"], [AC_MSG_RESULT([not found]) @@ -406,7 +410,8 @@ if test x$with_quickdraw_carbon = xno; then CFLAGS="$CFLAGS -DHAVE_QUICKDRAW_CARBON=0" elif test x$with_old_mac_fonts = xyes -a x$with_quickdraw_carbon != x; then AC_MSG_CHECKING([QuickDraw FontManager functions in Carbon]) - AC_TRY_LINK([ + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([ #if defined(__GNUC__) && defined(__APPLE_CC__) # include @@ -416,30 +421,30 @@ elif test x$with_old_mac_fonts = xyes -a x$with_quickdraw_carbon != x; then # include #endif - ], - [ + ], + [ - FMFontFamilyIterator famIter; - FMFontFamily family; - Str255 famNameStr; - FMFontFamilyInstanceIterator instIter; - FMFontStyle style; - FMFontSize size; - FMFont font; - FSSpec* pathSpec; + FMFontFamilyIterator famIter; + FMFontFamily family; + Str255 famNameStr; + FMFontFamilyInstanceIterator instIter; + FMFontStyle style; + FMFontSize size; + FMFont font; + FSSpec* pathSpec; - FMCreateFontFamilyIterator( NULL, NULL, kFMUseGlobalScopeOption, - &famIter ); - FMGetNextFontFamily( &famIter, &family ); - FMGetFontFamilyName( family, famNameStr ); - FMCreateFontFamilyInstanceIterator( family, &instIter ); - FMGetNextFontFamilyInstance( &instIter, &font, &style, &size ); - FMDisposeFontFamilyInstanceIterator( &instIter ); - FMDisposeFontFamilyIterator( &famIter ); - FMGetFontContainer( font, pathSpec ); + FMCreateFontFamilyIterator( NULL, NULL, kFMUseGlobalScopeOption, + &famIter ); + FMGetNextFontFamily( &famIter, &family ); + FMGetFontFamilyName( family, famNameStr ); + FMCreateFontFamilyInstanceIterator( family, &instIter ); + FMGetNextFontFamilyInstance( &instIter, &font, &style, &size ); + FMDisposeFontFamilyInstanceIterator( &instIter ); + FMDisposeFontFamilyIterator( &famIter ); + FMGetFontContainer( font, pathSpec ); - ], + ])], [AC_MSG_RESULT([ok]) CFLAGS="$CFLAGS -DHAVE_QUICKDRAW_CARBON=1"], [AC_MSG_RESULT([not found]) @@ -457,22 +462,23 @@ if test x$with_ats = xno; then CFLAGS="$CFLAGS -DHAVE_ATS=0" elif test x$with_old_mac_fonts = xyes -a x$with_ats != x ; then AC_MSG_CHECKING([AppleTypeService functions]) - AC_TRY_LINK([ + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([ #include - ], - [ + ], + [ - FSSpec* pathSpec; + FSSpec* pathSpec; - ATSFontFindFromName( NULL, kATSOptionFlagsUnRestrictedScope ); + ATSFontFindFromName( NULL, kATSOptionFlagsUnRestrictedScope ); #if HAVE_FSSPEC - ATSFontGetFileSpecification( 0, pathSpec ); + ATSFontGetFileSpecification( 0, pathSpec ); #endif - ], + ])], [AC_MSG_RESULT([ok]) CFLAGS="$CFLAGS -DHAVE_ATS=1"], [AC_MSG_RESULT([not found]) @@ -500,13 +506,12 @@ AC_SUBST([FT2_EXTRA_LIBS]) AC_SUBST([SYSTEM_ZLIB]) -AC_LIBTOOL_WIN32_DLL +LT_INIT(win32-dll) -AC_PROG_LIBTOOL -# urgh -- these are internal libtool variables... -AC_SUBST([enable_shared]) AC_SUBST([hardcode_libdir_flag_spec]) AC_SUBST([wl]) +# urgh -- this is an internal libtool variable... +AC_SUBST([enable_shared]) # configuration file -- stay in 8.3 limit