# HG changeset patch
# User Rik <rik@octave.org>
# Date 1383250405 25200
# Node ID e6317049225b7b13421a84c4584ff5528b1b2a25
# Parent  dbf67e6c256a2dfc908def1504eca78452421fca
build: Remove FreeType and Fontconfig CPPFLAGS from XTRA_CXXFLAGS.

* build-aux/common.mk: New alias FONTCONFIG_CPPFLAGS for FONTCONFIG_CFLAGS.
Add FONTCONFIG_CFLAGS to build variables.  New alias FT2_CPPFLAGS for
FT2_CFLAGS

* configure.ac: Don't add FT2_CFLAGS and FONTCONFIG_CFLAGS to XTRA_CXXFLAGS
variable.

* libinterp/Makefile.am: Add FT2_CPPFLAGS and FONTCONFIG_CPPFLAGS to rule
that creates *.df file from *.cc file.

* libinterp/corefcn/module.mk: Add FT2_CPPFLAGS and FONTCONFIG_CPPFLAGS to
corefcn convenience library CPPFLAGS.

* libinterp/corefcn/toplev.cc: Add new FONTCONFIG_CFLAGS to OCTAVE_CONF variable.

* libinterp/dldfcn/module-files: Add FT2_CPPFLAGS and FONTCONFIG_CPPFLAGS to
__init_gnuplot__.cc build.  This is required because of #include "graphics.h".

* libinterp/oct-conf.in.h: Add new FONTCONFIG_CFLAGS to OCTAVE_CONF variable.

diff -r dbf67e6c256a -r e6317049225b build-aux/common.mk
--- a/build-aux/common.mk	Thu Oct 31 20:56:37 2013 +0100
+++ b/build-aux/common.mk	Thu Oct 31 13:13:25 2013 -0700
@@ -228,6 +228,13 @@
 FFTW_XLDFLAGS = $(FFTW3_LDFLAGS) $(FFTW3F_LDFLAGS)
 FFTW_XLIBS = $(FFTW3_LIBS) $(FFTW3F_LIBS)
 
+## Alias CPPFLAGS to CFLAGS.
+## This is closer to the true meaning of `pkg-config --cflags` output.
+FONTCONFIG_CPPFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+
+## Alias CPPFLAGS to CFLAGS.
+FT2_CPPFLAGS = @FT2_CFLAGS@
 FT2_CFLAGS = @FT2_CFLAGS@
 FT2_LIBS = @FT2_LIBS@
 
@@ -555,6 +562,7 @@
   -e "s|%OCTAVE_CONF_FFTW3F_LDFLAGS%|\"${FFTW3F_LDFLAGS}\"|" \
   -e "s|%OCTAVE_CONF_FFTW3F_LIBS%|\"${FFTW3F_LIBS}\"|" \
   -e "s|%OCTAVE_CONF_FLIBS%|\"${FLIBS}\"|" \
+  -e "s|%OCTAVE_CONF_FONTCONFIG_CFLAGS%|\"${FONTCONFIG_CFLAGS}\"|" \
   -e "s|%OCTAVE_CONF_FPICFLAG%|\"${FPICFLAG}\"|" \
   -e "s|%OCTAVE_CONF_FT2_CFLAGS%|\"${FT2_CFLAGS}\"|" \
   -e "s|%OCTAVE_CONF_FT2_LIBS%|\"${FT2_LIBS}\"|" \
diff -r dbf67e6c256a -r e6317049225b configure.ac
--- a/configure.ac	Thu Oct 31 20:56:37 2013 +0100
+++ b/configure.ac	Thu Oct 31 13:13:25 2013 -0700
@@ -953,9 +953,9 @@
   ## packages add extra flags that are useful when building
   ## Graphics/ImageMagick++ extentions.  These extra flags break the
   ## Octave build. 
+  MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags-only-I $magick++`
   MAGICK_LDFLAGS=`$PKG_CONFIG --libs-only-L $magick++`
   MAGICK_LIBS=`$PKG_CONFIG --libs-only-l $magick++`
-  MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags-only-I $magick++`
 
   warn_magick="$magick++ library fails tests.  The imread function for reading image files will not be fully functional."
 
@@ -1072,25 +1072,24 @@
 
   PKG_CHECK_MODULES([FT2], [freetype2], [
     min_ft2_version=9.03
-    AC_MSG_CHECKING([for FreeType -- version >= $min_ft2_version])
+    AC_MSG_CHECKING([for FreeType2 version >= $min_ft2_version])
     $PKG_CONFIG freetype2 --atleast-version=$min_ft2_version
     ac_status=$?
     if test $ac_status = 0; then
       AC_MSG_RESULT(yes)
       AC_DEFINE(HAVE_FREETYPE, 1, [Define to 1 if you have Freetype library.])
-      XTRA_CXXFLAGS="$XTRA_CXXFLAGS $FT2_CFLAGS"
       save_LIBS="$LIBS"
       LIBS="$FT2_LIBS $LIBS"
       AC_CHECK_FUNCS([FT_Reference_Face])
       LIBS="$save_LIBS"
     else
       AC_MSG_RESULT(no)
-      warn_freetype="FreeType library not found.  Native graphics will be disabled."
+      warn_freetype="FreeType library >= 9.03 not found.  Native graphics will be disabled."
     fi])
 
   if test -n "$warn_freetype"; then
+    native_graphics=no
     OCTAVE_CONFIGURE_WARNING([warn_freetype])
-    native_graphics=no
   fi
 
   ## Check for fontconfig library
@@ -1100,7 +1099,6 @@
     PKG_CHECK_MODULES(FONTCONFIG, [fontconfig],
       [have_fontconfig=yes
        OPENGL_LIBS="$FONTCONFIG_LIBS $OPENGL_LIBS"
-       XTRA_CXXFLAGS="$XTRA_CXXFLAGS $FONTCONFIG_CFLAGS"
        AC_DEFINE(HAVE_FONTCONFIG, 1, [Define to 1 if fontconfig is present.])],
       [have_fontconfig=no
        warn_fontconfig="Fontconfig library not found.  Native graphics will be disabled."])
diff -r dbf67e6c256a -r e6317049225b libinterp/Makefile.am
--- a/libinterp/Makefile.am	Thu Oct 31 20:56:37 2013 +0100
+++ b/libinterp/Makefile.am	Thu Oct 31 13:13:25 2013 -0700
@@ -237,7 +237,8 @@
 ## FIXME -- Shouldn't the build stop if CPP fails here?
 %.df: %.cc
 	$(CXXCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	  $(AM_CPPFLAGS) $(JAVA_CPPFLAGS) $(CPPFLAGS) \
+	  $(AM_CPPFLAGS) $(JAVA_CPPFLAGS) $(FT2_CPPFLAGS) $(FONTCONFIG_CPPFLAGS) \
+		$(CPPFLAGS) \
 	  $(AM_CXXFLAGS) $(CXXFLAGS) \
 	  -DMAKE_BUILTINS $< | $(srcdir)/mkdefs $(srcdir) $< > $@-t
 	mv $@-t $@
diff -r dbf67e6c256a -r e6317049225b libinterp/corefcn/module.mk
--- a/libinterp/corefcn/module.mk	Thu Oct 31 20:56:37 2013 +0100
+++ b/libinterp/corefcn/module.mk	Thu Oct 31 13:13:25 2013 -0700
@@ -317,7 +317,10 @@
   corefcn/libtex_parser.la
 
 corefcn_libcorefcn_la_SOURCES = $(COREFCN_SRC)
-corefcn_libcorefcn_la_CPPFLAGS = $(liboctinterp_la_CPPFLAGS) $(FFTW_XCPPFLAGS)
+corefcn_libcorefcn_la_CPPFLAGS = $(liboctinterp_la_CPPFLAGS) \
+                                 $(FFTW_XCPPFLAGS) \
+                                 $(FT2_CPPFLAGS) \
+                                 $(FONTCONFIG_CPPFLAGS)
 
 corefcn_libtex_parser_la_SOURCES = $(TEX_PARSER_SRC)
 corefcn_libtex_parser_la_CPPFLAGS = $(liboctinterp_la_CPPFLAGS)
diff -r dbf67e6c256a -r e6317049225b libinterp/corefcn/toplev.cc
--- a/libinterp/corefcn/toplev.cc	Thu Oct 31 20:56:37 2013 +0100
+++ b/libinterp/corefcn/toplev.cc	Thu Oct 31 13:13:25 2013 -0700
@@ -1298,6 +1298,7 @@
     { false, "FFTW3F_LDFLAGS", OCTAVE_CONF_FFTW3F_LDFLAGS },
     { false, "FFTW3F_LIBS", OCTAVE_CONF_FFTW3F_LIBS },
     { false, "FLIBS", OCTAVE_CONF_FLIBS },
+    { false, "FONTCONFIG_CFLAGS", OCTAVE_CONF_FONTCONFIG_CFLAGS },
     { false, "FPICFLAG", OCTAVE_CONF_FPICFLAG },
     { false, "FT2_CFLAGS", OCTAVE_CONF_FT2_CFLAGS },
     { false, "FT2_LIBS", OCTAVE_CONF_FT2_LIBS },
diff -r dbf67e6c256a -r e6317049225b libinterp/dldfcn/module-files
--- a/libinterp/dldfcn/module-files	Thu Oct 31 20:56:37 2013 +0100
+++ b/libinterp/dldfcn/module-files	Thu Oct 31 13:13:25 2013 -0700
@@ -4,8 +4,8 @@
 __eigs__.cc|$(ARPACK_CPPFLAGS) $(SPARSE_XCPPFLAGS)|$(ARPACK_LDFLAGS) $(SPARSE_XLDFLAGS)|$(ARPACK_LIBS) $(SPARSE_XLIBS) $(LAPACK_LIBS) $(BLAS_LIBS)
 __fltk_uigetfile__.cc|$(GRAPHICS_CFLAGS) $(FT2_CPPFLAGS)|$(GRAPHICS_LDFLAGS) $(FT2_LDFLAGS)|$(GRAPHICS_LIBS) $(FT2_LIBS)
 __glpk__.cc|$(GLPK_CPPFLAGS)|$(GLPK_LDFLAGS)|$(GLPK_LIBS)
-__init_fltk__.cc|$(GRAPHICS_CFLAGS) $(FT2_CPPFLAGS)|$(GRAPHICS_LDFLAGS) $(FT2_LDFLAGS)|$(GRAPHICS_LIBS) $(FT2_LIBS) $(OPENGL_LIBS)
-__init_gnuplot__.cc
+__init_fltk__.cc|$(GRAPHICS_CFLAGS) $(FT2_CPPFLAGS) $(FONTCONFIG_CPPFLAGS)|$(GRAPHICS_LDFLAGS) $(FT2_LDFLAGS)|$(GRAPHICS_LIBS) $(FT2_LIBS) $(OPENGL_LIBS)
+__init_gnuplot__.cc|$(FT2_CPPFLAGS) $(FONTCONFIG_CPPFLAGS)||
 __magick_read__.cc|$(MAGICK_CPPFLAGS)|$(MAGICK_LDFLAGS)|$(MAGICK_LIBS)
 __voronoi__.cc|$(QHULL_CPPFLAGS)|$(QHULL_LDFLAGS)|$(QHULL_LIBS)
 amd.cc|$(SPARSE_XCPPFLAGS)|$(SPARSE_XLDFLAGS)|$(SPARSE_XLIBS)
diff -r dbf67e6c256a -r e6317049225b libinterp/oct-conf.in.h
--- a/libinterp/oct-conf.in.h	Thu Oct 31 20:56:37 2013 +0100
+++ b/libinterp/oct-conf.in.h	Thu Oct 31 13:13:25 2013 -0700
@@ -278,6 +278,10 @@
 #define OCTAVE_CONF_FLIBS %OCTAVE_CONF_FLIBS%
 #endif
 
+#ifndef OCTAVE_CONF_FONTCONFIG_CFLAGS
+#define OCTAVE_CONF_FONTCONFIG_CFLAGS %OCTAVE_CONF_FONTCONFIG_CFLAGS%
+#endif
+
 #ifndef OCTAVE_CONF_FPICFLAG
 #define OCTAVE_CONF_FPICFLAG %OCTAVE_CONF_FPICFLAG%
 #endif