commit d28955d84ee6a8a4c53fa156e5026b8615475526
author Marcus Meissner <Marcus.Meissner@caldera.de> Thu May 31 21:35:15 2001 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu May 31 21:35:15 2001 +0000
tree 699271691cf01195e6f29ced4d02dd2a89ca10bd
parent afdeba82aef70e4cae1d784e702deb4ec87a94ab

If you have freetype1 and freetype2 coexisting, freetype-config should
be freetype2-config.

configure.in

diff --git a/configure.in b/configure.in
index f78ff4a..05e71a8 100644
--- a/configure.in
+++ b/configure.in
@@ -386,7 +386,15 @@
     FREETYPEINCL=""
     wine_cv_msg_freetype=no
 else
-    AC_CHECK_PROG(ft_devel,freetype-config,yes,no)
+    AC_CHECK_PROG(ft_devel,freetype-config,freetype-config,no)
+    if test "$ft_devel" = "no"
+    then
+        AC_CHECK_PROG(ft_devel2,freetype2-config,freetype2-config,no)
+        if test "$ft_devel2" = "freetype2-config"
+	then
+		ft_devel=$ft_devel2
+	fi
+    fi
     if test "$ft_devel" = "no"
     then
     	FREETYPELIBS=""
@@ -394,8 +402,8 @@
 	wine_cv_msg_freetype=yes
     else
     	AC_DEFINE(HAVE_FREETYPE)
-	FREETYPELIBS=`freetype-config --libs`
-	FREETYPEINCL=`freetype-config --cflags`
+	FREETYPELIBS=`$ft_devel --libs`
+	FREETYPEINCL=`$ft_devel --cflags`
 	wine_cv_msg_freetype=no
     fi
 fi