diff options
author | Jonathan Kew <jfkthame@googlemail.com> | 2008-02-15 15:40:02 +0000 |
---|---|---|
committer | Jonathan Kew <jfkthame@googlemail.com> | 2008-02-15 15:40:02 +0000 |
commit | 2445b3193ddfa82efd2a95695694be74260e4e7c (patch) | |
tree | d0a1e783a715fa3e4f6a951b2824b680f1de7bd2 /Build/source/libs | |
parent | 21854aa6efbf4fb1013d04ec22340388af752dc7 (diff) |
graphite portability issues, from xetex svn rev.573
git-svn-id: svn://tug.org/texlive/trunk@6638 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs')
8 files changed, 165 insertions, 40 deletions
diff --git a/Build/source/libs/graphite-engine/configure b/Build/source/libs/graphite-engine/configure index 97e5c3deed2..c1f389fa3ca 100755 --- a/Build/source/libs/graphite-engine/configure +++ b/Build/source/libs/graphite-engine/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for silgraphite 2.2.1. +# Generated by GNU Autoconf 2.61 for silgraphite 2.3. # # Report bugs to <silgraphite-devel@lists.sourceforge.net>. # @@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='silgraphite' PACKAGE_TARNAME='silgraphite' -PACKAGE_VERSION='2.2.1' -PACKAGE_STRING='silgraphite 2.2.1' +PACKAGE_VERSION='2.3' +PACKAGE_STRING='silgraphite 2.3' PACKAGE_BUGREPORT='silgraphite-devel@lists.sourceforge.net' ac_unique_file="src/segment/GrEngine.cpp" @@ -1396,7 +1396,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures silgraphite 2.2.1 to adapt to many kinds of systems. +\`configure' configures silgraphite 2.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1466,7 +1466,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of silgraphite 2.2.1:";; + short | recursive ) echo "Configuration of silgraphite 2.3:";; esac cat <<\_ACEOF @@ -1477,11 +1477,9 @@ Optional Features: (and sometimes confusing) to the casual installer --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors - --enable-tracing build with support for trace Graphite logs - (default=no) + --disable-tracing build without support for trace Graphite logs --enable-debug build with debugging. (default=no) - --enable-final build with optimizations and no debugging. - (default=no) + --disable-final build without optimizations and no debugging. --enable-profile allow profiling (default=no) --enable-profilefn allow functioncheck profiling (default=no) --enable-shared[=PKGS] build shared libraries [default=yes] @@ -1577,7 +1575,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -silgraphite configure 2.2.1 +silgraphite configure 2.3 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1591,7 +1589,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by silgraphite $as_me 2.2.1, which was +It was created by silgraphite $as_me 2.3, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2264,7 +2262,7 @@ fi # Define the identity of the package. PACKAGE='silgraphite' - VERSION='2.2.1' + VERSION='2.3' cat >>confdefs.h <<_ACEOF @@ -4492,6 +4490,8 @@ if test "${enable_tracing+set}" = set; then enableval=$enable_tracing; fi + test "x$enable_tracing" != xno && enable_tracing=yes + # Check whether --enable-debug was given. if test "${enable_debug+set}" = set; then enableval=$enable_debug; @@ -4502,6 +4502,8 @@ if test "${enable_final+set}" = set; then enableval=$enable_final; fi + test "x$enable_final" != xno && enable_final=yes + # Check whether --enable-profile was given. if test "${enable_profile+set}" = set; then enableval=$enable_profile; @@ -5162,7 +5164,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5165 "configure"' > conftest.$ac_ext + echo '#line 5167 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7431,11 +7433,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7434: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7436: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7438: \$? = $ac_status" >&5 + echo "$as_me:7440: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7721,11 +7723,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7724: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7726: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7728: \$? = $ac_status" >&5 + echo "$as_me:7730: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7825,11 +7827,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7828: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7830: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7832: \$? = $ac_status" >&5 + echo "$as_me:7834: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10174,7 +10176,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10177 "configure" +#line 10179 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10274,7 +10276,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10277 "configure" +#line 10279 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12694,11 +12696,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12697: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12699: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12701: \$? = $ac_status" >&5 + echo "$as_me:12703: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -12798,11 +12800,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12801: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12803: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12805: \$? = $ac_status" >&5 + echo "$as_me:12807: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14360,11 +14362,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14363: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14365: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14367: \$? = $ac_status" >&5 + echo "$as_me:14369: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14464,11 +14466,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14467: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14469: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14471: \$? = $ac_status" >&5 + echo "$as_me:14473: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16651,11 +16653,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16654: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16656: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16658: \$? = $ac_status" >&5 + echo "$as_me:16660: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16941,11 +16943,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16944: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16946: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16948: \$? = $ac_status" >&5 + echo "$as_me:16950: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17045,11 +17047,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17048: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17050: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17052: \$? = $ac_status" >&5 + echo "$as_me:17054: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -20392,6 +20394,100 @@ _ACEOF # Checks for library functions. +for ac_func in fabsf +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + # Setup the build compiler flags and linker flags. # Enable debug build_flags="" @@ -20927,7 +21023,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by silgraphite $as_me 2.2.1, which was +This file was extended by silgraphite $as_me 2.3, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20974,7 +21070,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -silgraphite config.status 2.2.1 +silgraphite config.status 2.3 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/Build/source/libs/graphite-engine/configure.ac b/Build/source/libs/graphite-engine/configure.ac index 7fb2d14a991..31f0d61cfe8 100644 --- a/Build/source/libs/graphite-engine/configure.ac +++ b/Build/source/libs/graphite-engine/configure.ac @@ -51,6 +51,7 @@ AC_CHECK_SIZEOF(wchar_t) AC_SUBST(SIZEOF_WCHAR_T) # Checks for library functions. +AC_CHECK_FUNCS(fabsf) # Setup the build compiler flags and linker flags. # Enable debug diff --git a/Build/source/libs/graphite-engine/src/font/TtfTypes.h b/Build/source/libs/graphite-engine/src/font/TtfTypes.h index 4797cd2aa4d..da8d90f1f26 100644 --- a/Build/source/libs/graphite-engine/src/font/TtfTypes.h +++ b/Build/source/libs/graphite-engine/src/font/TtfTypes.h @@ -55,7 +55,7 @@ enum //********************************************************************************************** namespace Sfnt { -#pragma pack(push, 1) // We need this or the structure members aren't alligned +#pragma pack(1) // We need this or the structure members aren't alligned // correctly. Fortunately this form of pragma is supposed // to be recongnised by VS C++ too (at least according to // MSDN). @@ -382,7 +382,7 @@ namespace Sfnt }; }; -#pragma pack(pop) +#pragma pack() } // end of namespace Sfnt } // end of namespace TtfUtil diff --git a/Build/source/libs/graphite-engine/src/painter/SegmentPainter.cpp b/Build/source/libs/graphite-engine/src/painter/SegmentPainter.cpp index 559f72fb887..7ada7e4a413 100644 --- a/Build/source/libs/graphite-engine/src/painter/SegmentPainter.cpp +++ b/Build/source/libs/graphite-engine/src/painter/SegmentPainter.cpp @@ -29,6 +29,13 @@ Description: #undef THIS_FILE DEFINE_THIS_FILE +#ifndef HAVE_FABSF +static float fabsf(float x) +{ + return (x < 0.0f) ? -x : x; +} +#endif + //:>******************************************************************************************** //:> Forward declarations //:>******************************************************************************************** diff --git a/Build/source/libs/graphite-engine/src/segment/GrCharStream.h b/Build/source/libs/graphite-engine/src/segment/GrCharStream.h index fa9d8b40785..bb91cf54eba 100644 --- a/Build/source/libs/graphite-engine/src/segment/GrCharStream.h +++ b/Build/source/libs/graphite-engine/src/segment/GrCharStream.h @@ -163,7 +163,7 @@ protected: kzByteMask = 0x3F, kzByteMark = 0x80, kzUtf8ByteShift = 6, - kzUnicodeMax = 0x7FFFFFFF, + kzUnicodeMax = 0x7FFFFFFF }; enum diff --git a/Build/source/libs/graphite-engine/src/segment/GrTableManager.cpp b/Build/source/libs/graphite-engine/src/segment/GrTableManager.cpp index cc125a3d9b3..a8e0d4e8348 100644 --- a/Build/source/libs/graphite-engine/src/segment/GrTableManager.cpp +++ b/Build/source/libs/graphite-engine/src/segment/GrTableManager.cpp @@ -28,6 +28,13 @@ DEFINE_THIS_FILE #include <math.h> #endif +#ifndef HAVE_FABSF +static float fabsf(float x) +{ + return (x < 0.0f) ? -x : x; +} +#endif + //:>******************************************************************************************** //:> Forward declarations //:>******************************************************************************************** diff --git a/Build/source/libs/graphite-engine/src/segment/Segment.cpp b/Build/source/libs/graphite-engine/src/segment/Segment.cpp index db8f2bc8849..8a82bbf9aa7 100644 --- a/Build/source/libs/graphite-engine/src/segment/Segment.cpp +++ b/Build/source/libs/graphite-engine/src/segment/Segment.cpp @@ -26,6 +26,13 @@ Description: #include <stdlib.h> #endif +#ifndef HAVE_FABSF +static float fabsf(float x) +{ + return (x < 0.0f) ? -x : x; +} +#endif + #undef THIS_FILE DEFINE_THIS_FILE diff --git a/Build/source/libs/graphite-engine/src/segment/TransductionLog.cpp b/Build/source/libs/graphite-engine/src/segment/TransductionLog.cpp index ee528110103..72761c33c6b 100644 --- a/Build/source/libs/graphite-engine/src/segment/TransductionLog.cpp +++ b/Build/source/libs/graphite-engine/src/segment/TransductionLog.cpp @@ -26,6 +26,13 @@ Description: #undef THIS_FILE DEFINE_THIS_FILE +#ifndef HAVE_FABSF +static float fabsf(float x) +{ + return (x < 0.0f) ? -x : x; +} +#endif + //:End Ignore //:>******************************************************************************************** |