* builds/unix/configure.in: Renamed to ... * builds/unix/configure.ac: This to make sure that autoconf 2.50 is needed. Run `autoupdate' on it. * builds/unix/configure: Regenerated. * src/autohint/ahhint.c (ah_hinter_load_glyph): Fixed a bug that corrupted transformed glyphs that were auto-hinted (the transform was applied twice). Updating to libtool 1.4.0 and autoconf 2.50.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330
diff --git a/ChangeLog b/ChangeLog
index 30c8f11..24bc1cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,20 @@
-2001-06-08 David Turner <david@freetype.org>
+2001-06-08 Werner Lemberg <wl@gnu.org>
- * src/autohint/ahhint.c (ah_hinter_load_glyph): fixed a bug that
- corrupted transformed glyphs that were auto-hinted (the transform
- was applied twice !!)
+ * builds/unix/configure.in: Renamed to ...
+ * builds/unix/configure.ac: This to make sure that autoconf 2.50 is
+ needed.
+ Run `autoupdate' on it.
+ * builds/unix/configure: Regenerated.
+
+2001-06-08 David Turner <david@freetype.org>
+
+ * src/autohint/ahhint.c (ah_hinter_load_glyph): Fixed a bug that
+ corrupted transformed glyphs that were auto-hinted (the transform
+ was applied twice).
2001-06-07 Werner Lemberg <wl@gnu.org>
- Updating to libtool 1.4.0.
+ Updating to libtool 1.4.0 and autoconf 2.50.
* builds/unix/ltconfig: Removed.
* builds/unix/ltmain.sh, builds/unix/configure.in,
diff --git a/builds/unix/configure b/builds/unix/configure
index 442fd73..f99ce51 100644
--- a/builds/unix/configure
+++ b/builds/unix/configure
@@ -7463,6 +7463,7 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
# Prevent multiple expansion
ac_config_files="$ac_config_files unix-cc.mk:unix-cc.in unix-def.mk:unix-def.in freetype-config"
+
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@@ -7542,7 +7543,7 @@ DEFS=-DHAVE_CONFIG_H
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:7545: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:7546: creating $CONFIG_STATUS" >&5
echo "$as_me: creating $CONFIG_STATUS" >&6;}
cat >$CONFIG_STATUS <<_ACEOF
#! $SHELL
@@ -7715,7 +7716,7 @@ cat >>$CONFIG_STATUS <<\EOF
echo "$ac_cs_version"; exit 0 ;;
--he | --h)
# Conflict between --help and --header
- { { echo "$as_me:7718: error: ambiguous option: $1
+ { { echo "$as_me:7719: error: ambiguous option: $1
Try \`$0 --help' for more information." >&5
echo "$as_me: error: ambiguous option: $1
Try \`$0 --help' for more information." >&2;}
@@ -7740,12 +7741,12 @@ Try \`$0 --help' for more information." >&2;}
'ftconfig.h' ) CONFIG_HEADERS="$CONFIG_HEADERS ftconfig.h:ftconfig.in" ;;
# This is an error.
- -*) { { echo "$as_me:7743: error: unrecognized option: $1
+ -*) { { echo "$as_me:7744: error: unrecognized option: $1
Try \`$0 --help' for more information." >&5
echo "$as_me: error: unrecognized option: $1
Try \`$0 --help' for more information." >&2;}
{ (exit 1); exit 1; }; } ;;
- *) { { echo "$as_me:7748: error: invalid argument: $1" >&5
+ *) { { echo "$as_me:7749: error: invalid argument: $1" >&5
echo "$as_me: error: invalid argument: $1" >&2;}
{ (exit 1); exit 1; }; };;
esac
@@ -7990,7 +7991,7 @@ done; }
esac
if test x"$ac_file" != x-; then
- { echo "$as_me:7993: creating $ac_file" >&5
+ { echo "$as_me:7994: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
rm -f "$ac_file"
fi
@@ -8008,7 +8009,7 @@ echo "$as_me: creating $ac_file" >&6;}
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:8011: error: cannot find input file: $f" >&5
+ test -f "$f" || { { echo "$as_me:8012: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
@@ -8021,7 +8022,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:8024: error: cannot find input file: $f" >&5
+ { { echo "$as_me:8025: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
@@ -8082,7 +8083,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
* ) ac_file_in=$ac_file.in ;;
esac
- test x"$ac_file" != x- && { echo "$as_me:8085: creating $ac_file" >&5
+ test x"$ac_file" != x- && { echo "$as_me:8086: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
# First look for the input files in the build tree, otherwise in the
@@ -8093,7 +8094,7 @@ echo "$as_me: creating $ac_file" >&6;}
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:8096: error: cannot find input file: $f" >&5
+ test -f "$f" || { { echo "$as_me:8097: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
@@ -8106,7 +8107,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:8109: error: cannot find input file: $f" >&5
+ { { echo "$as_me:8110: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
@@ -8223,7 +8224,7 @@ cat >>$CONFIG_STATUS <<\EOF
rm -f $tmp/in
if test x"$ac_file" != x-; then
if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
- { echo "$as_me:8226: $ac_file is unchanged" >&5
+ { echo "$as_me:8227: $ac_file is unchanged" >&5
echo "$as_me: $ac_file is unchanged" >&6;}
else
ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
diff --git a/builds/unix/configure.ac b/builds/unix/configure.ac
new file mode 100644
index 0000000..508864a
--- /dev/null
+++ b/builds/unix/configure.ac
@@ -0,0 +1,91 @@
+dnl This file is part of the FreeType project.
+dnl
+dnl Process this file with autoconf to produce a configure script.
+dnl
+
+AC_INIT
+AC_CONFIG_SRCDIR([ftconfig.in])
+
+dnl configuration file -- stay in 8.3 limit
+AC_CONFIG_HEADER(ftconfig.h:ftconfig.in)
+
+version_info='6:1:0'
+AC_SUBST(version_info)
+ft_version=`echo $version_info | tr : .`
+AC_SUBST(ft_version)
+
+dnl checks for system type
+AC_CANONICAL_TARGET([])
+
+dnl checks for programs
+AC_PROG_CC
+AC_PROG_CPP
+
+dnl get Compiler flags right.
+if test "x$CC" = xgcc; then
+ XX_CFLAGS="-Wall"
+ XX_ANSIFLAGS="-pedantic -ansi"
+else
+ case "$host" in
+ *-dec-osf*)
+ CFLAGS=
+ XX_CFLAGS="-std1 -g3"
+ XX_ANSIFLAGS=
+ ;;
+ *)
+ XX_CFLAGS=
+ XX_ANSIFLAGS=
+ ;;
+ esac
+fi
+AC_SUBST(XX_CFLAGS)
+AC_SUBST(XX_ANSIFLAGS)
+
+AC_CHECK_PROG(RMF, rm, rm -f)
+AC_CHECK_PROG(RMDIR, rmdir, rmdir)
+
+dnl Since this file will be finally moved to another directory we make
+dnl the path of the install script absolute. This small code snippet has
+dnl been taken from automake's `ylwrap' script.
+AC_PROG_INSTALL
+case "$INSTALL" in
+ /*)
+ ;;
+ */*)
+ INSTALL="`pwd`/$INSTALL" ;;
+esac
+
+dnl checks for header files
+AC_HEADER_STDC
+AC_CHECK_HEADERS(fcntl.h unistd.h)
+
+dnl checks for typedefs, structures, and compiler characteristics
+AC_C_CONST
+AC_CHECK_SIZEOF(int)
+AC_CHECK_SIZEOF(long)
+
+dnl checks for library functions
+
+dnl Here we check whether we can use our mmap file component.
+AC_FUNC_MMAP
+if test "$ac_cv_func_mmap_fixed_mapped" != yes; then
+ FTSYS_SRC='$(BASE_)ftsystem.c'
+else
+ FTSYS_SRC='$(BUILD)/ftsystem.c'
+
+ FT_MUNMAP_DECL
+ FT_MUNMAP_PARAM
+fi
+AC_SUBST(FTSYS_SRC)
+
+AC_CHECK_FUNCS(memcpy memmove)
+
+AC_PROG_LIBTOOL
+
+dnl create the Unix-specific sub-Makefiles `builds/unix/unix-def.mk'
+dnl and 'builds/unix/unix-cc.mk' that will be used by the build system
+dnl
+AC_CONFIG_FILES([unix-cc.mk:unix-cc.in unix-def.mk:unix-def.in freetype-config])
+AC_OUTPUT
+
+dnl end of configure.ac
diff --git a/builds/unix/configure.in b/builds/unix/configure.in
deleted file mode 100644
index 65f42c0..0000000
--- a/builds/unix/configure.in
+++ /dev/null
@@ -1,89 +0,0 @@
-dnl This file is part of the FreeType project.
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-
-AC_INIT(ftconfig.in)
-
-dnl configuration file -- stay in 8.3 limit
-AC_CONFIG_HEADER(ftconfig.h:ftconfig.in)
-
-version_info='6:1:0'
-AC_SUBST(version_info)
-ft_version=`echo $version_info | tr : .`
-AC_SUBST(ft_version)
-
-dnl checks for system type
-AC_CANONICAL_SYSTEM
-
-dnl checks for programs
-AC_PROG_CC
-AC_PROG_CPP
-
-dnl get Compiler flags right.
-if test "x$CC" = xgcc; then
- XX_CFLAGS="-Wall"
- XX_ANSIFLAGS="-pedantic -ansi"
-else
- case "$host" in
- *-dec-osf*)
- CFLAGS=
- XX_CFLAGS="-std1 -g3"
- XX_ANSIFLAGS=
- ;;
- *)
- XX_CFLAGS=
- XX_ANSIFLAGS=
- ;;
- esac
-fi
-AC_SUBST(XX_CFLAGS)
-AC_SUBST(XX_ANSIFLAGS)
-
-AC_CHECK_PROG(RMF, rm, rm -f)
-AC_CHECK_PROG(RMDIR, rmdir, rmdir)
-
-dnl Since this file will be finally moved to another directory we make
-dnl the path of the install script absolute. This small code snippet has
-dnl been taken from automake's `ylwrap' script.
-AC_PROG_INSTALL
-case "$INSTALL" in
- /*)
- ;;
- */*)
- INSTALL="`pwd`/$INSTALL" ;;
-esac
-
-dnl checks for header files
-AC_HEADER_STDC
-AC_CHECK_HEADERS(fcntl.h unistd.h)
-
-dnl checks for typedefs, structures, and compiler characteristics
-AC_C_CONST
-AC_CHECK_SIZEOF(int)
-AC_CHECK_SIZEOF(long)
-
-dnl checks for library functions
-
-dnl Here we check whether we can use our mmap file component.
-AC_FUNC_MMAP
-if test "$ac_cv_func_mmap_fixed_mapped" != yes; then
- FTSYS_SRC='$(BASE_)ftsystem.c'
-else
- FTSYS_SRC='$(BUILD)/ftsystem.c'
-
- FT_MUNMAP_DECL
- FT_MUNMAP_PARAM
-fi
-AC_SUBST(FTSYS_SRC)
-
-AC_CHECK_FUNCS(memcpy memmove)
-
-AC_PROG_LIBTOOL
-
-dnl create the Unix-specific sub-Makefiles `builds/unix/unix-def.mk'
-dnl and 'builds/unix/unix-cc.mk' that will be used by the build system
-dnl
-AC_OUTPUT(unix-cc.mk:unix-cc.in unix-def.mk:unix-def.in freetype-config)
-
-dnl end of configure.in