diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2013-01-10 17:15:37 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-01-10 17:39:03 +0000 |
| commit | 364cce0a511d3e7a3bbc51e09895999fbdf0dbe1 (patch) | |
| tree | eb9e482aee7c1ee1638c0ace738dba4b4d5a2192 | |
| parent | 3d78fe6b23eb3d6552bf5ed65f3a8ead081533d1 (diff) | |
add LIBO_VERSION_* macros and a config header for them to live in.
Change-Id: Ia6735e3e7f3231722231e9d7a4c9839f08038b96
| -rw-r--r-- | config/config_version.h.in | 14 | ||||
| -rw-r--r-- | configure.ac | 18 |
2 files changed, 32 insertions, 0 deletions
diff --git a/config/config_version.h.in b/config/config_version.h.in new file mode 100644 index 000000000000..caaa9c4d0e5a --- /dev/null +++ b/config/config_version.h.in @@ -0,0 +1,14 @@ +/* +Version settings + version 4.0.0.1 is Major.Minor.Micro.Patch +*/ + +#ifndef CONFIG_VERSION_H +#define CONFIG_VERSION_H + +#undef LIBO_VERSION_MAJOR +#undef LIBO_VERSION_MINOR +#undef LIBO_VERSION_MICRO +#undef LIBO_VERSION_PATCH + +#endif diff --git a/configure.ac b/configure.ac index 2ef61b1f7c2e..3b4fb4833c68 100644 --- a/configure.ac +++ b/configure.ac @@ -4320,6 +4320,23 @@ AC_SUBST(UPD) AC_SUBST(SOURCEVERSION) dnl =================================================================== +dnl Grim-ness to export version number of LibreOffice to code +dnl this needs to be turned around and to be driven by configure +dnl =================================================================== +LIBO_VERSION_MAJOR="`$GREP VERSIONMAJOR solenv/inc/minor.mk | sed "s/^.*=//"`" +LIBO_VERSION_MINOR="`$GREP VERSIONMINOR solenv/inc/minor.mk | sed "s/^.*=//"`" +LIBO_VERSION_MICRO="`$GREP VERSIONMICRO solenv/inc/minor.mk | sed "s/^.*=//"`" +LIBO_VERSION_PATCH="`$GREP BUILD solenv/inc/minor.mk | sed "s/^.*=//"`" +AC_SUBST(LIBO_VERSION_MAJOR) +AC_SUBST(LIBO_VERSION_MINOR) +AC_SUBST(LIBO_VERSION_MICRO) +AC_SUBST(LIBO_VERSION_PATCH) +AC_DEFINE_UNQUOTED(LIBO_VERSION_MAJOR,"$LIBO_VERSION_MAJOR") +AC_DEFINE_UNQUOTED(LIBO_VERSION_MINOR,"$LIBO_VERSION_MINOR") +AC_DEFINE_UNQUOTED(LIBO_VERSION_MICRO,"$LIBO_VERSION_MICRO") +AC_DEFINE_UNQUOTED(LIBO_VERSION_PATCH,"$LIBO_VERSION_PATCH") + +dnl =================================================================== dnl Check for syslog header dnl =================================================================== AC_CHECK_HEADER(syslog.h, AC_DEFINE(HAVE_SYSLOG_H)) @@ -12429,6 +12446,7 @@ AC_CONFIG_HEADERS([config/config_global.h]) AC_CONFIG_HEADERS([config/config_graphite.h]) AC_CONFIG_HEADERS([config/config_telepathy.h]) AC_CONFIG_HEADERS([config/config_vclplug.h]) +AC_CONFIG_HEADERS([config/config_version.h]) AC_OUTPUT # touch the config timestamp file |