Mercurial > octave-nkf
changeset 19767:08033d583435
more consistently use _CPPFLAGS and _LDFLAGS variables
* common.mk, configure.ac, toplev.cc, libinterp/dldfcn/module-files,
oct-conf.in.h: Use FLTK_CPPFLAGS, FLTK_LDFLAGS, FONTCONFIG_CPPFLAGS,
FT2_CPPFLAGS for consistency with other library compiler flag variables.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 17 Feb 2015 14:33:05 -0500 |
| parents | bf25e9f7c22a |
| children | 9f6ee9cb749c |
| files | build-aux/common.mk configure.ac libinterp/corefcn/toplev.cc libinterp/dldfcn/module-files libinterp/oct-conf.in.h |
| diffstat | 5 files changed, 44 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/build-aux/common.mk Tue Feb 17 14:10:46 2015 -0500 +++ b/build-aux/common.mk Tue Feb 17 14:33:05 2015 -0500 @@ -225,7 +225,8 @@ FFTW_XLDFLAGS = $(FFTW3_LDFLAGS) $(FFTW3F_LDFLAGS) FFTW_XLIBS = $(FFTW3_LIBS) $(FFTW3F_LIBS) -FLTK_CFLAGS = @FLTK_CFLAGS@ +FLTK_CPPFLAGS = @FLTK_CPPFLAGS@ +FLTK_LDFLAGS = @FLTK_LDFLAGS@ FLTK_LIBS = @FLTK_LIBS@ ## Alias CPPFLAGS to CFLAGS. @@ -556,11 +557,13 @@ -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_FLTK_CFLAGS%|\"${FLTK_CFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_FLTK_CPPFLAGS%|\"${FLTK_CPPFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_FLTK_LDFLAGS%|\"${FLTK_LDFLAGS}\"|" \ -e "s|%OCTAVE_CONF_FLTK_LIBS%|\"${FLTK_LIBS}\"|" \ - -e "s|%OCTAVE_CONF_FONTCONFIG_CFLAGS%|\"${FONTCONFIG_CFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_FONTCONFIG_CPPFLAGS%|\"${FONTCONFIG_CPPFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_FONTCONFIG_LIBS%|\"${FONTCONFIG_LIBS}\"|" \ -e "s|%OCTAVE_CONF_FPICFLAG%|\"${FPICFLAG}\"|" \ - -e "s|%OCTAVE_CONF_FT2_CFLAGS%|\"${FT2_CFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_FT2_CPPFLAGS%|\"${FT2_CPPFLAGS}\"|" \ -e "s|%OCTAVE_CONF_FT2_LIBS%|\"${FT2_LIBS}\"|" \ -e "s|%OCTAVE_CONF_GLPK_CPPFLAGS%|\"${GLPK_CPPFLAGS}\"|" \ -e "s|%OCTAVE_CONF_GLPK_LDFLAGS%|\"${GLPK_LDFLAGS}\"|" \
--- a/configure.ac Tue Feb 17 14:10:46 2015 -0500 +++ b/configure.ac Tue Feb 17 14:33:05 2015 -0500 @@ -1172,8 +1172,9 @@ OCTAVE_CHECK_LIB_OPENGL fi +FLTK_CPPFLAGS= +FLTK_LDFLAGS= FLTK_LIBS= -FLTK_CFLAGS= if test -z "$OPENGL_LIBS"; then if test $check_opengl = yes; then @@ -1208,6 +1209,8 @@ if test -n "$warn_freetype"; then native_graphics=no OCTAVE_CONFIGURE_WARNING([warn_freetype]) + else + FT2_CPPFLAGS="$FT2_CFLAGS" fi ## Check for fontconfig library @@ -1225,6 +1228,8 @@ if test -n "$warn_fontconfig"; then native_graphics=no OCTAVE_CONFIGURE_WARNING([warn_fontconfig]) + else + FONTCONFIG_CPPFLAGS="$FONTCONFIG_CFLAGS" fi ## Check for Xft library (when using X11) @@ -1293,7 +1298,7 @@ warn_fltk_config="FLTK config script not found. Native graphics will be disabled." OCTAVE_CONFIGURE_WARNING([warn_fltk_config]) else - FLTK_CFLAGS=`$FLTK_CONFIG $fltkconf_args --use-gl --cflags` + FLTK_CPPFLAGS=`$FLTK_CONFIG $fltkconf_args --use-gl --cflags` FLTK_LDFLAGS=`$FLTK_CONFIG $fltkconf_args --use-gl --ldflags` case $host_os in @@ -1304,8 +1309,8 @@ AC_CACHE_CHECK([for OpenGL support in FLTK], [octave_cv_fltk_opengl_support], - [save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $FLTK_CFLAGS" + [save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CFLAGS $FLTK_CPPFLAGS" AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <FL/gl.h> ]], [[ @@ -1313,7 +1318,7 @@ ]])], octave_cv_fltk_opengl_support=no, octave_cv_fltk_opengl_support=yes) - CFLAGS="$save_CFLAGS" + CPPFLAGS="$save_CPPFLAGS" ]) if test $octave_cv_fltk_opengl_support = no; then warn_fltk_opengl="FLTK does not have OpenGL support. Native graphics will be disabled." @@ -1329,7 +1334,8 @@ fi fi -AC_SUBST(FLTK_CFLAGS) +AC_SUBST(FLTK_CPPFLAGS) +AC_SUBST(FLTK_LDFLAGS) AC_SUBST(FLTK_LIBS) ## Check for gl2ps which is required for printing with OpenGL graphics @@ -3024,11 +3030,12 @@ FFTW3F CPPFLAGS: $FFTW3F_CPPFLAGS FFTW3F LDFLAGS: $FFTW3F_LDFLAGS FFTW3F libraries: $FFTW3F_LIBS - FLTK CFLAGS: $FLTK_CFLAGS + FLTK CPPFLAGS: $FLTK_CPPFLAGS + FLTK LDFLAGS: $FLTK_LDFLAGS FLTK libraries: $FLTK_LIBS - fontconfig CFLAGS: $FONTCONFIG_CFLAGS + fontconfig CPPFLAGS: $FONTCONFIG_CPPFLAGS fontconfig libraries: $FONTCONFIG_LIBS - FreeType2 CFLAGS: $FT2_CFLAGS + FreeType2 CPPFLAGS: $FT2_CPPFLAGS FreeType2 libraries: $FT2_LIBS GLPK CPPFLAGS: $GLPK_CPPFLAGS GLPK LDFLAGS: $GLPK_LDFLAGS
--- a/libinterp/corefcn/toplev.cc Tue Feb 17 14:10:46 2015 -0500 +++ b/libinterp/corefcn/toplev.cc Tue Feb 17 14:33:05 2015 -0500 @@ -1344,11 +1344,13 @@ { false, "FFTW3F_LDFLAGS", OCTAVE_CONF_FFTW3F_LDFLAGS }, { false, "FFTW3F_LIBS", OCTAVE_CONF_FFTW3F_LIBS }, { false, "FLIBS", OCTAVE_CONF_FLIBS }, - { false, "FLTK_CFLAGS", OCTAVE_CONF_FLTK_CFLAGS }, + { false, "FLTK_CPPFLAGS", OCTAVE_CONF_FLTK_CPPFLAGS }, + { false, "FLTK_LDFLAGS", OCTAVE_CONF_FLTK_LDFLAGS }, { false, "FLTK_LIBS", OCTAVE_CONF_FLTK_LIBS }, - { false, "FONTCONFIG_CFLAGS", OCTAVE_CONF_FONTCONFIG_CFLAGS }, + { false, "FONTCONFIG_CPPFLAGS", OCTAVE_CONF_FONTCONFIG_CPPFLAGS }, + { false, "FONTCONFIG_LIBS", OCTAVE_CONF_FONTCONFIG_LIBS }, { false, "FPICFLAG", OCTAVE_CONF_FPICFLAG }, - { false, "FT2_CFLAGS", OCTAVE_CONF_FT2_CFLAGS }, + { false, "FT2_CPPFLAGS", OCTAVE_CONF_FT2_CPPFLAGS }, { false, "FT2_LIBS", OCTAVE_CONF_FT2_LIBS }, { false, "GLPK_CPPFLAGS", OCTAVE_CONF_GLPK_CPPFLAGS }, { false, "GLPK_LDFLAGS", OCTAVE_CONF_GLPK_LDFLAGS },
--- a/libinterp/dldfcn/module-files Tue Feb 17 14:10:46 2015 -0500 +++ b/libinterp/dldfcn/module-files Tue Feb 17 14:33:05 2015 -0500 @@ -2,11 +2,11 @@ __delaunayn__.cc|$(QHULL_CPPFLAGS)|$(QHULL_LDFLAGS)|$(QHULL_LIBS) __dsearchn__.cc __eigs__.cc|$(ARPACK_CPPFLAGS) $(SPARSE_XCPPFLAGS)|$(ARPACK_LDFLAGS) $(SPARSE_XLDFLAGS)|$(ARPACK_LIBS) $(SPARSE_XLIBS) $(LAPACK_LIBS) $(BLAS_LIBS) -__fltk_uigetfile__.cc|$(FLTK_CFLAGS) $(FT2_CPPFLAGS)|$(FLTK_LDFLAGS) $(FT2_LDFLAGS)|$(FLTK_LIBS) $(FT2_LIBS) +__fltk_uigetfile__.cc|$(FLTK_CPPFLAGS) $(FT2_CPPFLAGS)|$(FLTK_LDFLAGS) $(FT2_LDFLAGS)|$(FLTK_LIBS) $(FT2_LIBS) __glpk__.cc|$(GLPK_CPPFLAGS)|$(GLPK_LDFLAGS)|$(GLPK_LIBS) __ichol__.cc __ilu__.cc -__init_fltk__.cc|$(FLTK_CFLAGS) $(FT2_CPPFLAGS) $(FONTCONFIG_CPPFLAGS)|$(FLTK_LDFLAGS) $(FT2_LDFLAGS)|$(FLTK_LIBS) $(FT2_LIBS) $(OPENGL_LIBS) +__init_fltk__.cc|$(FLTK_CPPFLAGS) $(FT2_CPPFLAGS) $(FONTCONFIG_CPPFLAGS)|$(FLTK_LDFLAGS) $(FT2_LDFLAGS)|$(FLTK_LIBS) $(FT2_LIBS) $(OPENGL_LIBS) __init_gnuplot__.cc|$(FT2_CPPFLAGS) $(FONTCONFIG_CPPFLAGS)|| __magick_read__.cc|$(MAGICK_CPPFLAGS)|$(MAGICK_LDFLAGS)|$(MAGICK_LIBS) __osmesa_print__.cc|$(OSMESA_CPPFLAGS) $(FT2_CPPFLAGS)|$(OSMESA_LDFLAGS)|$(OSMESA_LIBS)
--- a/libinterp/oct-conf.in.h Tue Feb 17 14:10:46 2015 -0500 +++ b/libinterp/oct-conf.in.h Tue Feb 17 14:33:05 2015 -0500 @@ -278,24 +278,32 @@ #define OCTAVE_CONF_FLIBS %OCTAVE_CONF_FLIBS% #endif -#ifndef OCTAVE_CONF_FLTK_CFLAGS -#define OCTAVE_CONF_FLTK_CFLAGS %OCTAVE_CONF_FLTK_CFLAGS% +#ifndef OCTAVE_CONF_FLTK_CPPFLAGS +#define OCTAVE_CONF_FLTK_CPPFLAGS %OCTAVE_CONF_FLTK_CPPFLAGS% +#endif + +#ifndef OCTAVE_CONF_FLTK_LDFLAGS +#define OCTAVE_CONF_FLTK_LDFLAGS %OCTAVE_CONF_FLTK_LDFLAGS% #endif #ifndef OCTAVE_CONF_FLTK_LIBS #define OCTAVE_CONF_FLTK_LIBS %OCTAVE_CONF_FLTK_LIBS% #endif -#ifndef OCTAVE_CONF_FONTCONFIG_CFLAGS -#define OCTAVE_CONF_FONTCONFIG_CFLAGS %OCTAVE_CONF_FONTCONFIG_CFLAGS% +#ifndef OCTAVE_CONF_FONTCONFIG_CPPFLAGS +#define OCTAVE_CONF_FONTCONFIG_CPPFLAGS %OCTAVE_CONF_FONTCONFIG_CPPFLAGS% +#endif + +#ifndef OCTAVE_CONF_FONTCONFIG_LIBS +#define OCTAVE_CONF_FONTCONFIG_LIBS %OCTAVE_CONF_FONTCONFIG_LIBS% #endif #ifndef OCTAVE_CONF_FPICFLAG #define OCTAVE_CONF_FPICFLAG %OCTAVE_CONF_FPICFLAG% #endif -#ifndef OCTAVE_CONF_FT2_CFLAGS -#define OCTAVE_CONF_FT2_CFLAGS %OCTAVE_CONF_FT2_CFLAGS% +#ifndef OCTAVE_CONF_FT2_CPPFLAGS +#define OCTAVE_CONF_FT2_CPPFLAGS %OCTAVE_CONF_FT2_CPPFLAGS% #endif #ifndef OCTAVE_CONF_FT2_LIBS