Skip to content

L
libcifpp
Commit 7a611293 by Maarten L. Hekkelman
Options

refactor configure

parent 5735a70e
Showing with 138 additions and 91 deletions
GNUmakefile.in
...@@ -28,12 +28,18 @@ ...@@ -28,12 +28,18 @@
firstTarget: all firstTarget: all
CXX = @CXX@ CXX = @CXX@
CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ @BOOST_CPPFLAGS@ @PTHREAD_CFLAGS@ CXXFLAGS = @BOOST_CPPFLAGS@ \
LDFLAGS = @LDFLAGS@ @LIBS@ @BOOST_LDFLAGS@ @CPPFLAGS@ \
LIBS = @LIBS@ @PTHREAD_LIBS@ \ @CXXFLAGS@ \
@PTHREAD_CFLAGS@
LDFLAGS = @BOOST_LDFLAGS@ \
@LDFLAGS@ \
@LIBS@
LIBS = @PTHREAD_LIBS@ \
@BOOST_IOSTREAMS_LIB@ \ @BOOST_IOSTREAMS_LIB@ \
@BOOST_DATE_TIME_LIB@ \ @BOOST_DATE_TIME_LIB@ \
@BOOST_REGEX_LIB@ @BOOST_REGEX_LIB@ \
@LIBS@
prefix = $(DESTDIR)@prefix@ prefix = $(DESTDIR)@prefix@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
...@@ -57,16 +63,6 @@ DEFINES += USE_RSRC=@USE_RSRC@ ...@@ -57,16 +63,6 @@ DEFINES += USE_RSRC=@USE_RSRC@
GNUmakefile: config.status GNUmakefile.in GNUmakefile: config.status GNUmakefile.in
$(SHELL) ./config.status $(SHELL) ./config.status
ifeq "$(CHECK_CONFIG)" "1"
config.status: configure
$(SHELL) ./config.status --recheck
configure: configure.ac
autoconf
endif
LIB_NAME = @PACKAGE_NAME@ LIB_NAME = @PACKAGE_NAME@
LIB_VERSION = @LIBCIF_LT_VERSION@ LIB_VERSION = @LIBCIF_LT_VERSION@
LIB_CURRENT = @LIBCIF_LT_CURRENT@ LIB_CURRENT = @LIBCIF_LT_CURRENT@
......
config/m4/ax_filesystem.m4 0 → 100644
# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2020 NKI/AVL, Netherlands Cancer Institute
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# 1. Redistributions of source code must retain the above copyright notice, this
# list of conditions and the following disclaimer
# 2. Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
# Description: m4 macro to detect std::filesystem and optionally the linker flags to use it
AC_DEFUN([AX_FILESYSTEM],
[
AC_CHECK_HEADER([filesystem], [], [AC_MSG_ERROR([The file <filesystem> is missing, perhaps you should install a more recent libstdc++ implementation.])])
dnl check if we need stdc++fs as library
AC_TRY_LINK(
[#include <filesystem>],
[(void)std::filesystem::current_path();],
[],
[
LIBS="$LIBS -lstdc++fs"
AC_TRY_LINK(
[#include <filesystem>],
[(void)std::filesystem::current_path();],
[],
[
AC_MSG_ERROR([Could not link filesystem])
]
)
]
)
])
config/m4/ax_mrc.m4 0 → 100644
# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2020 NKI/AVL, Netherlands Cancer Institute
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# 1. Redistributions of source code must retain the above copyright notice, this
# list of conditions and the following disclaimer
# 2. Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
# Description: m4 macro to detect mrc, the resource compiler
AC_DEFUN([AX_MRC],
[
AC_ARG_VAR([MRC], [Specify a location for the mrc executable])
dnl using resources?
USE_RSRC=0
if test "x$MRC" = "x"; then
AC_PATH_PROG([MRC], [mrc])
fi
if test "x$MRC" = "x"; then
AC_MSG_WARN([The mrc application was not found, not using resources.])
else
AC_ARG_ENABLE(
resources,
[AS_HELP_STRING([--disable-resources], [Do not use mrc to store data in resources])])
AS_IF([test "x$enable_resources" != "xno" ], [
USE_RSRC=1
])
fi
AC_SUBST([USE_RSRC], [$USE_RSRC])
AC_DEFINE_UNQUOTED([USE_RSRC], [$USE_RSRC], [Use mrc to store resources])
])
\ No newline at end of file
configure
This source diff could not be displayed because it is too large. You can view the blob instead.
configure.ac
AC_PREREQ([2.69]) AC_PREREQ([2.69])
AC_INIT([libcifpp], 1.0, [m.hekkelman@nki.nl]) m4_define([libcifpp_version_major],[1])
m4_define([libcifpp_version_minor],[1])
m4_define([libcifpp_version_micro],[0])
m4_define([libcifpp_version_extra],[])
m4_define([libcifpp_version],[libcifpp_version_major().libcifpp_version_minor().libcifpp_version_micro()libcifpp_version_extra])
AC_INIT([libcifpp], [libcifpp_version], [m.hekkelman@nki.nl])
dnl Switch to a C++ compiler, and check if it works. dnl Switch to a C++ compiler, and check if it works.
AC_LANG(C++) AC_LANG(C++)
AX_CXX_COMPILE_STDCXX_17([noext]) AX_CXX_COMPILE_STDCXX_17([noext])
AX_CHECK_COMPILE_FLAG([-fstandalone-debug], [ CXXFLAGS="$CXXFLAGS -fstandalone-debug" ], , [-Werror]) AX_CHECK_COMPILE_FLAG([-fstandalone-debug],
[
CXXFLAGS="$CXXFLAGS -fstandalone-debug"
] , , [-Werror])
AC_CONFIG_SRCDIR([src/Cif++.cpp]) AC_CONFIG_SRCDIR([src/Cif++.cpp])
AC_CONFIG_AUX_DIR(config) AC_CONFIG_AUX_DIR(config)
AC_CONFIG_MACRO_DIR([config/m4]) AC_CONFIG_MACRO_DIR([config/m4])
AC_CONFIG_HEADERS([src/Config.hpp]) AC_CONFIG_HEADERS([src/Config.hpp])
AX_PTHREAD
AC_PREFIX_DEFAULT(/usr/local) AC_PREFIX_DEFAULT(/usr/local)
AC_CHECK_HEADER([filesystem], [], [AC_MSG_ERROR([The file <filesystem> is missing, perhaps you should install a more recent libstdc++ implementation.])]) AX_FILESYSTEM
dnl check if we need stdc++fs as library
AC_MSG_CHECKING([if linking to stdc++fs is required])
AC_TRY_LINK(
[#include <filesystem>],
[(void)std::filesystem::current_path();],
[
AC_MSG_RESULT(no)
],
[
LIBS="$LIBS -lstdc++fs"
AC_TRY_LINK(
[#include <filesystem>],
[(void)std::filesystem::current_path();],
[
AC_MSG_RESULT(yes)
],
[
AC_MSG_ERROR([Could not link filesystem])
]
)
]
)
dnl AC_DEFUN([read_test], [AC_LANG_SOURCE(
dnl esyscmd(tools/m4esc.sh config-tests/$1))])
dnl
dnl AC_MSG_CHECKING([compiler standards compliance])
dnl AC_COMPILE_IFELSE(
dnl [read_test(cpp-17-test.cpp)], [],
dnl [AC_MSG_ERROR([Your c++ compiler is not capable of compiling libcifpp, please upgrade])])
dnl AC_MSG_RESULT(ok)
AC_PROG_INSTALL AC_PROG_INSTALL
PKG_PROG_PKG_CONFIG
AX_PTHREAD
AC_ARG_VAR([DEBUG], [Build a debug version of the application])
dnl disable shared libraries, they break the build on MacOS... sigh dnl disable shared libraries, they break the build on MacOS... sigh
LT_INIT([disable-shared pic-only]) LT_INIT([disable-shared pic-only])
...@@ -71,54 +50,25 @@ AC_SUBST(LIBCIF_LT_CURRENT) ...@@ -71,54 +50,25 @@ AC_SUBST(LIBCIF_LT_CURRENT)
AC_SUBST(LIBCIF_LT_VERSION) AC_SUBST(LIBCIF_LT_VERSION)
dnl and now for the semantic version dnl and now for the semantic version
LIBCIF_SEMANTIC_VERSION=1.1.0 LIBCIF_SEMANTIC_VERSION=libcifpp_version
AC_SUBST(LIBCIF_SEMANTIC_VERSION) AC_SUBST(LIBCIF_SEMANTIC_VERSION)
AC_ARG_VAR([DEBUG], [Build a debug version of the library]) AC_ARG_VAR([CCP4], [The location where CCP4 is installed])
AX_MRC
dnl revision numbering is something used internally at the NKI dnl revision numbering is something used internally at the NKI
AC_ARG_ENABLE( AC_ARG_ENABLE(
revision, revision,
[AS_HELP_STRING([--enable-revision], [Create a build number as revision])]) [AS_HELP_STRING([--disable-revision], [Create a build number as revision])])
AS_IF([test "x$enable_revision" = "xyes" ], [ AS_IF([test "x$enable_revision" != "xno" ], [
UPDATE_REVISION=1 UPDATE_REVISION=1
]) ])
# dnl disable resources on macOS
USE_RSRC=0
AS_CASE([$host],
[*-apple-*], [],
[
AC_ARG_VAR([MRC], [Specify a location for the mrc executable])
if test "x$MRC" = "x"; then
AC_PATH_PROG([MRC], [mrc])
fi
if test "x$MRC" = "x"; then
AC_MSG_WARN([The mrc application was not found, not using resources.])
else
AC_ARG_ENABLE(
resources,
[AS_HELP_STRING([--disable-resources], [Use mrc to store data in resources])])
AS_IF([test "x$enable_resources" != "xno" ], [
USE_RSRC=1
])
fi
]
)
AC_SUBST([USE_RSRC], [$USE_RSRC])
AC_DEFINE_UNQUOTED([USE_RSRC], [$USE_RSRC], [Use mrc to store resources])
AC_SUBST([UPDATE_REVISION], [$UPDATE_REVISION]) AC_SUBST([UPDATE_REVISION], [$UPDATE_REVISION])
AC_ARG_VAR([CCP4], [The location where CCP4 is installed]) AX_FILESYSTEM
PKG_PROG_PKG_CONFIG
AC_CHECK_FUNCS([floor pow rint sqrt strchr strerror]) AC_CHECK_FUNCS([floor pow rint sqrt strchr strerror])
AC_CHECK_HEADERS([sys/ioctl.h]) AC_CHECK_HEADERS([sys/ioctl.h])
...@@ -127,9 +77,7 @@ AC_CHECK_HEADER_STDBOOL ...@@ -127,9 +77,7 @@ AC_CHECK_HEADER_STDBOOL
AC_CHECK_TYPES([ptrdiff_t]) AC_CHECK_TYPES([ptrdiff_t])
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
AX_BOOST_BASE([1.71], [], [ AX_BOOST_BASE([1.71], [], [AC_MSG_ERROR([Sorry, your boost is not found or not up-to-date.])])
AC_MSG_ERROR([Sorry, your boost is not found or not up-to-date.])
])
AX_BOOST_IOSTREAMS AX_BOOST_IOSTREAMS
AX_BOOST_DATE_TIME AX_BOOST_DATE_TIME
AX_BOOST_REGEX AX_BOOST_REGEX
......
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