Support pkg-config for detecting freetype2 includes and libs. Fixes Ubuntu 19.10...

diff --git a/cde/configure.ac b/cde/configure.ac
index c7b5dc1fe9e685d07d7aabfc2c400a416eab987d..8fba70e3a62fe77d45a014386a18637e5a7fc5f6 100644 (file)
--- a/cde/configure.ac
+++ b/cde/configure.ac
@@ -402,14 +402,29 @@ AC_SUBST([XTOOLLIB])
 dnl Check for freetype libraries/headers
 AC_CHECK_TOOLS([FREETYPE_CONFIG], [freetype-config])
 if test -z "$FREETYPE_CONFIG"; then
-  AC_MSG_ERROR([Missing freetype-config. Install freetype development headers and library.])
+  dnl freetype-config not available try pkg-config
+
+  AC_CHECK_TOOLS([FREETYPE_CONFIG], [pkg-config])
+  if test -z "$FREETYPE_CONFIG"; then
+    AC_MSG_ERROR([Missing freetype-config or pkg-config. Install freetype development headers and library.])
+  fi
+
+  dnl check specific package is available
+  PKG_CHECK_MODULES([FREETYPE_CHECK], [freetype2])
+
+  FREETYPE_CFLAGS=`$FREETYPE_CONFIG freetype2 --cflags`
+  AC_SUBST(FREETYPE_CFLAGS)
+  FREETYPE_LIBS=`$FREETYPE_CONFIG freetype2 --libs`
+  AC_SUBST(FREETYPE_LIBS)
+else
+  dnl freetype-config is available
+
+  FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags`
+  AC_SUBST(FREETYPE_CFLAGS)
+  FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`
+  AC_SUBST(FREETYPE_LIBS)
 fi
 
-FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags`
-AC_SUBST(FREETYPE_CFLAGS)
-FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`
-AC_SUBST(FREETYPE_LIBS)
-
 dnl check MISSING_PROGS - error out here if there's stuff in it.
 
 if test -n "$MISSING_PROGS"; then