Commit 26bd7a2c5d112143766d905de4346f738a2d4fb6
2008-06-09T21:27:17
s/enable_shared/build_libtool_libs/
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
diff --git a/ChangeLog b/ChangeLog
index 9b9b10e..283e32a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,8 +13,8 @@
* README.CVS: Updated.
- * builds/unix/configure.raw: Updated for newer versions of autoconf
- and friends.
+ * builds/unix/configure.raw, builds/unix/freetype-config.in: Updated
+ for newer versions of autoconf and friends.
2008-06-08 Werner Lemberg <wl@gnu.org>
diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw
index 7839e01..1d8a513 100644
--- a/builds/unix/configure.raw
+++ b/builds/unix/configure.raw
@@ -510,8 +510,7 @@ LT_INIT(win32-dll)
AC_SUBST([hardcode_libdir_flag_spec])
AC_SUBST([wl])
-# urgh -- this is an internal libtool variable...
-AC_SUBST([enable_shared])
+AC_SUBST([build_libtool_libs])
# configuration file -- stay in 8.3 limit
diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in
index 57f0f95..a343522 100644
--- a/builds/unix/freetype-config.in
+++ b/builds/unix/freetype-config.in
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# Copyright 2000, 2001, 2002, 2003, 2004, 2005 by
+# Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2008 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -14,7 +14,7 @@ exec_prefix=@exec_prefix@
exec_prefix_set=no
includedir=@includedir@
libdir=@libdir@
-enable_shared=@enable_shared@
+enable_shared=@build_libtool_libs@
wl=@wl@
hardcode_libdir_flag_spec='@hardcode_libdir_flag_spec@'