From 1af3f22c48ab1c1d526feb28ff9219aa591cc47d Mon Sep 17 00:00:00 2001 From: "Eric J. Korpela" Date: Thu, 8 Dec 2005 20:22:04 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=9054 --- checkin_notes | 30 +++++++++++++++++++++++++++++- configure.ac | 33 ++++++++++++++++++++++----------- 2 files changed, 51 insertions(+), 12 deletions(-) diff --git a/checkin_notes b/checkin_notes index 24748f1e63..7d1b613a38 100755 --- a/checkin_notes +++ b/checkin_notes @@ -14278,7 +14278,7 @@ Bruce 7 Dec 2005 cleanlogs.sh Makefile.am -David 7 Sept 2005 +David 7 Dec 2005 - Manager: improvements to Statistics tab - Account manager RPC: added optional element to projects in reply. @@ -14290,3 +14290,31 @@ David 7 Sept 2005 acct_mgr.C,h clientgui/ ViewStatistics.cpp + + +Eric 8 Dec 2005 + - New autoconf macro "BOINC_PLATFORM" to determine the BOINC platform + being targeted. This overrides the use of the autoconf target as the + BOINC platform. I recommend that people developing BOINC + applications use this macro as well in their autoconf scripts. + This macro can be overridden with the --with-boinc-platform= + option to configure. + + Some of the platform modifications made in this script are... + + = *-redhat-* -> *-pc-* + = *-*-*[0-9].[0-9] -> *-*-* (trailing version numbers are dropped) + = sparc-sun-solaris -> sparc64-sun-solaris when compiled as 64 bit + binary + = x86_64-*-linux-gnu -> i686-pc-linux-gnu when compiled as a 32 bit + binary + - New autoconf macro "BOINC_CHECK_CYGWIN" to give people who need to + modify their configure script to work with CYGWIN a place to do their + work. Right now the only thing done here is to check whether to use + the Windows GUI or X11. Graphical compiles under CYGWIN currently + do not function due to both __unix__ and _WIN32 being defined. + + m4/ + boinc_platform.m4 + boinc_check_cygwin.m4 + configure.ac diff --git a/configure.ac b/configure.ac index 4099d4baaa..b9ac7b5246 100644 --- a/configure.ac +++ b/configure.ac @@ -126,9 +126,6 @@ AC_SUBST([BOINC_VERSION_STRING]) AC_SUBST([BOINC_MAJOR_VERSION]) AC_SUBST([BOINC_MINOR_VERSION]) -AC_SUBST([CLIENT_BIN_FILENAME],[boinc]) -AC_SUBST([CLIENT_CMD_BIN_FILENAME],[boinccmd]) -AC_SUBST([CLIENT_GUI_BIN_FILENAME],[boincmgr]) AC_SUBST([TOP_BUILD_DIR], [`pwd`]) AC_SUBST([TOP_SOURCE_DIR], [`(cd \`dirname "$0"\` && pwd)`]) @@ -142,6 +139,14 @@ AC_PROG_MAKE_SET AC_PROG_RANLIB SAH_LINKS +AC_SUBST([CLIENT_BIN_FILENAME],[boinc${EXEEXT}]) +AC_SUBST([CLIENT_CMD_BIN_FILENAME],[boinccmd${EXEEXT}]) +AC_SUBST([CLIENT_GUI_BIN_FILENAME],[boincmgr${EXEEXT}]) + +dnl If we're running under cygwin, check whether we want to use X11 or WIN32 +dnl GUI +BOINC_CHECK_CYGWIN + dnl enable objective-C _AM_DEPENDENCIES([OBJC]) OBJC="$CC" @@ -154,10 +159,13 @@ AC_LIBTOOL_WIN32_DLL AC_PROG_LIBTOOL AC_SUBST(PICFLAGS,${lt_prog_compiler_pic}) + SAH_OPTION_BITNESS +dnl Determine the BOINC platform given the target arch-platform-os. +BOINC_PLATFORM + dnl Some platform specific settings -myhost=$host case $target in *linux* | *sun* ) if ( test "${enable_client_release}" = yes ) && ( test "${enable_client}" != yes ); then @@ -168,10 +176,6 @@ The switch --enable-client-release is only useful for building the client and wi fi ;; -powerpc-apple-darwin* ) - myhost=powerpc-apple-darwin - ;; - *) ## in the non-linux, non-solaris case, --enable-client-release is not allowed if test "${enable_client_release}" = yes; then AC_MSG_WARN([ @@ -183,8 +187,6 @@ for Linux and Solaris, and will have no effect. ;; esac -AC_DEFINE_UNQUOTED([HOSTTYPE], "$myhost", [Host for this compilation]) - dnl Unfortunately on some 32 bit systems there is a problem with wx-widgets dnl configuring itself for largefile support. On these systems largefile dnl support breaks C++ compiles by defining away many of the C standard library @@ -310,6 +312,10 @@ SAH_CHECK_LIB([dl], [dlopen], [BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${sah_lib_last}"]) SAH_CHECK_LIB([nsl], [gethostbyname], [BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${sah_lib_last}"]) +#SAH_CHECK_LIB([wsock32], [fopen], +# [BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${sah_lib_last}"]) +#SAH_CHECK_LIB([wsock], [fopen], +# [BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${sah_lib_last}"]) SAH_CHECK_LIB([socket], [bind], [BOINC_EXTRA_LIBS="${BOINC_EXTRA_LIBS} ${sah_lib_last}"]) SAH_CHECK_LIB([z], [gzopen], @@ -408,7 +414,7 @@ AC_HEADER_STDC AC_HEADER_SYS_WAIT AC_HEADER_TIME AC_TYPE_SIGNAL -AC_CHECK_HEADERS(arpa/inet.h dirent.h fcntl.h malloc.h netdb.h netinet/in.h netinet/tcp.h signal.h strings.h sys/file.h sys/ipc.h sys/mount.h sys/param.h sys/resource.h sys/select.h sys/shm.h sys/socket.h sys/stat.h sys/statvfs.h sys/statfs.h sys/swap.h sys/sysctl.h sys/systeminfo.h sys/time.h sys/types.h sys/utsname.h sys/vmmeter.h sys/wait.h unistd.h utmp.h errno.h procfs.h ieeefp.h) +AC_CHECK_HEADERS(windows.h arpa/inet.h dirent.h fcntl.h malloc.h netdb.h netinet/in.h netinet/tcp.h signal.h strings.h sys/file.h sys/ipc.h sys/mount.h sys/param.h sys/resource.h sys/select.h sys/shm.h sys/socket.h sys/stat.h sys/statvfs.h sys/statfs.h sys/swap.h sys/sysctl.h sys/systeminfo.h sys/time.h sys/types.h sys/utsname.h sys/vmmeter.h sys/wait.h unistd.h utmp.h errno.h procfs.h ieeefp.h) AC_LANG_PUSH(C++) SAH_LARGEFILE_BREAKS_CXX @@ -561,6 +567,11 @@ SAH_CHECK_LIB([pthread],[pthread_join],[ AC_DEFINE([HAVE_LIBPTHREAD],[1],[Define to 1 if you have the pthread library]) CLIENTLIBS="${CLIENTLIBS} ${sah_lib_last}"]) echo DEBUG: CLIENTLIBS=${CLIENTLIBS} >&5 +#SAH_CHECK_LIB([wsock32],[fopen],[ +# AC_DEFINE([HAVE_LIBWSOCK32],[1],[Define to 1 if you have the wsock32 library]) +# CLIENTLIBS="${CLIENTLIBS} ${sah_lib_last}"]) +# echo DEBUG: CLIENTLIBS=${CLIENTLIBS} >&5 + if ( test "${disable_static_linkage}" != yes ) && ( test "${enable_client_release}" = yes ); then echo "----------"