config_host.mk.in | 20 +++++--------------- configure.ac | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 15 deletions(-)
New commits: commit 136d8962d7a29b833a24b0461958b47fc4d23d18 Author: LuboÅ¡ LuÅák <l.lu...@suse.cz> Date: Fri Nov 9 17:53:13 2012 +0100 remove make-specific code from config_host.mk Apparently some people still try to source it from shell (scripts). Change-Id: If26a5c5eb83739d3ccce043afd095000d355a543 diff --git a/config_host.mk.in b/config_host.mk.in index e98fc79..f4d31c3 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -61,9 +61,7 @@ export CC_FOR_BUILD=@CC_FOR_BUILD@ export CDR_CFLAGS=$(gb_SPACE)@CDR_CFLAGS@ export CDR_LIBS=$(gb_SPACE)@CDR_LIBS@ export CDR_TARBALL=@CDR_TARBALL@ -ifneq ($(strip @CFLAGS@),) -export CFLAGS=@CFLAGS@ -endif +@x_CFLAGS@ export CFLAGS=@CFLAGS@ export CHECK_PARALLELISM=@CHECK_PARALLELISM@ export CLANGPLUGIN_CPPFLAGS=@CLANGPLUGIN_CPPFLAGS@ export CLUCENE_CFLAGS=$(gb_SPACE)@CLUCENE_CFLAGS@ @@ -98,9 +96,7 @@ export CURL_LIBS=$(gb_SPACE)@CURL_LIBS@ export CXX=@CXX@ export CXX_FOR_BUILD=@CXX_FOR_BUILD@ export CXX_X64_BINARY=@CXX_X64_BINARY@ -ifneq ($(strip @CXXFLAGS@),) -export CXXFLAGS=@CXXFLAGS@ -endif +@x_CXXFLAGS@ export CXXFLAGS=@CXXFLAGS@ export DATADIR=@DATADIR@ export DBGHELP_DLL=@DBGHELP_DLL@ export DBUSMENUGTK_CFLAGS=$(gb_SPACE)@DBUSMENUGTK_CFLAGS@ @@ -324,9 +320,7 @@ export L10N_MODULE=@L10N_MODULE@ export LCMS2_CFLAGS=$(gb_SPACE)@LCMS2_CFLAGS@ export LCMS2_LIBS=$(gb_SPACE)@LCMS2_LIBS@ export LCMS2_TARBALL=@LCMS2_TARBALL@ -ifneq ($(strip @LDFLAGS@),) -export LDFLAGS=@LDFLAGS@ -endif +@x_LDFLAGS@ export LDFLAGS=@LDFLAGS@ export LFS_CFLAGS=@LFS_CFLAGS@ export LIBBASE_JAR=@LIBBASE_JAR@ export LIBDIR=@LIBDIR@ @@ -462,12 +456,8 @@ export NSS_CFLAGS=$(gb_SPACE)@NSS_CFLAGS@ export NSS_LIBS=$(gb_SPACE)@NSS_LIBS@ export NSS_TARBALL=@NSS_TARBALL@ export NUMBERTEXT_EXTENSION_PACK=@NUMBERTEXT_EXTENSION_PACK@ -ifneq ($(strip @OBJCFLAGS@),) -export OBJCFLAGS=@OBJCFLAGS@ -endif -ifneq ($(strip @OBJCXXFLAGS@),) -export OBJCXXFLAGS=@OBJCXXFLAGS@ -endif +@x_OBJCFLAGS@ export OBJCFLAGS=@OBJCFLAGS@ +@x_OBJCXXFLAGS@ export OBJCXXFLAGS=@OBJCXXFLAGS@ export OBJDUMP=@OBJDUMP@ export OOOBLOGGER_EXTENSION_PACK=@OOOBLOGGER_EXTENSION_PACK@ export OOODMAKEMODE=YES diff --git a/configure.ac b/configure.ac index 059d6e0..c968dc2 100644 --- a/configure.ac +++ b/configure.ac @@ -3350,38 +3350,53 @@ dnl by our build system, but explicit override is possible. AC_MSG_CHECKING(for explicit CFLAGS) if test -n "$CFLAGS"; then AC_MSG_RESULT([$CFLAGS]) + x_CFLAGS= else AC_MSG_RESULT(no) + x_CFLAGS=[\#] fi AC_MSG_CHECKING(for explicit CXXFLAGS) if test -n "$CXXFLAGS"; then AC_MSG_RESULT([$CXXFLAGS]) + x_CXXFLAGS= else AC_MSG_RESULT(no) + x_CXXFLAGS=[\#] fi AC_MSG_CHECKING(for explicit OBJCFLAGS) if test -n "$OBJCFLAGS"; then AC_MSG_RESULT([$OBJCFLAGS]) + x_OBJCFLAGS= else AC_MSG_RESULT(no) + x_OBJCFLAGS=[\#] fi AC_MSG_CHECKING(for explicit OBJCXXFLAGS) if test -n "$OBJCXXFLAGS"; then AC_MSG_RESULT([$OBJCXXFLAGS]) + x_OBJCXXFLAGS= else AC_MSG_RESULT(no) + x_OBJCXXFLAGS=[\#] fi AC_MSG_CHECKING(for explicit LDFLAGS) if test -n "$LDFLAGS"; then AC_MSG_RESULT([$LDFLAGS]) + x_LDFLAGS= else AC_MSG_RESULT(no) + x_LDFLAGS=[\#] fi AC_SUBST(CFLAGS) AC_SUBST(CXXFLAGS) AC_SUBST(OBJCFLAGS) AC_SUBST(OBJCXXFLAGS) AC_SUBST(LDFLAGS) +AC_SUBST(x_CFLAGS) +AC_SUBST(x_CXXFLAGS) +AC_SUBST(x_OBJCFLAGS) +AC_SUBST(x_OBJCXXFLAGS) +AC_SUBST(x_LDFLAGS) # # determine CPU, CPUNAME, GUI, GUIBASE, ...
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits