build system: fix fonconfig detection, allow build without latex

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

7 files changed, 32 insertions, 9 deletions

diff --git a/Build/source/libs/xpdf/xpdf-3.02-PATCHES/ChangeLog b/Build/source/libs/xpdf/xpdf-3.02-PATCHES/ChangeLog
index 4aa7ee7c35d..53e072de623 100644
--- a/Build/source/libs/xpdf/xpdf-3.02-PATCHES/ChangeLog
+++ b/Build/source/libs/xpdf/xpdf-3.02-PATCHES/ChangeLog
@@ -1,4 +1,4 @@
-2009-05-10  Peter Breitenlohner  <peb@mppmu.mpg.de>
+2009-05-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* patch-10-exclude-body-of-Page::getDefaultCTM (removed),
 	* patch-10-exclude-body-of-Page_getDefaultCTM (new): renamed
diff --git a/Build/source/m4/kpse-fontconfig-flags.m4 b/Build/source/m4/kpse-fontconfig-flags.m4
index 8151e84910a..4e869006ee3 100644
--- a/Build/source/m4/kpse-fontconfig-flags.m4
+++ b/Build/source/m4/kpse-fontconfig-flags.m4
@@ -31,7 +31,7 @@ else
   kpse_cv_fontconfig_includes=
   kpse_cv_fontconfig_libs='-lfontconfig'
 fi
-CPPFLAGS="$kpse_cv_fontconfig_libs $CPPFLAGS"
+CPPFLAGS="$kpse_cv_fontconfig_includes $CPPFLAGS"
 LIBS="$kpse_cv_fontconfig_libs $LIBS"
 AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <fontconfig/fontconfig.h>]],
                                 [[FcObjectSet *os; FcInit();]])],
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index 755e37e5b24..e8f31f4a9cd 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -18318,7 +18318,7 @@ else
   kpse_cv_fontconfig_includes=
   kpse_cv_fontconfig_libs='-lfontconfig'
 fi
-CPPFLAGS="$kpse_cv_fontconfig_libs $CPPFLAGS"
+CPPFLAGS="$kpse_cv_fontconfig_includes $CPPFLAGS"
 LIBS="$kpse_cv_fontconfig_libs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
diff --git a/Build/source/utils/xindy/ChangeLog.TL b/Build/source/utils/xindy/ChangeLog.TL
index 8df217ac31e..bca3cb3f490 100644
--- a/Build/source/utils/xindy/ChangeLog.TL
+++ b/Build/source/utils/xindy/ChangeLog.TL
@@ -3,6 +3,11 @@ ChangeLog.TL: Changes for xindy (teTeX / TeX Live)
 
 2009-05-09  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
+	* m4/ac_prog_latex.m4, m4/ac_prog_pdflatex.m4: Use TL_MSG_ERROR
+	instead of AC_MSG_ERROR.	
+
+2009-05-09  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
 	* configure.ac: Remove '--with-clisp=...', use 'CLISP=...'.
 
 2009-05-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
diff --git a/Build/source/utils/xindy/configure b/Build/source/utils/xindy/configure
index e4aeeb429be..ae92948f17d 100755
--- a/Build/source/utils/xindy/configure
+++ b/Build/source/utils/xindy/configure
@@ -3971,9 +3971,18 @@ test -n "$latex" || latex="no"
 export latex;
 if test $latex = "no" ;
 then
-	{ { $as_echo "$as_me:$LINENO: error: Unable to find a LaTeX application" >&5
+	if test "x$enable_build" = xno; then
+  { $as_echo "$as_me:$LINENO: WARNING: building xindy has been disabled and would fail because
+Unable to find a LaTeX application" >&5
+$as_echo "$as_me: WARNING: building xindy has been disabled and would fail because
+Unable to find a LaTeX application" >&2;}
+else
+  { { $as_echo "$as_me:$LINENO: error: Unable to find a LaTeX application" >&5
 $as_echo "$as_me: error: Unable to find a LaTeX application" >&2;}
-   { (exit 1); exit 1; }; };
+   { (exit 1); exit 1; }; }
+fi
+
+;
 fi
 
 
@@ -4036,9 +4045,18 @@ test -n "$pdflatex" || pdflatex="no"
 export pdflatex;
 if test $pdflatex = "no" ;
 then
-	{ { $as_echo "$as_me:$LINENO: error: Unable to find a PDFLaTeX application" >&5
+	if test "x$enable_build" = xno; then
+  { $as_echo "$as_me:$LINENO: WARNING: building xindy has been disabled and would fail because
+Unable to find a PDFLaTeX application" >&5
+$as_echo "$as_me: WARNING: building xindy has been disabled and would fail because
+Unable to find a PDFLaTeX application" >&2;}
+else
+  { { $as_echo "$as_me:$LINENO: error: Unable to find a PDFLaTeX application" >&5
 $as_echo "$as_me: error: Unable to find a PDFLaTeX application" >&2;}
-   { (exit 1); exit 1; }; };
+   { (exit 1); exit 1; }; }
+fi
+
+;
 fi
 
 
diff --git a/Build/source/utils/xindy/m4/ac_prog_latex.m4 b/Build/source/utils/xindy/m4/ac_prog_latex.m4
index 450eaf91daf..4dc20e9db70 100644
--- a/Build/source/utils/xindy/m4/ac_prog_latex.m4
+++ b/Build/source/utils/xindy/m4/ac_prog_latex.m4
@@ -13,7 +13,7 @@ AC_CHECK_PROGS(latex,[latex elatex lambda],no)
 export latex;
 if test $latex = "no" ;
 then
-	AC_MSG_ERROR([Unable to find a LaTeX application]);
+	TL_MSG_ERROR([Unable to find a LaTeX application]);
 fi
 AC_SUBST(latex)
 ])
diff --git a/Build/source/utils/xindy/m4/ac_prog_pdflatex.m4 b/Build/source/utils/xindy/m4/ac_prog_pdflatex.m4
index 4ab0ee45291..c7e20b5c226 100644
--- a/Build/source/utils/xindy/m4/ac_prog_pdflatex.m4
+++ b/Build/source/utils/xindy/m4/ac_prog_pdflatex.m4
@@ -13,7 +13,7 @@ AC_CHECK_PROGS(pdflatex,[pdflatex],no)
 export pdflatex;
 if test $pdflatex = "no" ;
 then
-	AC_MSG_ERROR([Unable to find a PDFLaTeX application]);
+	TL_MSG_ERROR([Unable to find a PDFLaTeX application]);
 fi
 AC_SUBST(pdflatex)
 ])