Commit 5735a70e by Maarten L. Hekkelman

using resources...

parent 8f997658
......@@ -649,6 +649,7 @@ PKG_CONFIG
CCP4
UPDATE_REVISION
USE_RSRC
MRC
DEBUG
LIBCIF_SEMANTIC_VERSION
LIBCIF_LT_VERSION
......@@ -757,6 +758,7 @@ with_gnu_ld
with_sysroot
enable_libtool_lock
enable_revision
enable_resources
with_boost
with_boost_libdir
with_boost_iostreams
......@@ -778,6 +780,7 @@ CPP
CXXCPP
LT_SYS_LIBRARY_PATH
DEBUG
MRC
CCP4
PKG_CONFIG
PKG_CONFIG_PATH
......@@ -1414,6 +1417,7 @@ Optional Features:
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
--enable-revision Create a build number as revision
--disable-resources Use mrc to store data in resources
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
......@@ -1465,6 +1469,7 @@ Some influential environment variables:
LT_SYS_LIBRARY_PATH
User-defined run-time library search path.
DEBUG Build a debug version of the library
MRC Specify a location for the mrc executable
CCP4 The location where CCP4 is installed
PKG_CONFIG path to pkg-config utility
PKG_CONFIG_PATH
......@@ -17003,14 +17008,86 @@ if test "x$enable_revision" = "xyes" ; then :
fi
# dnl disable resources on macOS
USE_RSRC=0
case $host in #(
*-apple-*) :
USE_RSRC=0 ;; #(
;; #(
*) :
if test "x$MRC" = "x"; then
# Extract the first word of "mrc", so it can be a program name with args.
set dummy mrc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_MRC+:} false; then :
$as_echo_n "(cached) " >&6
else
case $MRC in
[\\/]* | ?:[\\/]*)
ac_cv_path_MRC="$MRC" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_MRC="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
;;
esac
fi
MRC=$ac_cv_path_MRC
if test -n "$MRC"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MRC" >&5
$as_echo "$MRC" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
fi
if test "x$MRC" = "x"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The mrc application was not found, not using resources." >&5
$as_echo "$as_me: WARNING: The mrc application was not found, not using resources." >&2;}
else
# Check whether --enable-resources was given.
if test "${enable_resources+set}" = set; then :
enableval=$enable_resources;
fi
if test "x$enable_resources" != "xno" ; then :
USE_RSRC=1
fi
fi
;;
esac
USE_RSRC=$USE_RSRC
cat >>confdefs.h <<_ACEOF
#define USE_RSRC $USE_RSRC
_ACEOF
UPDATE_REVISION=$UPDATE_REVISION
......
......@@ -85,12 +85,34 @@ AS_IF([test "x$enable_revision" = "xyes" ], [
UPDATE_REVISION=1
])
dnl disable resources on macOS
# dnl disable resources on macOS
USE_RSRC=0
AS_CASE([$host],
[*-apple-*], [USE_RSRC=0],
[USE_RSRC=1]
[*-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])
AC_SUBST([USE_RSRC], [$USE_RSRC])
AC_DEFINE_UNQUOTED([USE_RSRC], [$USE_RSRC], [Use mrc to store resources])
AC_SUBST([UPDATE_REVISION], [$UPDATE_REVISION])
......
......@@ -7,5 +7,8 @@ datalibdir=@datarootdir@/libcifpp
Name: libcifpp
Description: C++ library for the manipulation of mmCIF files.
Version: @PACKAGE_VERSION@
Libs: -L${libdir} -lcifpp
Cflags: -I${includedir}
Requires: @AX_PACKAGE_REQUIRES@
Requires.private: @AX_PACKAGE_REQUIRES_PRIVATE@
\ No newline at end of file
......@@ -111,3 +111,6 @@
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
/* Use mrc to store resources */
#undef USE_RSRC
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