diff options
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | config_host/config_buildid.h.in | 10 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | cui/Library_cui.mk | 1 | ||||
| -rw-r--r-- | cui/source/dialogs/about.cxx | 1 |
5 files changed, 13 insertions, 3 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 094f73047be6..3b586aff0479 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -387,7 +387,6 @@ export NUMBERTEXT_EXTENSION_PACK=@NUMBERTEXT_EXTENSION_PACK@ export nodep=@nodep@ @x_OBJCFLAGS@ export OBJCFLAGS=@OBJCFLAGS@ @x_OBJCXXFLAGS@ export OBJCXXFLAGS=@OBJCXXFLAGS@ -export EXTRA_BUILDID=@EXTRA_BUILDID@ export OBJDUMP=@OBJDUMP@ export ODFGEN_CFLAGS=$(gb_SPACE)@ODFGEN_CFLAGS@ export ODFGEN_LIBS=$(gb_SPACE)@ODFGEN_LIBS@ diff --git a/config_host/config_buildid.h.in b/config_host/config_buildid.h.in new file mode 100644 index 000000000000..04f03b83543a --- /dev/null +++ b/config_host/config_buildid.h.in @@ -0,0 +1,10 @@ +/* +Optional Build ID displayed in the about dialog +*/ + +#ifndef CONFIG_BUILDID_H +#define CONFIG_BUILDID_H + +#undef EXTRA_BUILDID + +#endif diff --git a/configure.ac b/configure.ac index bda7c01a2c97..8647bdd72f5d 100644 --- a/configure.ac +++ b/configure.ac @@ -12115,7 +12115,7 @@ if test -n "$with_extra_buildid" -a "$with_extra_buildid" != "yes" ; then else AC_MSG_RESULT([not set]) fi -AC_SUBST(EXTRA_BUILDID) +AC_DEFINE_UNQUOTED([EXTRA_BUILDID], ["$EXTRA_BUILDID"]) OOO_VENDOR= AC_MSG_CHECKING([for vendor]) @@ -12539,6 +12539,7 @@ if test -f config_host.mk; then fi AC_CONFIG_FILES([config_host.mk Makefile lo.xcent instsetoo_native/util/openoffice.lst]) +AC_CONFIG_HEADERS([config_host/config_buildid.h]) AC_CONFIG_HEADERS([config_host/config_clang.h]) AC_CONFIG_HEADERS([config_host/config_features.h]) AC_CONFIG_HEADERS([config_host/config_folders.h]) diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index aafede3945e6..0a08baa255a5 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -23,7 +23,6 @@ $(eval $(call gb_Library_add_defs,cui,\ $(if $(filter TRUE,$(ENABLE_TDE)),-DENABLE_TDE) \ $(if $(filter TRUE,$(ENABLE_KDE)),-DENABLE_KDE) \ $(if $(filter TRUE,$(ENABLE_KDE4)),-DENABLE_KDE4) \ - $(if $(EXTRA_BUILDID),-DEXTRA_BUILDID=\""$(EXTRA_BUILDID)"\") \ )) $(eval $(call gb_Library_use_custom_headers,cui,\ diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index ee943f8f4092..73fe04ebc5d5 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -42,6 +42,7 @@ #include <sfx2/sfxuno.hxx> #include <sfx2/sfxcommands.h> #include "about.hxx" +#include <config_buildid.h> #include <sfx2/sfxdefs.hxx> #include <sfx2/app.hxx> #include <rtl/ustrbuf.hxx> |