mirror of https://github.com/BOINC/boinc.git
Added version.h back into the configure script until someone gets around to
modifying set_version to do the work. version.h is included from config.h so it should not change anyone's compiles. svn path=/trunk/boinc/; revision=4779
This commit is contained in:
parent
d7519eec6a
commit
2cfd8235fc
20
configure.ac
20
configure.ac
|
@ -83,9 +83,18 @@ AC_SUBST([BOINC_VERSION_STRING],AC_PACKAGE_VERSION)
|
||||||
|
|
||||||
BOINC_SET_VERSION(translit(AC_PACKAGE_VERSION, [.], [,]))
|
BOINC_SET_VERSION(translit(AC_PACKAGE_VERSION, [.], [,]))
|
||||||
|
|
||||||
AC_DEFINE_UNQUOTED([BOINC_VERSION_STRING], "$BOINC_VERSION_STRING", [String representation of BOINC version number])
|
dnl Version information moved to version.h so removed from config.h
|
||||||
AC_DEFINE_UNQUOTED([BOINC_MAJOR_VERSION], $BOINC_MAJOR_VERSION, [Major part of BOINC version number])
|
dnl AC_DEFINE_UNQUOTED([BOINC_VERSION_STRING], "$BOINC_VERSION_STRING", [String representation of BOINC version number])
|
||||||
AC_DEFINE_UNQUOTED([BOINC_MINOR_VERSION], $BOINC_MINOR_VERSION, [Minor part of BOINC version number])
|
dnl AC_DEFINE_UNQUOTED([BOINC_MAJOR_VERSION], $BOINC_MAJOR_VERSION, [Major part of BOINC version number])
|
||||||
|
dnl AC_DEFINE_UNQUOTED([BOINC_MINOR_VERSION], $BOINC_MINOR_VERSION, [Minor part of BOINC version number])
|
||||||
|
|
||||||
|
dnl Need to duplicate these AC_SUBST because some versions of autoconf won't
|
||||||
|
dnl find AC_SUBST in a macro unless subsequently used in a DEFINE or SUBST
|
||||||
|
dnl outside of a macro. Don't ask me why.
|
||||||
|
AC_SUBST([BOINC_VERSION_STRING])
|
||||||
|
AC_SUBST([BOINC_MAJOR_VERSION])
|
||||||
|
AC_SUBST([BOINC_MINOR_BERSION])
|
||||||
|
|
||||||
AC_DEFINE_UNQUOTED([HOSTTYPE], "$host", [Host for this compilation])
|
AC_DEFINE_UNQUOTED([HOSTTYPE], "$host", [Host for this compilation])
|
||||||
AC_SUBST([CLIENT_BIN_FILENAME],[boinc])
|
AC_SUBST([CLIENT_BIN_FILENAME],[boinc])
|
||||||
AC_SUBST([CLIENT_GUI_BIN_FILENAME],[boincmgr])
|
AC_SUBST([CLIENT_GUI_BIN_FILENAME],[boincmgr])
|
||||||
|
@ -177,6 +186,10 @@ AH_TOP([
|
||||||
/* double-inclusion protection for config.h */
|
/* double-inclusion protection for config.h */
|
||||||
#ifndef BOINC_CONFIG_H
|
#ifndef BOINC_CONFIG_H
|
||||||
#define BOINC_CONFIG_H
|
#define BOINC_CONFIG_H
|
||||||
|
|
||||||
|
/* Version defines are now in version.h */
|
||||||
|
#include "version.h"
|
||||||
|
|
||||||
])
|
])
|
||||||
AH_BOTTOM([
|
AH_BOTTOM([
|
||||||
/* end double-inclusion protection for config.h */
|
/* end double-inclusion protection for config.h */
|
||||||
|
@ -330,6 +343,7 @@ dnl AC_SUBST(STATIC_FLAGS)
|
||||||
|
|
||||||
|
|
||||||
AC_CONFIG_FILES([
|
AC_CONFIG_FILES([
|
||||||
|
./version.h
|
||||||
api/Makefile
|
api/Makefile
|
||||||
apps/Makefile
|
apps/Makefile
|
||||||
clientgui/Makefile
|
clientgui/Makefile
|
||||||
|
|
Loading…
Reference in New Issue