* builds/unix/freetype2.m4: Some portability fixes.

4 files changed, 53 insertions, 40 deletions

diff --git a/ChangeLog b/ChangeLog
index 0b9e2f2bd..40e12f5b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-12-12  Werner Lemberg  <wl@gnu.org>
+
+	* builds/unix/freetype2.m4: Some portability fixes.
+
 2001-12-11  Jouk Jansen  <joukj@hrem.stm.tudelft.nl>
 
 	* src/base/descrip.mms (OBJS): Add ftdebug.obj.
@@ -13,9 +17,9 @@
 
 	* docs/FTL.TXT: Simple fix (change "LICENSE.TXT" to "FTL.TXT").
 
-	* builds/unix/freetype2.m4: Added autoconf macro; we need to install
-	it in $(prefix)/share/aclocal/freetype2.m4 but I didn't modify
-	builds/unix/install.mk yet.
+	* builds/unix/freetype2.m4: New file for checking configure paths. 
+	We need to install it in $(prefix)/share/aclocal/freetype2.m4 but I
+	didn't modify builds/unix/install.mk yet.
 
 	* INSTALL: Updated the instructions to build shared libraries with
 	Jam.  They were simply wrong.
diff --git a/builds/unix/freetype2.m4 b/builds/unix/freetype2.m4
index 16ae2e67d..39c870e2e 100644
--- a/builds/unix/freetype2.m4
+++ b/builds/unix/freetype2.m4
@@ -14,8 +14,10 @@ AC_ARG_WITH(freetype-prefix,
 AC_ARG_WITH(freetype-exec-prefix,
 [  --with-ft-exec-prefix=PFX Exec prefix where FreeType is installed (optional)],
             ft_config_exec_prefix="$withval", ft_config_exec_prefix="")
-AC_ARG_ENABLE(freetypetest, [  --disable-freetypetest  Do not try to compile and run a test FreeType program],[],
-              enable_fttest=yes)
+AC_ARG_ENABLE(freetypetest,
+[  --disable-freetypetest    Do not try to compile and run
+                            a test FreeType program],
+            [], enable_fttest=yes)
 
 if test x$ft_config_exec_prefix != x ; then
   ft_config_args="$ft_config_args --exec-prefix=$ft_config_exec_prefix"
@@ -52,15 +54,23 @@ else
   ft_min_micro_version=`echo $min_ft_version | \
          sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
   if test "x$enable_fttest" = "xyes" ; then
-    ft_config_version=$((                   \
-           $ft_config_major_version*10000 + \
-           $ft_config_minor_version*100   + \
-           $ft_config_micro_version))
-    ft_min_version=$((                   \
-           $ft_min_major_version*10000 + \
-           $ft_min_minor_version*100   + \
-           $ft_min_micro_version))
-    if test $ft_config_version -lt $ft_min_version ; then
+    ft_config_is_lt=no
+    if test $ft_config_major_version -lt $ft_min_major_version ; then
+      ft_config_is_lt=yes
+    else
+      if test $ft_config_major_version -eq $ft_min_major_version ; then
+        if test $ft_config_minor_version -lt $ft_min_minor_version ; then
+          ft_config_is_lt=yes
+        else
+          if test $ft_config_minor_version -eq $ft_min_minor_version ; then
+            if test $ft_config_micro_version -lt $ft_min_micro_version ; then
+              ft_config_is_lt=yes
+            fi
+          fi
+        fi
+      fi
+    fi
+    if test "x$ft_config_is_lt" = "xyes" ; then
       ifelse([$3], , :, [$3])
     else
       ac_save_CFLAGS="$CFLAGS"
@@ -68,7 +78,7 @@ else
       CFLAGS="$CFLAGS $FT2_CFLAGS"
       LIBS="$FT2_LIBS $LIBS"
 dnl
-dnl Sanity checks the results of freetype-config to some extent
+dnl Sanity checks for the results of freetype-config to some extent
 dnl
       AC_TRY_RUN([
 #include <ft2build.h>
@@ -77,20 +87,20 @@ dnl
 #include <stdlib.h>
 
 int
-main ()
+main()
 {
-    FT_Library library;
-    FT_Error error;
+  FT_Library library;
+  FT_Error error;
 
-    error = FT_Init_FreeType( &library );
+  error = FT_Init_FreeType(&library);
 
-    if ( error )
-    {
-        return 1;
-    } else {
-        FT_Done_FreeType( library );
-        return 0;
-    }
+  if (error)
+    return 1;
+  else
+  {
+    FT_Done_FreeType(library);
+    return 0;
+  }
 }
 ],, no_ft=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
       CFLAGS="$ac_save_CFLAGS"
@@ -104,8 +114,8 @@ if test "x$no_ft" = x ; then
 else
    AC_MSG_RESULT(no)
    if test "$FT2_CONFIG" = "no" ; then
-     echo "*** The freetype-config script installed by FT2 could not be found"
-     echo "*** If FT2 was installed in PREFIX, make sure PREFIX/bin is in"
+     echo "*** The freetype-config script installed by FreeType 2 could not be found."
+     echo "*** If FreeType 2 was installed in PREFIX, make sure PREFIX/bin is in"
      echo "*** your path, or set the FT2_CONFIG environment variable to the"
      echo "*** full path to freetype-config."
    else
diff --git a/docs/CHANGES b/docs/CHANGES
index a998c42ab..855e9034a 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -1,16 +1,15 @@
 LATEST CHANGES BETWEEN 2.0.6 and 2.0.5
 
-  - the caching sub-system has been completely re-designed and its API
-    has evolved (the old one is still supported for bacwards compatibility
-    though..)
+  - The caching sub-system has been completely re-designed, and its API has
+    evolved (the old one is still supported for backwards).
 
-  - a new charmap cache is provided too
+  - A new charmap cache is provided too.
 
   - A new Postscript hinter module has been added to support native hints in
     the following formats: Postscript Type 1, Postscript CID and CFF/CEF.
 
-    (For now, only the Type 1 driver uses it; the "cid" and "cff" drivers
-     will be updated shortly.)
+    For now, only the Type 1 driver uses it; the "cid" and "cff" drivers
+    will be updated shortly.
 
   - "glnames.py" still contained a bug that made FreeType return invalid
     names for certain glyphs.
diff --git a/docs/FTL.txt b/docs/FTL.txt
index f238880a7..4dc0fb168 100644
--- a/docs/FTL.txt
+++ b/docs/FTL.txt
@@ -93,12 +93,12 @@ Legal Terms
   authorize others  to exercise  some or all  of the  rights granted
   herein, subject to the following conditions:
 
-    o Redistribution  of source code  must retain this  license file
-      (`FTL.TXT') unaltered;  any  additions,  deletions or  changes
-      to   the  original   files  must   be  clearly   indicated  in
-      accompanying  documentation.   The  copyright notices  of  the
-      unaltered, original  files must be preserved in  all copies of
-      source files.
+    o Redistribution of  source code  must retain this  license file
+      (`FTL.TXT') unaltered; any  additions, deletions or changes to
+      the original  files must be clearly  indicated in accompanying
+      documentation.   The  copyright   notices  of  the  unaltered,
+      original  files must  be  preserved in  all  copies of  source
+      files.
 
     o Redistribution in binary form must provide a  disclaimer  that
       states  that  the software is based in part of the work of the