Commit c3a74d38 authored by Eric J. Korpela's avatar Eric J. Korpela

config.h[.in] now includes win_config.h on WIN32 systems.

Split platform independent version info into version.h[.in]
(which in included from config.h)

Added all the config.h macros into win_config.h

svn path=/trunk/boinc/; revision=4731
parent cf378700
/* config.h. Generated by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */
/* double-inclusion protection for config.h */
#ifndef BOINC_CONFIG_H
#define BOINC_CONFIG_H
#include "version.h"
#ifdef _WIN32
#include "win_config.h"
#else
#error "You need to run configure first!"
#endif /* #ifndef _WIN32 */
/* end double-inclusion protection for config.h */
#endif /* #ifndef BOINC_CONFIG_H */
......@@ -83,12 +83,10 @@ AC_SUBST([BOINC_VERSION_STRING],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])
AC_DEFINE_UNQUOTED([BOINC_MAJOR_VERSION], $BOINC_MAJOR_VERSION, [Major part of BOINC version number])
AC_DEFINE_UNQUOTED([BOINC_MINOR_VERSION], $BOINC_MINOR_VERSION, [Minor part of BOINC version number])
AC_DEFINE_UNQUOTED([HOSTTYPE], "$host", [Host for this compilation])
AC_SUBST([CLIENT_BIN_FILENAME],[boinc])
AC_SUBST([CLIENT_GUI_BIN_FILENAME],[boincmgr])
AC_SUBST([CLIENT_BIN_FILENAME],[boinc_client_]AC_PACKAGE_VERSION[_$host${EXEEXT}])
AC_SUBST([CLIENT_GUI_BIN_FILENAME],[boinc_gui_]AC_PACKAGE_VERSION[_$host${EXEEXT}])
AC_SUBST([EXEEXT])
AC_SUBST([TOP_BUILD_DIR], [`pwd`])
AC_SUBST([TOP_SOURCE_DIR], [`(cd \`dirname "$0"\` && pwd)`])
......@@ -172,13 +170,24 @@ AC_CHECK_LIB(gen, strfind)
AC_CHECK_LIB(gen, strfind, [ AC_DEFINE(HAVE_STRFIND, 1, [Have strfind]) ] )
AC_CHECK_LIB(cygipc, shmget)
AC_SUBST([BOINC_MAJOR_VERSION])
AC_SUBST([BOINC_MINOR_VERSION])
AC_SUBST([BOINC_VERSION_STRING])
dnl put double-inclusion protection into config.h
AH_TOP([
/* double-inclusion protection for config.h */
#ifndef BOINC_CONFIG_H
#define BOINC_CONFIG_H
#include "version.h"
#ifdef _WIN32
#include "win_config.h"
#else
])
AH_BOTTOM([
#endif /* #ifndef _WIN32 */
/* end double-inclusion protection for config.h */
#endif /* #ifndef BOINC_CONFIG_H */
])
......@@ -330,6 +339,7 @@ dnl AC_SUBST(STATIC_FLAGS)
AC_CONFIG_FILES([
version.h
api/Makefile
apps/Makefile
clientgui/Makefile
......
/* $Id$ */
/* Platform independent version definitions... */
#ifndef BOINC_VERSION_H
#define BOINC_VERSION_H
/* Major part of BOINC version number */
#define BOINC_MAJOR_VERSION 4
/* Minor part of BOINC version number */
#define BOINC_MINOR_VERSION 57
/* String representation of BOINC version number */
#define BOINC_VERSION_STRING "4.57"
#endif /* #ifndef BOINC_VERSION_H */
/* $Id$ */
/* Platform independent version definitions... */
#ifndef BOINC_VERSION_H
#define BOINC_VERSION_H
/* Major part of BOINC version number */
#define BOINC_MAJOR_VERSION @BOINC_MAJOR_VERSION@
/* Minor part of BOINC version number */
#define BOINC_MINOR_VERSION @BOINC_MINOR_VERSION@
/* String representation of BOINC version number */
#define BOINC_VERSION_STRING "@BOINC_VERSION_STRING@"
#endif /* #ifndef BOINC_VERSION_H */
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment