Update the configure script so that the user can specify the pango include directories for systems (like the mac) where pkg-config doesn't exist.

1 files changed, 29 insertions, 1 deletions

diff --git a/configure.static.in b/configure.static.in
index 121e3d66..fa91200b 100644
--- a/configure.static.in
+++ b/configure.static.in
@@ -259,11 +259,13 @@ if test "$gww_hascairo" = "no" ; then
  AC_DEFINE(_NO_LIBCAIRO)
 fi
 
+
 dnl Do we have libpango
 
 gww_haspango="no"
 gww_haspangocairo="no"
 gww_checkpango="yes"
+gww_has_pkg_config="yes"
 AC_ARG_WITH(pango,
  [  --without-pango   Don't use libpango],
  [
@@ -272,8 +274,32 @@ AC_ARG_WITH(pango,
    fi
  ], : )
 if test "$gww_checkpango" = "yes" ; then
-  if pkg-config --libs pangoxft >& /dev/null ; then
+ pan_headers=""
+ pan_lib=""
+ AC_ARG_WITH(pango-headers,
+  [  --with-pango-headers=dirs   Specify the CPPFLAGS needed to compile pango],
+  [
+     if test "$withval" != "no" -a "$withval" != "yes" >/dev/null 2>&1 ; then
+	  pan_headers="$withval"
+	  CFLAGS="$CFLAGS $pan_headers"
+      fi
+   ], : )
+ AC_ARG_WITH(pango-lib,
+  [  --with-pango-lib   Specify LDFLAGS needed to link with pango],
+  [
+     if test "$withval" != "no" -a "$withval" != "yes" >/dev/null 2>&1 ; then
+	  pan_lib="$withval"
+	  LDFLAGS="$LDFLAGS $pan_libs"
+      fi
+   ], : )
+  if test "$pan_headers" != "" >& /dev/null ; then
+    gww_haspango="done"
+  elif pkg-config --libs pangoxft >& /dev/null ; then
     AC_CHECK_HEADER(X11/Xft/Xft.h, gww_haspango="yes",,[#include <ft2build.h>])
+  elif pkg-config --version >& /dev/null ; then
+    OK_Theyve_got_pkg_config="yes"
+  else
+    gww_has_pkg_config="no"
   fi
 fi
 if test "$gww_haspango" = "yes" ; then
@@ -288,6 +314,8 @@ fi
 if test "$gww_haspango" = "no" ; then
   gww_haspangocairo="no"
   AC_DEFINE(_NO_LIBPANGO)
+elif test "$gww_haspango" = "done" ; then
+ gww_haspango="yes"
 fi
 
 AC_ARG_ENABLE(macapp,