[Libreoffice-commits] .: config_host.mk.in configure.in

[Norbert Thiebaud]

 config_host.mk.in |    8 ++++----
 configure.in      |    2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit fdd753d1a9fb4e8fa3ab00afbb2c0b1d5315da41
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Jan 1 18:38:31 2012 -0600

    GNUCOPY is one of these var that are defined-sensitive.

diff --git a/config_host.mk.in b/config_host.mk.in
index 8077384..7c5ada7 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -4,9 +4,6 @@
  #
 export SRC_ROOT="@SRC_ROOT@"
 
- at x_ICU@ export ICU_MAJOR="@ICU_MAJOR@"
- at x_ICU@ export ICU_MICRO="@ICU_MICRO@"
- at x_ICU@ export ICU_MINOR="@ICU_MINOR@"
 export ABOUT_BITMAP="@ABOUT_BITMAP@"
 export ALIGNOF_DOUBLE="@ALIGNOF_DOUBLE@"
 export ALIGNOF_INT="@ALIGNOF_INT@"
@@ -117,7 +114,7 @@ export GIT_LINK_SRC="@GIT_LINK_SRC@"
 export GIT_REPO_NAMES="@GIT_REPO_NAMES@"
 export GMAKE_MODULE_PARALLELISM="@GMAKE_MODULE_PARALLELISM@"
 export GMAKE_PARALLELISM="@GMAKE_PARALLELISM@"
-export GNUCOPY="@GNUCP@"
+ at x_GNUCP@ export GNUCOPY="@GNUCP@"
 export GNUMAKE="@GNUMAKE@"
 export GNUTAR="@GNUTAR@"
 export GOBJECT_CFLAGS="@GOBJECT_CFLAGS@"
@@ -158,6 +155,9 @@ export HUNSPELL_CFLAGS="@HUNSPELL_CFLAGS@"
 export HUNSPELL_LIBS="@HUNSPELL_LIBS@"
 export HYPHEN_LIB="@HYPHEN_LIB@"
 export HYPH_SYSTEM_DIR="@HYPH_SYSTEM_DIR@"
+ at x_ICU@ export ICU_MAJOR="@ICU_MAJOR@"
+ at x_ICU@ export ICU_MICRO="@ICU_MICRO@"
+ at x_ICU@ export ICU_MINOR="@ICU_MINOR@"
 export ICU_RECLASSIFIED_CLOSE_PARENTHESIS="@ICU_RECLASSIFIED_CLOSE_PARENTHESIS@"
 export INPATH="@INPATH@"
 export INPATH_FOR_BUILD="@INPATH_FOR_BUILD@"
diff --git a/configure.in b/configure.in
index 71b5eb0..146dc4c 100644
--- a/configure.in
+++ b/configure.in
@@ -7340,6 +7340,7 @@ elif $GNUCP --version 2>/dev/null | grep "GNU fileutils" >/dev/null 2>/dev/null;
 else
     case "$build_os" in
     darwin*|netbsd*|openbsd*|freebsd*|dragonfly*|aix*)
+        x_GNUCP=[\#]
         GNUCP=''
         AC_MSG_RESULT([no gnucp found - using the system's cp command])
         ;;
@@ -7351,6 +7352,7 @@ fi
 
 AC_SUBST(GNUPATCH)
 AC_SUBST(GNUCP)
+AC_SUBST(x_GNUCP)
 
 dnl ***************************************
 dnl testing assembler path