Mercurial > hg > octave-max
changeset 8772:aeedc045cfe3
toplev.cc (Foctave_config_info): add CARBON_LIBS, X11_INCFLAGS, and X11_LIBS to the struct
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 17 Feb 2009 00:43:13 -0500 |
| parents | d3382daaf4d2 |
| children | 9e3111d203c0 |
| files | ChangeLog Makeconf.in src/ChangeLog src/oct-conf.h.in src/toplev.cc |
| diffstat | 5 files changed, 30 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-02-17 John W. Eaton <jwe@octave.org> + + * Makeconf.in (do-subst-config-vals): Substitute CARBON_LIBS, + X11_INCFLAGS, and X11_LIBS. + 2009-02-17 Thomas Treichl <Thomas.Treichl@gmx.net> * Makeconf.in: Substitute CARBON_LIBS.
--- a/Makeconf.in +++ b/Makeconf.in @@ -476,6 +476,7 @@ -e "s|%OCTAVE_CONF_ARFLAGS%|\"${ARFLAGS}\"|" \ -e "s|%OCTAVE_CONF_BLAS_LIBS%|\"${BLAS_LIBS}\"|" \ -e "s|%OCTAVE_CONF_CANONICAL_HOST_TYPE%|\"${canonical_host_type}\"|" \ + -e "s|%OCTAVE_CONF_CARBON_LIBS%|\"${CARBON_LIBS}\"|" \ -e "s|%OCTAVE_CONF_CC%|\"${CC}\"|" \ -e "s|%OCTAVE_CONF_CC_VERSION%|\"${CC_VERSION}\"|" \ -e "s|%OCTAVE_CONF_CFLAGS%|\"${CFLAGS}\"|" \ @@ -544,6 +545,8 @@ -e "s|%OCTAVE_CONF_USE_64_BIT_IDX_T%|\"${USE_64_BIT_IDX_T}\"|" \ -e "s|%OCTAVE_CONF_VERSION%|\"${version}\"|" \ -e "s|%OCTAVE_CONF_ENABLE_DYNAMIC_LINKING%|\"${ENABLE_DYNAMIC_LINKING}\"|" \ + -e "s|%OCTAVE_CONF_X11_INCFLAGS%|\"${X11_INCFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_X11_LIBS%|\"${X11_LIBS}\"|" \ -e "s|%OCTAVE_CONF_XTRA_CFLAGS%|\"${XTRA_CFLAGS}\"|" \ -e "s|%OCTAVE_CONF_XTRA_CXXFLAGS%|\"${XTRA_CXXFLAGS}\"|" \ -e "s|%OCTAVE_CONF_YACC%|\"${YACC}\"|" \
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2009-02-17 John W. Eaton <jwe@octave.org> + + * toplev.cc (octave_config_info): Add CARBON_LIBS, X11_INCFLAGS, + and X11_LIBS to the struct. + * oct-conf.h.in (OCTAVE_CONF_CARBON_LIBS, + OCTAVE_CONF_X11_INCFLAGS, OCTAVE_CONF_X11_LIBS): New macros. + 2009-02-17 Thomas Treichl <Thomas.Treichl@gmx.net> * Makefile.in (octave$(EXEEXT)): Link with CARBON_LIBS.
--- a/src/oct-conf.h.in +++ b/src/oct-conf.h.in @@ -53,6 +53,10 @@ #define OCTAVE_CONF_BLAS_LIBS %OCTAVE_CONF_BLAS_LIBS% #endif +#ifndef OCTAVE_CONF_CARBON_LIBS +#define OCTAVE_CONF_CARBON_LIBS %OCTAVE_CONF_CARBON_LIBS% +#endif + #ifndef OCTAVE_CONF_CC #define OCTAVE_CONF_CC %OCTAVE_CONF_CC% #endif @@ -309,6 +313,14 @@ #define OCTAVE_CONF_ENABLE_DYNAMIC_LINKING %OCTAVE_CONF_ENABLE_DYNAMIC_LINKING% #endif +#ifndef OCTAVE_CONF_X11_INCFLAGS +#define OCTAVE_CONF_X11_INCFLAGS %OCTAVE_CONF_X11_INCFLAGS% +#endif + +#ifndef OCTAVE_CONF_X11_LIBS +#define OCTAVE_CONF_X11_LIBS %OCTAVE_CONF_X11_LIBS% +#endif + #ifndef OCTAVE_CONF_XTRA_CFLAGS #define OCTAVE_CONF_XTRA_CFLAGS %OCTAVE_CONF_XTRA_CFLAGS% #endif
--- a/src/toplev.cc +++ b/src/toplev.cc @@ -1148,6 +1148,7 @@ { false, "AR", OCTAVE_CONF_AR }, { false, "ARFLAGS", OCTAVE_CONF_ARFLAGS }, { false, "BLAS_LIBS", OCTAVE_CONF_BLAS_LIBS }, + { false, "CARBON_LIBS", OCTAVE_CONF_CARBON_LIBS }, { false, "CC", OCTAVE_CONF_CC }, { false, "CC_VERSION", OCTAVE_CONF_CC_VERSION }, { false, "CFLAGS", OCTAVE_CONF_CFLAGS }, @@ -1207,6 +1208,8 @@ { false, "STATIC_LIBS", OCTAVE_CONF_STATIC_LIBS }, { false, "UGLY_DEFS", OCTAVE_CONF_UGLY_DEFS }, { false, "USE_64_BIT_IDX_T", OCTAVE_CONF_USE_64_BIT_IDX_T }, + { false, "X11_INCFLAGS", OCTAVE_CONF_X11_INCFLAGS }, + { false, "X11_LIBS", OCTAVE_CONF_X11_LIBS }, { false, "XTRA_CFLAGS", OCTAVE_CONF_XTRA_CFLAGS }, { false, "XTRA_CXXFLAGS", OCTAVE_CONF_XTRA_CXXFLAGS }, { false, "YACC", OCTAVE_CONF_YACC },