Commit 3afb3ddf authored by Rom Walton's avatar Rom Walton

BOINCZIP: Remove attempt at standalone build system for boinczip. Plug it...

BOINCZIP: Remove attempt at standalone build system for boinczip.  Plug it back into the main BOINC build system and only build it on request or building for the server config.
parent 2228f574
......@@ -13,6 +13,9 @@ if ENABLE_LIBRARIES
if ENABLE_SERVER
API_SUBDIRS += zip
endif
if ENABLE_BOINCZIP
API_SUBDIRS += zip
endif
endif
if ENABLE_SERVER
......
......@@ -102,12 +102,18 @@ AC_ARG_ENABLE(xss,
[enable_xss=${enableval}],
[enable_xss=yes])
AC_ARG_ENABLE(boinczip,
AS_HELP_STRING([--enable-boinczip],
[enable building the boinc zip library]),
[enable_boinczip=${enableval}],
[enable_boinczip=no])
AC_ARG_ENABLE(pkg-libs,
AS_HELP_STRING([--enable-pkg-libs],
[Builds and installs components that would be present in a
boinc-libs package. This is a synonym for --disable-server
--disable-client --enable-libraries --disable-static
--disable-install-headers --disable-manager]),
--disable-install-headers --disable-manager --enable-boinczip]),
[
enable_libraries=yes
enable_server=no
......@@ -115,6 +121,7 @@ AC_ARG_ENABLE(pkg-libs,
enable_manager=no
enable_install_headers=no
enable_static=no
enable_boinczip=yes
],
[])
......@@ -123,13 +130,14 @@ AC_ARG_ENABLE(pkg-devel,
[Builds and installs components that would be present in a
boinc-devel package. This is a synonym for --disable-server
--disable-client --enable-libraries --enable-install-headers
--disable-manger]),
--disable-manger --enable-boinczip]),
[
enable_libraries=yes
enable_server=no
enable_client=no
enable_manager=no
enable_install_headers=yes
enable_boinczip=yes
],
[])
......@@ -145,6 +153,7 @@ AC_ARG_ENABLE(pkg-client,
enable_client=yes
enable_manager=no
enable_install_headers=no
enable_boinczip=no
],
[])
......@@ -158,6 +167,7 @@ AC_ARG_ENABLE(pkg-manager,
enable_client=no
enable_manager=yes
enable_install_headers=no
enable_boinczip=no
],
[])
......@@ -790,6 +800,7 @@ AM_CONDITIONAL(ENABLE_SERVER, [test "${enable_server}" = yes])
AM_CONDITIONAL(ENABLE_CLIENT, [test "${enable_client}" = yes])
AM_CONDITIONAL(ENABLE_MANAGER, [ test "x${ac_cv_have_wxwidgets}" = xyes -a "${enable_manager}" = yes ])
AM_CONDITIONAL(ENABLE_LIBRARIES, [test "${enable_libraries}" = yes])
AM_CONDITIONAL(ENABLE_BOINCZIP, [test "${enable_boinczip}" = yes])
AM_CONDITIONAL(INSTALL_HEADERS, [test "${enable_install_headers}" = yes])
AM_CONDITIONAL(HAVE_CUDA_LIB, [test "${enable_client}" = yes -a -f ./coprocs/CUDA/posix/${boinc_platform}/libcudart.so])
......
......@@ -2,12 +2,12 @@
## note: -D flags taken from a zip config build under Linux
include Makefile.incl
include ../Makefile.incl
SUBDIRS = zip unzip
AM_CFLAGS += -I$(top_srcdir) -I$(top_srcdir)/zip -I$(top_srcdir)/unzip -I$(top_srcdir)/../lib -DUNIX -DDLL -DUSE_ZIPMAIN -DNO_OFF_T -DNO_CRYPT -DNO_LCHOWN -DNO_LCHMOD -DIZ_PWLEN=80 -Dinflate=inflate_boinc -Ddeflate=deflate_boinc -Dget_crc_table=get_crc_table_boinc -Dlongest_match=longest_match_boinc -Dinflate_codes=inflate_codes_boinc -Dcrc32=crc32_boinc
AM_CXXFLAGS += -I$(top_srcdir) -I$(top_srcdir)/zip -I$(top_srcdir)/unzip -I$(top_srcdir)/../lib -DUNIX -DDLL -DUSE_ZIPMAIN -DNO_OFF_T -DNO_CRYPT -DNO_LCHOWN -DNO_LCHMOD -DIZ_PWLEN=80 -Dinflate=inflate_boinc -Ddeflate=deflate_boinc -Dget_crc_table=get_crc_table_boinc -Dlongest_match=longest_match_boinc -Dinflate_codes=inflate_codes_boinc -Dcrc32=crc32_boinc
AM_CFLAGS += -I$(top_srcdir) -I$(top_srcdir)/zip/zip -I$(top_srcdir)/zip/unzip -I$(top_srcdir)/lib -DUNIX -DDLL -DUSE_ZIPMAIN -DNO_OFF_T -DNO_CRYPT -DNO_LCHOWN -DNO_LCHMOD -DIZ_PWLEN=80 -Dinflate=inflate_boinc -Ddeflate=deflate_boinc -Dget_crc_table=get_crc_table_boinc -Dlongest_match=longest_match_boinc -Dinflate_codes=inflate_codes_boinc -Dcrc32=crc32_boinc
AM_CXXFLAGS += -I$(top_srcdir) -I$(top_srcdir)/zip/zip -I$(top_srcdir)/zip/unzip -I$(top_srcdir)/lib -DUNIX -DDLL -DUSE_ZIPMAIN -DNO_OFF_T -DNO_CRYPT -DNO_LCHOWN -DNO_LCHMOD -DIZ_PWLEN=80 -Dinflate=inflate_boinc -Ddeflate=deflate_boinc -Dget_crc_table=get_crc_table_boinc -Dlongest_match=longest_match_boinc -Dinflate_codes=inflate_codes_boinc -Dcrc32=crc32_boinc
if INSTALL_HEADERS
pkginclude_HEADERS = boinc_zip.h
......
## -*-Makefile -*-
## $Id$
AM_CFLAGS = -Wall -Wextra -Wshadow -Wredundant-decls -Wdisabled-optimization -Wpointer-arith -Wstrict-aliasing -Wcast-align
AM_CXXFLAGS = $(AM_CFLAGS)
AM_LDFLAGS =
# dependencies to make sure libs gets compiled before
# programs linking to them:
LIBBOINC = $(top_builddir)/../lib/libboinc.la
$(LIBBOINC):
cd $(top_builddir)/../lib; ${MAKE} libboinc.la
LIBAPI = $(top_builddir)/../api/libboinc_api.la
$(LIBAPI):
cd $(top_builddir)/../api; ${MAKE} libboinc_api.la
APPLIBS = $(LIBAPI) $(LIBBOINC)
#!/bin/sh
## $Id$
## ---------- some portability checks/adjustments [stolen from configure] ----------
## 'echo -n' is not portable..
case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
*c*,-n*) ECHO_N= ECHO_C='
' ECHO_T=' ' ;;
*c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
*) ECHO_N= ECHO_C='\c' ECHO_T= ;;
esac
##----------
## ----------------------------------------------------------------------
## Check that given command $1 has version >= $2.$3
## return 0 if ok, 1 too old or not found (-> shell conventions).
## ----------------------------------------------------------------------
check_version()
{
dir=`pwd`
cd /tmp
foundit=
## get current version of $1
desired=`echo $2 | awk -F. '{print $1*100+$2}'`
echo $ECHO_N "Checking version of '$1' >= $desired... $ECHO_C"
name=$1
fullpath=`type $name | awk '{ print $(NF) }'`;
if [ -x "$fullpath" ]; then
foundit=yes;
fi
if [ "$foundit" != yes ]; then
echo "Didn't find application";
version=0
success=no
else
cmdline="$fullpath --version";
if version=`($cmdline 2>/dev/null)` 2>/dev/null; then
echo >/dev/null
else
version="0";
fi
if [ -n "${version}" ]; then
version=`echo $version | awk '{ for (i=1;i<=NF;i++) { split($i,j,"."); m=j[1]*100+j[2] ; if ((m*1)>0) { print m ; break; } } }'`
if [ -z "$version" ]; then version=0; fi
success=`echo "$version" "$desired" | awk '{ if ($1 >= $2) { print "yes";} else {print "no";}} '`
else
version=0
success=no
fi
fi
cd $dir
if [ $success = "yes" ] ; then
echo "succeeded. ($version)"
return 0;
else
echo "failed. ($version)"
return 1;
fi
} ## check_version()
## --------------------------------------------------------------------------------
## 'MAIN' starts here
## --------------------------------------------------------------------------------
echo "Bootstrapping configure script and makefiles:"
## ---------- first check santity of the installed versions of the build-system
## in case there's GNU drop-in tools available, set these
## some sorry systems don't have proper GNU-make...
if check_version make 3.79; then
echo >/dev/null
else
if check_version gmake 3.79; then
have_gmake=yes;
else
echo "Couldn't find a new-enough version of GNU 'make', please install one!";
echo "If you have a newer version, set the environment variable 'MAKE' to its path";
exit 1;
fi
fi
## FreeBSD's m4 seems to be broken? Download a fresh one
if check_version m4 1.4; then
echo >/dev/null
else
## solaris m4 works fine
if test -f /usr/ccs/bin/m4
then
echo >/dev/null
elif check_version gm4 1.4; then
have_gm4=yes;
else
echo "Couldn't find a new-enough version of 'm4', please install one!";
echo "If you have a newer version, set the environment variable 'M4' to its path";
exit 1;
fi
# build_lsc_aux "m4-1.4.1"
fi
if check_version pkg-config 0.15; then
echo >/dev/null
else
echo "Couldn't find a new-enough version of 'pkg-config', please install one!";
exit 1;
# build_lsc_aux "pkgconfig-0.15.0"
fi
if check_version autoreconf 2.58; then
echo >/dev/null
else
echo "Couldn't find a new-enough version of 'autoreconf', please install one!";
exit 1;
# build_lsc_aux "autoconf-2.59"
fi
if check_version automake 1.8; then
echo >/dev/null
else
echo "Couldn't find a new-enough version of 'automake', please install one!";
echo "If you have a newer version, set the environment variable 'AUTOMAKE' and 'ACLOCAL' to its path";
exit 1;
# build_lsc_aux "automake-1.8.5"
fi
if check_version libtoolize 1.5; then
echo >/dev/null
else
echo "Couldn't find a new-enough version of 'libtoolize', please install one!";
echo "If you have a newer version, set the environment variable 'LIBTOOLIZE' to its path";
exit 1;
fi
## ---------- now run autoreconf
cmdline="autoreconf -i";
echo "$cmdline"
if eval $cmdline; then
echo "Done, now run ./configure"
echo " ./configure -C to enable caching"
exit 0
else
echo "Something failed .... please check error-message and re-run when fixed."
echo "exiting..."
exit 1
fi
dnl -*- autoconf -*-
AC_INIT([boinczip], [1.0.0])
AM_INIT_AUTOMAKE([foreign subdir-objects])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR([configure.ac])
AC_PROG_CC
AC_PROG_CPP
AC_PROG_MAKE_SET
AC_PROG_CXX
AM_PROG_CC_C_O
AC_LIBTOOL_DLOPEN
AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL
AM_CONDITIONAL(OS_DARWIN, [echo $host_os | grep '^darwin' > /dev/null])
AM_CONDITIONAL(OS_LINUX, [echo $host_os | grep '^linux' > /dev/null])
AM_CONDITIONAL(OS_WIN32_MINGW, [echo $host_os | grep '^mingw' > /dev/null])
AM_CONDITIONAL(OS_OS2, [echo $host_os | grep '^os2' > /dev/null])
AM_CONDITIONAL(OS_ARM_LINUX, [echo $host_alias | grep '^arm-linux' > /dev/null])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
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