summaryrefslogtreecommitdiff
path: root/builds
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2001-06-08 12:19:22 +0000
committerWerner Lemberg <wl@gnu.org>2001-06-08 12:19:22 +0000
commit6c01dd82ae914fac6b347b9ededae2ddc4f8bd22 (patch)
tree1afbab0583507619441ecab1ec72ff174b06c756 /builds
parentc4256c6fe15dbefd54b5134d273b75a444f9d24e (diff)
downloadfreetype2-6c01dd82ae914fac6b347b9ededae2ddc4f8bd22.tar.gz
* 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.
Diffstat (limited to 'builds')
-rw-r--r--builds/unix/configure23
-rw-r--r--builds/unix/configure.ac (renamed from builds/unix/configure.in)10
2 files changed, 18 insertions, 15 deletions
diff --git a/builds/unix/configure b/builds/unix/configure
index 442fd7365..f99ce518f 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.in b/builds/unix/configure.ac
index 65f42c0f4..508864a12 100644
--- a/builds/unix/configure.in
+++ b/builds/unix/configure.ac
@@ -3,7 +3,8 @@ dnl
dnl Process this file with autoconf to produce a configure script.
dnl
-AC_INIT(ftconfig.in)
+AC_INIT
+AC_CONFIG_SRCDIR([ftconfig.in])
dnl configuration file -- stay in 8.3 limit
AC_CONFIG_HEADER(ftconfig.h:ftconfig.in)
@@ -14,7 +15,7 @@ ft_version=`echo $version_info | tr : .`
AC_SUBST(ft_version)
dnl checks for system type
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_TARGET([])
dnl checks for programs
AC_PROG_CC
@@ -84,6 +85,7 @@ 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)
+AC_CONFIG_FILES([unix-cc.mk:unix-cc.in unix-def.mk:unix-def.in freetype-config])
+AC_OUTPUT
-dnl end of configure.in
+dnl end of configure.ac