build system: handling of freetype-config and pkg-config

git-svn-id: svn://tug.org/texlive/trunk@13083 c570f23f-e606-0410-a88d-b1316a301751

27 files changed, 62 insertions, 74 deletions

diff --git a/Build/source/README.config b/Build/source/README.config
index ed09b300a3c..dd2485d6863 100644
--- a/Build/source/README.config
+++ b/Build/source/README.config
@@ -136,3 +136,33 @@ unusual location.
 When a system version of a required library is chosen, the top-level configure script
 performs a consistency check and bails out early if this fails.
 
+4. Some important VAR=value configure arguments
+===============================================
+
+Used instead of searching for programs in PATH.
+
+4.1. FT2_CONFIG=/path/to/freetype-config
+----------------------------------------
+
+For system freetype2 library.
+
+4.2. PKG_CONFIG=/path/to/pkg-config
+-----------------------------------
+
+For fontconfig and system xpdf (poppler) libraries.
+
+4.3. CLISP=/path/to/clisp
+-------------------------
+
+For xindy.
+
+4.4. latex=/path/to/latex
+-------------------------
+
+To build xindy make-rules.
+
+4.5. pdflatex=/path/to/pdflatex
+-------------------------------
+
+To build xindy docs.
+
diff --git a/Build/source/configure b/Build/source/configure
index a25e1e36911..81f6707b4a4 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -20310,7 +20310,7 @@ $as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_FT2_CONFIG" = x; then
-    FT2_CONFIG=":"
+    FT2_CONFIG="false"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
@@ -20324,7 +20324,7 @@ else
   FT2_CONFIG="$ac_cv_prog_FT2_CONFIG"
 fi
 
-if test -n `$FT2_CONFIG --ftversion 2>/dev/null`; then
+if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
   FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
   FREETYPE2_LIBS=`$FT2_CONFIG --libs`
 elif test "x$need_freetype2:$with_freetype2_xpdf" = 'xyes:yes'; then
diff --git a/Build/source/libs/freetype/Makefile.am b/Build/source/libs/freetype/Makefile.am
index e5842f97d36..5a61f321504 100644
--- a/Build/source/libs/freetype/Makefile.am
+++ b/Build/source/libs/freetype/Makefile.am
@@ -18,9 +18,7 @@ EXTRA_DIST = $(FREETYPE_TREE)
 dist-hook:
 	rm -rf `find $(distdir)/$(FREETYPE_TREE) -name .svn`
 
-if build
 noinst_DATA = libttf.a
-endif build
 
 ft-build/Makefile:
 	rm -rf ft-build
diff --git a/Build/source/libs/freetype/Makefile.in b/Build/source/libs/freetype/Makefile.in
index 3ce20b9fd07..4bbcd6a8131 100644
--- a/Build/source/libs/freetype/Makefile.in
+++ b/Build/source/libs/freetype/Makefile.in
@@ -137,7 +137,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I ../../m4
 EXTRA_DIST = $(FREETYPE_TREE)
-@build_TRUE@noinst_DATA = libttf.a
+noinst_DATA = libttf.a
 all: all-am
 
 .SUFFIXES:
diff --git a/Build/source/libs/freetype2/Makefile.am b/Build/source/libs/freetype2/Makefile.am
index 5f6bbe0fdf4..401a1404c71 100644
--- a/Build/source/libs/freetype2/Makefile.am
+++ b/Build/source/libs/freetype2/Makefile.am
@@ -18,9 +18,7 @@ EXTRA_DIST = $(FREETYPE_TREE)
 dist-hook:
 	rm -rf `find $(distdir)/$(FREETYPE_TREE) -name .svn`
 
-if build
 noinst_DATA = libfreetype.a
-endif build
 
 ft-build/Makefile:
 	rm -rf ft-build
diff --git a/Build/source/libs/freetype2/Makefile.in b/Build/source/libs/freetype2/Makefile.in
index c8e60494663..f8963c70ccb 100644
--- a/Build/source/libs/freetype2/Makefile.in
+++ b/Build/source/libs/freetype2/Makefile.in
@@ -137,7 +137,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I ../../m4
 EXTRA_DIST = $(FREETYPE_TREE)
-@build_TRUE@noinst_DATA = libfreetype.a
+noinst_DATA = libfreetype.a
 all: all-am
 
 .SUFFIXES:
diff --git a/Build/source/libs/gd/Makefile.am b/Build/source/libs/gd/Makefile.am
index f6d597bc622..b815e9852ae 100644
--- a/Build/source/libs/gd/Makefile.am
+++ b/Build/source/libs/gd/Makefile.am
@@ -21,10 +21,7 @@ dist-hook:
 
 INCLUDES = -I$(top_srcdir)/$(GD_TREE) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES)
 
-if build
 noinst_LIBRARIES=libgd.a
-endif build
-EXTRA_LIBRARIES=libgd.a
 
 nodist_libgd_a_SOURCES = \
 	$(GD_TREE)/gd.c \
diff --git a/Build/source/libs/gd/Makefile.in b/Build/source/libs/gd/Makefile.in
index 13b3c3c4fe3..1f417ce037d 100644
--- a/Build/source/libs/gd/Makefile.in
+++ b/Build/source/libs/gd/Makefile.in
@@ -192,8 +192,7 @@ top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I ../../m4
 EXTRA_DIST = $(GD_TREE)
 INCLUDES = -I$(top_srcdir)/$(GD_TREE) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES)
-@build_TRUE@noinst_LIBRARIES = libgd.a
-EXTRA_LIBRARIES = libgd.a
+noinst_LIBRARIES = libgd.a
 nodist_libgd_a_SOURCES = \
 	$(GD_TREE)/gd.c \
 	$(GD_TREE)/gd_gd.c \
diff --git a/Build/source/libs/graphite/Makefile.am b/Build/source/libs/graphite/Makefile.am
index 5427a58b5df..f8011a56dad 100644
--- a/Build/source/libs/graphite/Makefile.am
+++ b/Build/source/libs/graphite/Makefile.am
@@ -5,10 +5,7 @@ INCLUDES = -I$(top_srcdir)/include/graphite -I$(top_srcdir)/src/generic
 INCLUDES += -I$(top_srcdir)/src/font -I$(top_srcdir)/src/segment 
 AM_CPPFLAGS = -DNDEBUG
 
-if build
 noinst_LIBRARIES = libgraphite.a
-endif build
-EXTRA_LIBRARIES = libgraphite.a
 
 noinst_HEADERS = \
 	include/graphite/FileFont.h \
diff --git a/Build/source/libs/graphite/Makefile.in b/Build/source/libs/graphite/Makefile.in
index 4754a361908..7ae2f712d72 100644
--- a/Build/source/libs/graphite/Makefile.in
+++ b/Build/source/libs/graphite/Makefile.in
@@ -205,8 +205,7 @@ INCLUDES = -I$(top_srcdir)/include/graphite \
 	-I$(top_srcdir)/src/generic -I$(top_srcdir)/src/font \
 	-I$(top_srcdir)/src/segment
 AM_CPPFLAGS = -DNDEBUG
-@build_TRUE@noinst_LIBRARIES = libgraphite.a
-EXTRA_LIBRARIES = libgraphite.a
+noinst_LIBRARIES = libgraphite.a
 noinst_HEADERS = \
 	include/graphite/FileFont.h \
 	include/graphite/Font.h \
diff --git a/Build/source/libs/libpng/Makefile.am b/Build/source/libs/libpng/Makefile.am
index abeb9a360bf..71d0c14c8af 100644
--- a/Build/source/libs/libpng/Makefile.am
+++ b/Build/source/libs/libpng/Makefile.am
@@ -28,10 +28,7 @@ dist-hook:
 INCLUDES = -I$(top_srcdir)/$(LIBPNG_TREE) $(ZLIB_INCLUDES)
 AM_CPPFLAGS = $(LIBPNG_DEFINES)
 
-if build
 noinst_LIBRARIES=libpng.a
-endif build
-EXTRA_LIBRARIES=libpng.a
 
 nodist_libpng_a_SOURCES = \
 	$(LIBPNG_TREE)/png.c \
diff --git a/Build/source/libs/libpng/Makefile.in b/Build/source/libs/libpng/Makefile.in
index d318207d979..133041a8dfc 100644
--- a/Build/source/libs/libpng/Makefile.in
+++ b/Build/source/libs/libpng/Makefile.in
@@ -193,8 +193,7 @@ ACLOCAL_AMFLAGS = -I ../../m4
 EXTRA_DIST = $(LIBPNG_TREE)
 INCLUDES = -I$(top_srcdir)/$(LIBPNG_TREE) $(ZLIB_INCLUDES)
 AM_CPPFLAGS = $(LIBPNG_DEFINES)
-@build_TRUE@noinst_LIBRARIES = libpng.a
-EXTRA_LIBRARIES = libpng.a
+noinst_LIBRARIES = libpng.a
 nodist_libpng_a_SOURCES = \
 	$(LIBPNG_TREE)/png.c \
 	$(LIBPNG_TREE)/pngset.c \
diff --git a/Build/source/libs/obsdcompat/Makefile.am b/Build/source/libs/obsdcompat/Makefile.am
index 019c5b066a8..3c61bb47084 100644
--- a/Build/source/libs/obsdcompat/Makefile.am
+++ b/Build/source/libs/obsdcompat/Makefile.am
@@ -5,10 +5,7 @@
 ##
 ACLOCAL_AMFLAGS = -I ../../m4
 
-if build
 noinst_LIBRARIES = libopenbsd-compat.a
-endif build
-EXTRA_LIBRARIES = libopenbsd-compat.a
 
 compat_sources = \
 	bsd-asprintf.c \
diff --git a/Build/source/libs/obsdcompat/Makefile.in b/Build/source/libs/obsdcompat/Makefile.in
index 4589eb9f135..997e47f12ce 100644
--- a/Build/source/libs/obsdcompat/Makefile.in
+++ b/Build/source/libs/obsdcompat/Makefile.in
@@ -188,8 +188,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I ../../m4
-@build_TRUE@noinst_LIBRARIES = libopenbsd-compat.a
-EXTRA_LIBRARIES = libopenbsd-compat.a
+noinst_LIBRARIES = libopenbsd-compat.a
 compat_sources = \
 	bsd-asprintf.c \
 	bsd-snprintf.c
diff --git a/Build/source/libs/t1lib/Makefile.am b/Build/source/libs/t1lib/Makefile.am
index e2623593db2..5df87c76841 100644
--- a/Build/source/libs/t1lib/Makefile.am
+++ b/Build/source/libs/t1lib/Makefile.am
@@ -34,10 +34,7 @@ AM_CFLAGS = $(T1LIB_CFLAGS)
 
 LDADD = libt1.a
 
-if build
 noinst_LIBRARIES = libt1.a
-endif build
-EXTRA_LIBRARIES = libt1.a
 
 nodist_libt1_a_SOURCES = $(lib_t1lib_sources) $(lib_type1_sources)
 
diff --git a/Build/source/libs/t1lib/Makefile.in b/Build/source/libs/t1lib/Makefile.in
index 18814f07e55..66182e16f4d 100644
--- a/Build/source/libs/t1lib/Makefile.in
+++ b/Build/source/libs/t1lib/Makefile.in
@@ -201,8 +201,7 @@ AM_CPPFLAGS = $(T1LIB_DEFINES) -DT1LIB_IDENT=\"@T1LIB_VERSIONSTRING@\" \
 	-DGLOBAL_CONFIG_DIR=\"@T1LIB_DATA_DIR@\"
 AM_CFLAGS = $(T1LIB_CFLAGS)
 LDADD = libt1.a
-@build_TRUE@noinst_LIBRARIES = libt1.a
-EXTRA_LIBRARIES = libt1.a
+noinst_LIBRARIES = libt1.a
 nodist_libt1_a_SOURCES = $(lib_t1lib_sources) $(lib_type1_sources)
 lib_t1lib_sources = \
 	$(T1LIB_TREE)/lib/t1lib/parseAFM.c \
diff --git a/Build/source/libs/teckit/Makefile.am b/Build/source/libs/teckit/Makefile.am
index 95b12a7206f..37261ca1ea7 100644
--- a/Build/source/libs/teckit/Makefile.am
+++ b/Build/source/libs/teckit/Makefile.am
@@ -8,10 +8,8 @@ ACLOCAL_AMFLAGS = -I ../../m4
 INCLUDES = -I$(top_srcdir)/source/Public-headers $(ZLIB_INCLUDES)
 AM_CPPFLAGS = -DNDEBUG
 
-if build
 noinst_LIBRARIES = libTECkit.a
-endif
-EXTRA_LIBRARIES = libTECkit_Compiler.a libTECkit.a
+EXTRA_LIBRARIES = libTECkit_Compiler.a
 
 libTECkit_Compiler_a_SOURCES = \
 	source/Compiler.cpp \
diff --git a/Build/source/libs/teckit/Makefile.in b/Build/source/libs/teckit/Makefile.in
index 80c96feb85d..9fcd3dea042 100644
--- a/Build/source/libs/teckit/Makefile.in
+++ b/Build/source/libs/teckit/Makefile.in
@@ -187,8 +187,8 @@ top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I ../../m4
 INCLUDES = -I$(top_srcdir)/source/Public-headers $(ZLIB_INCLUDES)
 AM_CPPFLAGS = -DNDEBUG
-@build_TRUE@noinst_LIBRARIES = libTECkit.a
-EXTRA_LIBRARIES = libTECkit_Compiler.a libTECkit.a
+noinst_LIBRARIES = libTECkit.a
+EXTRA_LIBRARIES = libTECkit_Compiler.a
 libTECkit_Compiler_a_SOURCES = \
 	source/Compiler.cpp \
 	source/UnicodeNames.cpp
diff --git a/Build/source/libs/zlib/Makefile.am b/Build/source/libs/zlib/Makefile.am
index 1dcada81ab8..4e141acc212 100644
--- a/Build/source/libs/zlib/Makefile.am
+++ b/Build/source/libs/zlib/Makefile.am
@@ -23,10 +23,7 @@ dist-hook:
 INCLUDES = -I$(top_srcdir)/$(ZLIB_TREE)
 AM_CPPFLAGS = $(ZLIB_DEFINES)
 
-if build
 noinst_LIBRARIES = libz.a
-endif build
-EXTRA_LIBRARIES = libz.a
 
 nodist_libz_a_SOURCES = \
 	$(ZLIB_TREE)/adler32.c \
diff --git a/Build/source/libs/zlib/Makefile.in b/Build/source/libs/zlib/Makefile.in
index 14f659b30ec..d68347c2967 100644
--- a/Build/source/libs/zlib/Makefile.in
+++ b/Build/source/libs/zlib/Makefile.in
@@ -189,8 +189,7 @@ ACLOCAL_AMFLAGS = -I ../../m4
 EXTRA_DIST = $(ZLIB_TREE)
 INCLUDES = -I$(top_srcdir)/$(ZLIB_TREE)
 AM_CPPFLAGS = $(ZLIB_DEFINES)
-@build_TRUE@noinst_LIBRARIES = libz.a
-EXTRA_LIBRARIES = libz.a
+noinst_LIBRARIES = libz.a
 nodist_libz_a_SOURCES = \
 	$(ZLIB_TREE)/adler32.c \
 	$(ZLIB_TREE)/compress.c \
diff --git a/Build/source/m4/kpse-common.m4 b/Build/source/m4/kpse-common.m4
index 667bd81d047..2a0d0d66e0f 100644
--- a/Build/source/m4/kpse-common.m4
+++ b/Build/source/m4/kpse-common.m4
@@ -277,3 +277,11 @@ AC_DEFUN([KPSE_MSG_ERROR],
 $2])],
        [AC_MSG_ERROR([$2], m4_default([$3], 1))])
 ]) # KPSE_MSG_ERROR
+
+# _KPSE_CHECK_PKG_CONFIG
+# ----------------------
+# Check for pkg-config
+AC_DEFUN([_KPSE_CHECK_PKG_CONFIG],
+[AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
+AC_CHECK_TOOL([PKG_CONFIG], [pkg-config], [false])[]dnl
+]) # _KPSE_CHECK_PKG_CONFIG
diff --git a/Build/source/m4/kpse-freetype2-flags.m4 b/Build/source/m4/kpse-freetype2-flags.m4
index c3bc661473c..138dc025941 100644
--- a/Build/source/m4/kpse-freetype2-flags.m4
+++ b/Build/source/m4/kpse-freetype2-flags.m4
@@ -37,7 +37,7 @@ AC_DEFUN([KPSE_FREETYPE2_OPTIONS],
 # ---------------------------
 AC_DEFUN([KPSE_FREETYPE2_SYSTEM_FLAGS],
 [AC_REQUIRE([_KPSE_CHECK_FT2_CONFIG])[]dnl
-if test -n `$FT2_CONFIG --ftversion 2>/dev/null`; then
+if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
   FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
   FREETYPE2_LIBS=`$FT2_CONFIG --libs`
 elif test "x$need_freetype2:$with_freetype2_xpdf" = 'xyes:yes'; then
@@ -50,5 +50,5 @@ fi
 # Check for freetype-config
 AC_DEFUN([_KPSE_CHECK_FT2_CONFIG],
 [AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
-AC_CHECK_TOOL([FT2_CONFIG], [freetype-config], [:])[]dnl
+AC_CHECK_TOOL([FT2_CONFIG], [freetype-config], [false])[]dnl
 ]) # _KPSE_CHECK_FT2_CONFIG
diff --git a/Build/source/m4/kpse-xpdf-flags.m4 b/Build/source/m4/kpse-xpdf-flags.m4
index c8cfd96f2c0..3591464133c 100644
--- a/Build/source/m4/kpse-xpdf-flags.m4
+++ b/Build/source/m4/kpse-xpdf-flags.m4
@@ -40,11 +40,3 @@ elif test "x$need_xpdf:$with_system_xpdf" = 'xyes:yes'; then
   AC_MSG_ERROR([did not find poppler-0.10 or better])
 fi
 ]) # KPSE_XPDF_SYSTEM_FLAGS
-
-# _KPSE_CHECK_PKG_CONFIG
-# ----------------------
-# Check for pkg-config
-AC_DEFUN([_KPSE_CHECK_PKG_CONFIG],
-[AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
-AC_CHECK_TOOL([PKG_CONFIG], [pkg-config], [false])[]dnl
-]) # _KPSE_CHECK_PKG_CONFIG
diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure
index 72be72578e8..239ab64acca 100755
--- a/Build/source/texk/dvipng/configure
+++ b/Build/source/texk/dvipng/configure
@@ -18194,7 +18194,7 @@ $as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_FT2_CONFIG" = x; then
-    FT2_CONFIG=":"
+    FT2_CONFIG="false"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
@@ -18215,7 +18215,7 @@ if test "${with_system_freetype2+set}" = set; then
   withval=$with_system_freetype2;
 fi
 if test "x$with_system_freetype2" = xyes; then
-  if test -n `$FT2_CONFIG --ftversion 2>/dev/null`; then
+  if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
   FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
   FREETYPE2_LIBS=`$FT2_CONFIG --libs`
 elif test "x$need_freetype2:$with_freetype2_xpdf" = 'xyes:yes'; then
diff --git a/Build/source/texk/kpathsea/man/Makefile.in b/Build/source/texk/kpathsea/man/Makefile.in
index 0b628fbec1d..82c1278202f 100644
--- a/Build/source/texk/kpathsea/man/Makefile.in
+++ b/Build/source/texk/kpathsea/man/Makefile.in
@@ -226,16 +226,10 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-install-man1: $(man1_MANS) $(man_MANS)
+install-man1: $(nodist_man1_MANS)
 	@$(NORMAL_INSTALL)
 	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-	for i in $$l2; do \
-	  case "$$i" in \
-	    *.1*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
+	@list='$(nodist_man1_MANS)'; \
 	for i in $$list; do \
 	  if test -f $$i; then file=$$i; \
 	  else file=$(srcdir)/$$i; fi; \
@@ -252,13 +246,7 @@ install-man1: $(man1_MANS) $(man_MANS)
 	done
 uninstall-man1:
 	@$(NORMAL_UNINSTALL)
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-	for i in $$l2; do \
-	  case "$$i" in \
-	    *.1*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
+	@list='$(nodist_man1_MANS)'; \
 	for i in $$list; do \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
 	  case "$$ext" in \
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index 091d55dfb50..bd55f38654b 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -23992,7 +23992,7 @@ $as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_FT2_CONFIG" = x; then
-    FT2_CONFIG=":"
+    FT2_CONFIG="false"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
@@ -24013,7 +24013,7 @@ if test "${with_system_freetype2+set}" = set; then
   withval=$with_system_freetype2;
 fi
 if test "x$with_system_freetype2" = xyes; then
-  if test -n `$FT2_CONFIG --ftversion 2>/dev/null`; then
+  if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
   FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
   FREETYPE2_LIBS=`$FT2_CONFIG --libs`
 elif test "x$need_freetype2:$with_freetype2_xpdf" = 'xyes:yes'; then
diff --git a/Build/source/texk/xdvipdfmx/configure b/Build/source/texk/xdvipdfmx/configure
index 55bf19800d8..9bd40c5c653 100755
--- a/Build/source/texk/xdvipdfmx/configure
+++ b/Build/source/texk/xdvipdfmx/configure
@@ -17425,7 +17425,7 @@ $as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_FT2_CONFIG" = x; then
-    FT2_CONFIG=":"
+    FT2_CONFIG="false"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
@@ -17446,7 +17446,7 @@ if test "${with_system_freetype2+set}" = set; then
   withval=$with_system_freetype2;
 fi
 if test "x$with_system_freetype2" = xyes; then
-  if test -n `$FT2_CONFIG --ftversion 2>/dev/null`; then
+  if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
   FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
   FREETYPE2_LIBS=`$FT2_CONFIG --libs`
 elif test "x$need_freetype2:$with_freetype2_xpdf" = 'xyes:yes'; then