gbuild: allow to react on change in configured langs

Change-Id: I15492fcc687a21b740dc2d97a47485e2e760055f

.gitignore

@@ -45,8 +45,12 @@
 /config_host.mk
 /config_host.mk.last
 /config_host.mk.stamp
+/config_host_lang.mk
+/config_host_lang.mk.last
+/config_host_lang.mk.stamp
 /config_build
 /config_build.mk
+/config_build_lang.mk
 /configure
 /lo.xcent
 /Makefile

config_host.mk.in

@@ -16,7 +16,6 @@ export BUILDDIR=@BUILDDIR@
 export ABW_CFLAGS=$(gb_SPACE)@ABW_CFLAGS@
 export ABW_LIBS=$(gb_SPACE)@ABW_LIBS@
 export ALLOC=@ALLOC@
-export ALL_LANGS=@ALL_LANGS@
 export ANDROID_APP_ABI=@ANDROID_APP_ABI@
 export ANDROID_NDK_GDBSERVER=@ANDROID_NDK_GDBSERVER@
 export ANDROID_SDK_HOME=@ANDROID_SDK_HOME@
@@ -624,8 +623,6 @@ export WITH_GALLERY_BUILD=@WITH_GALLERY_BUILD@
 export WITH_GSSAPI=@WITH_GSSAPI@
 export WITH_HELPPACK_INTEGRATION=@WITH_HELPPACK_INTEGRATION@
 export WITH_KRB5=@WITH_KRB5@
-export WITH_LANG=@WITH_LANG@
-export WITH_LANG_LIST=@WITH_LANG_LIST@
 export WITH_LINKER_HASH_STYLE=@WITH_LINKER_HASH_STYLE@
 export WITH_LOCALES=@WITH_LOCALES@
 export WITH_MOZAB4WIN=@WITH_MOZAB4WIN@
@@ -654,6 +651,9 @@ export XSLTPROC=@XSLTPROC@
 export ZLIB_CFLAGS=$(gb_SPACE)@ZLIB_CFLAGS@
 export ZLIB_LIBS=$(gb_SPACE)@ZLIB_LIBS@
 
+# lang-related stuff
+include config_$(gb_Side)_lang.mk
+
 # tarball names
 # does use some of the variables defined above
 include @SRC_ROOT@/download.lst

config_host_lang.mk.in

@@ -0,0 +1,8 @@
+ # language-related config variables for LibreOffice
+ # this file is intended to be able to be included in a Makefile
+ # and not to be sourced in a shell session
+ #
+
+export ALL_LANGS=@ALL_LANGS@
+export WITH_LANG=@WITH_LANG@
+export WITH_LANG_LIST=@WITH_LANG_LIST@

configure.ac

@@ -4448,6 +4448,7 @@ if test "$cross_compiling" = "yes"; then
         solenv/bin/getcompver.awk \
         solenv/inc/langlist.mk \
         config_host.mk.in \
+        config_host_lang.mk.in \
         Makefile.in \
         lo.xcent.in \
         instsetoo_native/util/openoffice.lst.in \
@@ -4499,6 +4500,7 @@ if test "$cross_compiling" = "yes"; then
         2>&1 | sed -e 's/^/    /'
     test -f ./config_host.mk 2>/dev/null || exit
     cp config_host.mk ../config_build.mk
+    cp config_host_lang.mk ../config_build_lang.mk
     mv config.log ../config.Build.log
     mkdir -p ../config_build
     mv config_host/*.h ../config_build
@@ -12902,8 +12904,12 @@ AC_SUBST(LO_PATH)
 if test -f config_host.mk; then
     config_md5=`$MD5SUM config_host.mk | sed "s/ .*//"`
 fi
+if test -f config_host_lang.mk; then
+    config_lang_md5=`$MD5SUM config_host_lang.mk | sed "s/ .*//"`
+fi
 
 AC_CONFIG_FILES([config_host.mk
+                 config_host_lang.mk
                  Makefile
                  lo.xcent
                  instsetoo_native/util/openoffice.lst
@@ -12949,6 +12955,15 @@ else
     echo > config_host.mk.stamp
 fi
 
+# touch the config lang timestamp file
+if test ! -f config_host_lang.mk.stamp; then
+    echo > config_host_lang.mk.stamp
+elif test "$config_lang_md5" = `$MD5SUM config_host_lang.mk | sed "s/ .*//"`; then
+    echo "Configuration unchanged - avoiding scp2 stamp update"
+else
+    echo > config_host_lang.mk.stamp
+fi
+
 
 if test "$STALE_MAKE" = "TRUE" -a "$build_os" = "cygwin"; then
 

solenv/gbuild/Helper.mk

@@ -25,6 +25,9 @@ gb_Helper_PHONY := $(gb_Helper_MISC)/PHONY
 # general purpose empty dummy target
 gb_Helper_MISCDUMMY := $(gb_Helper_MISC)/DUMMY
 
+# target for reacting to changes in the list of configured languages
+gb_Helper_LANGSTARGET := $(BUILDDIR)/config_$(gb_Side)_lang.mk.stamp
+
 .PHONY : $(WORKDIR)/Misc/PHONY
 $(gb_Helper_MISCDUMMY) :
 	@mkdir -p $(dir $@) && touch $@