Commit 360d9700 by Maarten L. Hekkelman

only build symop table if CCP4 is found

parent 87d87fe5
...@@ -40,6 +40,9 @@ includedir = @includedir@ ...@@ -40,6 +40,9 @@ includedir = @includedir@
LIB_NAME = @PACKAGE_NAME@ LIB_NAME = @PACKAGE_NAME@
LIB_TARGET = $(LIB_NAME).la LIB_TARGET = $(LIB_NAME).la
CCP4DIR = @CCP4@
CLIBD ?= $(CCP4DIR)/lib/data
ifeq "$(CHECK_CONFIG)" "1" ifeq "$(CHECK_CONFIG)" "1"
GNUmakefile: config.status GNUmakefile.in GNUmakefile: config.status GNUmakefile.in
...@@ -111,6 +114,8 @@ LIBCIF_SRC = AtomType.cpp \ ...@@ -111,6 +114,8 @@ LIBCIF_SRC = AtomType.cpp \
SOURCES = $(addprefix src/,$(LIBCIF_SRC)) SOURCES = $(addprefix src/,$(LIBCIF_SRC))
OBJECTS = $(addprefix $(OBJDIR)/, $(notdir $(SOURCES:%.cpp=%.lo))) OBJECTS = $(addprefix $(OBJDIR)/, $(notdir $(SOURCES:%.cpp=%.lo)))
ifneq "$CCP4DIR" ""
# Special rules to generate symmetry operation number table # Special rules to generate symmetry operation number table
tools/symop-map-generator: tools/symop-map-generator.cpp tools/symop-map-generator: tools/symop-map-generator.cpp
...@@ -119,6 +124,8 @@ src/SymOpTable_data.cpp: tools/symop-map-generator $(CLIBD)/symop.lib ...@@ -119,6 +124,8 @@ src/SymOpTable_data.cpp: tools/symop-map-generator $(CLIBD)/symop.lib
$(OBJDIR)/Symmetry.lo: src/SymOpTable_data.cpp $(OBJDIR)/Symmetry.lo: src/SymOpTable_data.cpp
endif
# version info # version info
REVISION = $(shell git log --pretty=format:%h --max-count=1) REVISION = $(shell git log --pretty=format:%h --max-count=1)
REVISION_FILE = version-info-$(REVISION).txt REVISION_FILE = version-info-$(REVISION).txt
......
...@@ -644,6 +644,7 @@ BOOST_LDFLAGS ...@@ -644,6 +644,7 @@ BOOST_LDFLAGS
BOOST_CPPFLAGS BOOST_CPPFLAGS
SET_MAKE SET_MAKE
PKG_CONFIG PKG_CONFIG
CCP4
DEBUG DEBUG
LIBTOOL_DEPS LIBTOOL_DEPS
CXXCPP CXXCPP
...@@ -763,6 +764,7 @@ LT_SYS_LIBRARY_PATH ...@@ -763,6 +764,7 @@ LT_SYS_LIBRARY_PATH
CPP CPP
CXXCPP CXXCPP
DEBUG DEBUG
CCP4
LIBZ_CPPFLAGS LIBZ_CPPFLAGS
LIBZ_LDFLAGS LIBZ_LDFLAGS
LIBBZ2_CPPFLAGS LIBBZ2_CPPFLAGS
...@@ -1437,6 +1439,7 @@ Some influential environment variables: ...@@ -1437,6 +1439,7 @@ Some influential environment variables:
CPP C preprocessor CPP C preprocessor
CXXCPP C++ preprocessor CXXCPP C++ preprocessor
DEBUG Build a debug version of the library DEBUG Build a debug version of the library
CCP4 The location where CCP4 is installed
LIBZ_CPPFLAGS LIBZ_CPPFLAGS
C preprocessor flags for LIBZ headers C preprocessor flags for LIBZ headers
LIBZ_LDFLAGS LIBZ_LDFLAGS
...@@ -16014,6 +16017,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ...@@ -16014,6 +16017,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
# Extract the first word of "pkg-config", so it can be a program name with args. # Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2 set dummy pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
......
...@@ -26,6 +26,8 @@ AC_SUBST(LIBTOOL_DEPS) ...@@ -26,6 +26,8 @@ AC_SUBST(LIBTOOL_DEPS)
AC_ARG_VAR([DEBUG], [Build a debug version of the library]) AC_ARG_VAR([DEBUG], [Build a debug version of the library])
AC_ARG_VAR([CCP4], [The location where CCP4 is installed])
AC_PATH_PROG([PKG_CONFIG], [pkg-config]) AC_PATH_PROG([PKG_CONFIG], [pkg-config])
AC_CHECK_FUNCS([floor pow rint sqrt strchr strerror]) AC_CHECK_FUNCS([floor pow rint sqrt strchr strerror])
......
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