Commit d4e8c1b9 by Maarten L. Hekkelman

fix man page, pkg-config init in configure

parent 82d1f1c4
......@@ -35,7 +35,7 @@ LIBS = @LIBS@ \
@BOOST_PROGRAM_OPTIONS_LIB@ \
@BOOST_DATE_TIME_LIB@
prefix = @prefix@
prefix = $(DESTDIR)@prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
datarootdir = @datarootdir@
......@@ -127,7 +127,7 @@ else
src/revision.hpp:
@ echo 'const char kRevision[] = R"(' > $@
@ echo dssp-version: $(VERSION) >> $@
@ echo Date: $$(date --iso-8601) >> $@
@ echo Date: $$(date --utc --date=@$(SOURCE_DATE_EPOCH) --iso-8601) >> $@
@ echo ')";' >> $@
endif
......
......@@ -18,20 +18,34 @@ AC_CONFIG_HEADERS([src/config.hpp])
AC_PREFIX_DEFAULT(/usr/local)
AC_PROG_INSTALL
PKG_PROG_PKG_CONFIG
AC_ARG_VAR([DEBUG], [Build a debug version of the application])
AC_ARG_VAR([MRC], [Specify a location for the mrc executable])
dnl We would like to use mrc
USE_RSRC=0
if test "x$MRC" = "x"; then
AC_PATH_PROG([MRC], [mrc])
fi
if test "x$MRC" = "x"; then
AC_MSG_ERROR([mrc not found, the application will be built without resources])
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])
dnl revision numbering is something used internally at the NKI
AC_ARG_ENABLE(
revision,
......@@ -95,7 +109,6 @@ AC_ARG_WITH([cif++],
AC_SUBST([CIFPP_RSRC], [$CIFPP_RSRC])
AS_IF([test "x$CIFPP_LIBS" = "x"], [
AC_PATH_PROG([PKG_CONFIG], [pkg-config])
if test -x "$PKG_CONFIG"
then
AX_PKG_CHECK_MODULES([CIFPP], [libcifpp], [], [], [AC_MSG_ERROR([the required package libcifpp is not installed])])
......
......@@ -21,7 +21,7 @@ Since version 4.0 the mkdssp program also assigns PP helices.
The input file can be either mmCIF or PDB format and the file may be
gzip or bzip2 compressed.
.sp
The output is optional, if ommited the output is written to \fIstdout\fR. If
The output is optional, if omitted the output is written to \fIstdout\fR. If
the name of the output file ends with either \fI.gz\fR or \fI.bz2\fR the
output is compressed accordingly.
.TP
......@@ -57,7 +57,9 @@ I HELX_RH_PI_P Helix_5
P HELX_LH_PP_P Helix_PPII
T TURN_TY1_P Turn
S BEND Bend
' ' OTHER Loop
T{
\(aq \(aq (space)
T} OTHER Loop
.TE
.SH BUGS
The mmCIF format currently lacks a lot of information that was available
......
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