3 # Patch managed by http://www.holgerschurig.de/patcher.html
6 --- t1lib-5.0.2/configure.in~configure.patch
7 +++ t1lib-5.0.2/configure.in
9 T1LIB_VERSIONSTRING=\"MACRO_T1LIB_IDENTIFIER\"
12 -dnl We use this file by Andreas Zeller to check for libXaw
13 -builtin(include, ac-tools/ice_find_athena.m4)
14 -builtin(include, ac-tools/aclocal.m4)
15 +#dnl We use this file by Andreas Zeller to check for libXaw
16 +#builtin(include, ac-tools/ice_find_athena.m4)
17 +#builtin(include, ac-tools/aclocal.m4)
19 dnl We want these before the checks, so the checks can modify their values.
20 test -z "$LDLIBS" && LDLIBS=-lm AC_SUBST(LDLIBS)
23 dnl **** Check for underscore on external symbols ****
25 +AH_TEMPLATE([NEED_UNDERSCORE_PREFIX], [Define if external symbols need an underscore prefix])
26 AC_CACHE_CHECK("whether external symbols need an underscore prefix",
27 ac_cv_c_extern_prefix,
30 AC_DEFINE(NEED_UNDERSCORE_PREFIX)
33 -dnl **** Check which ANSI integer type is 16 bit
34 +dnl **** Check which ANSI integer type is 16 bit
36 +for type in short int; do
37 + if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x2"; then
38 + T1_AA_TYPE16="-DT1_AA_TYPE16=$type"
43 -AC_CACHE_CHECK( "which ANSI integer type is 16 bit", ac_16bit_type,
46 - if (sizeof(short)==2)
48 - else if (sizeof(int)==2)
52 -}], ac_16bit_type="short", ac_16bit_type="int", ac_16bit_type=))
53 -if test "$ac_16bit_type" = "short"
55 - T1_AA_TYPE16="-DT1_AA_TYPE16=short"
57 - T1_AA_TYPE16="-DT1_AA_TYPE16=int"
58 +if test x"$T1_AA_TYPE16" = "x"; then
59 + AC_MSG_ERROR("Unable to determine which integer type is 16 bit.")
63 dnl **** Check which ANSI integer type is 32 bit
65 +for type in int long; do
66 + if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x4"; then
67 + T1_AA_TYPE32="-DT1_AA_TYPE32=$type"
72 -AC_CACHE_CHECK( "which ANSI integer type is 32 bit", ac_32bit_type,
77 - else if (sizeof(long)==4)
81 -}], ac_32bit_type="int", ac_32bit_type="long", ac_32bit_type=))
82 -if test "$ac_32bit_type" = "int"
84 - T1_AA_TYPE32="-DT1_AA_TYPE32=int"
86 - T1_AA_TYPE32="-DT1_AA_TYPE32=long"
87 +if test x"$T1_AA_TYPE32" = "x"; then
88 + AC_MSG_ERROR("Unable to determine which integer type is 32 bit.")
92 dnl **** Check which ANSI integer type is 64 bit
94 +for type in long long_long; do
95 + if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x8"; then
96 + AC_MSG_WARN("$type is 64 bit")
97 + T1_AA_TYPE64="-DT1_AA_TYPE64=\"`echo $type|tr '_' ' '`\""
102 -AC_CACHE_CHECK( "which ANSI integer type is 64 bit", ac_64bit_type,
105 - if (sizeof(long)==8)
109 -}], ac_64bit_type="long", ac_64bit_type="<none>"))
110 -if test "$ac_64bit_type" = "long"
112 - T1_AA_TYPE64="-DT1_AA_TYPE64=long"
115 +if test x"$T1_AA_TYPE64" = "x"; then
116 + AC_MSG_ERROR("Unable to determine which integer type is 64 bit.")
120 CFLAGS="${CFLAGS} -DT1LIB_IDENT=\"\\\"${T1LIB_IDENTIFIER}\\\"\" -DGLOBAL_CONFIG_DIR=\"\\\"${T1LIB_DATA_DIR}\\\"\""
122 dnl **** Check for functions and header files ****