Subversion Repositories

Description: Support recent versions of libfreetype that (only) provide pkg-config files
Origin: upstream, http://pike-librarian.lysator.liu.se/index.xml?checkins=46adc327dea6d6d237a39d21bad2125b9b2501b1,4b8cdf2bc0586becc76fe725473395b63aa3caa5
Author: Henrik Grubbström (Grubba) <grubba@grubba.org>

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 82d0288a1d..3f7551044b 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -1887,10 +1887,11 @@ AC_DEFUN(PIKE_LOW_PKG_CONFIG,
   $2="[$]$2 ${pkg_stuff}"
 ])
 
-dnl package
+dnl package, on_success_opt, on_failure_opt
 AC_DEFUN(PIKE_PKG_CONFIG,
 [
   AC_REQUIRE([PIKE_PROG_PKG_CONFIG])dnl
+  pike_cv_pkg_config_$1=no
   if test "${PKG_CONFIG}" = no; then :; else
     AC_MSG_CHECKING([if a pkg-config based $1 is installed])
     if "${PKG_CONFIG}" "$1"; then
@@ -1899,8 +1900,16 @@ AC_DEFUN(PIKE_PKG_CONFIG,
       PIKE_LOW_PKG_CONFIG([$1], [CFLAGS],   [--cflags-only-other])
       PIKE_LOW_PKG_CONFIG([$1], [LDFLAGS],  [--libs-only-L])
       PIKE_LOW_PKG_CONFIG([$1], [LIBS],     [--libs-only-l --libs-only-other])
+      pike_cv_pkg_config_$1=yes
     else
       AC_MSG_RESULT(no)
     fi
   fi
+  ifelse([$2$3], , , [
+    if test "x$pike_cv_pkg_config_$1" = "xno"; then
+      ifelse([$3], , :, [$3])
+    else
+      ifelse([$2], , :, [$2])
+    fi
+  ])
 ])
diff --git a/src/modules/_Image_FreeType/configure.in b/src/modules/_Image_FreeType/configure.in
index 1ce8abea8c..c3ac7f9a85 100644
--- a/src/modules/_Image_FreeType/configure.in
+++ b/src/modules/_Image_FreeType/configure.in
@@ -10,7 +10,11 @@ if test "x$with_freetype" = "xyes" ; then
 
   PIKE_FEATURE_NODEP(Image.FreeType)
 
-  MY_AC_PATH_PROGS(FT_CONFIG, ${ac_tool_prefix}freetype-config freetype-config, no)
+  PIKE_PKG_CONFIG(freetype2, [
+    FT_CONFIG="${PKG_CONFIG} freetype2"
+  ], [
+    MY_AC_PATH_PROGS(FT_CONFIG, ${pike_cv_tool_prefix}freetype-config ${ac_tool_prefix}freetype-config, no)
+  ])
 
   if test "$FT_CONFIG" = "no" ; then
      :