cleanup

GNUmakefile.in

@@ -25,7 +25,7 @@
 firstTarget: all
 
 CXX					= @CXX@
-CXXFLAGS			= @CXXFLAGS@ @CPPFLAGS@ @PTHREAD_CFLAGS@ @CIFPP_CFLAGS@
+CXXFLAGS			= @CXXFLAGS@ @CPPFLAGS@ @PTHREAD_CFLAGS@ @CIFPP_CFLAGS@ @ZEEP_CFLAGS@
 LDFLAGS				= @LDFLAGS@ @PTHREAD_CFLAGS@
 LIBS				= @CIFPP_LIBS@ \
 					  @BOOST_IOSTREAMS_LIB@ \
@@ -147,10 +147,18 @@ OBJECTS = \
 	$(OBJDIR)/dssp.o
 
 ifneq "$(USE_RSRC)" "0"
+
+rsrc/%.dic: $(DATADIR)/%.dic.gz | rsrc
+	gzcat $^ > $@
+
+rsrc/%.dic: $(DATADIR)/%.dic | rsrc
+	ln -fs $^ $@
+
 $OBJECTS += dssp_rsrc.o
 
-$(OBJDIR)/dssp_rsrc.o: $(DATADIR)/mmcif_pdbx_v50.dic
+$(OBJDIR)/dssp_rsrc.o: rsrc/mmcif_pdbx_v50.dic
 	$(MRC) -o $$@ $$^
+
 endif
 
 $(OBJDIR)/dssp.o: src/revision.hpp

configure

@@ -1382,7 +1382,7 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-resources      Use mrc to store data in resources
+  --disable-resources     Use mrc to store data in resources
   --enable-revision       Create a build number as revision
 
 Optional Packages:
@@ -4129,7 +4129,7 @@ if test "${enable_resources+set}" = set; then :
 fi
 
 
-	if test "x$enable_resources" = "xyes" ; then :
+	if test "x$enable_resources" != "xno" ; then :
 
 		USE_RSRC=1
 

configure.ac

@@ -20,12 +20,12 @@ AC_PREFIX_DEFAULT(/usr/local)
 AC_PROG_INSTALL
 PKG_PROG_PKG_CONFIG
 
+AX_PTHREAD
+
 AC_ARG_VAR([DEBUG], [Build a debug version of the application])
 
 AC_ARG_VAR([MRC], [Specify a location for the mrc executable])
 
-PKG_PROG_PKG_CONFIG
-
 dnl using resources?
 USE_RSRC=0
 
@@ -38,9 +38,9 @@ if test "x$MRC" = "x"; then
 else
 	AC_ARG_ENABLE(
 		resources,
-		[AS_HELP_STRING([--enable-resources], [Use mrc to store data in resources])])
+		[AS_HELP_STRING([--disable-resources], [Do not use mrc to store data in resources])])
 
-	AS_IF([test "x$enable_resources" = "xyes" ], [
+	AS_IF([test "x$enable_resources" != "xno" ], [
 		USE_RSRC=1
 	])
 fi
@@ -60,8 +60,6 @@ AS_IF([test "x$enable_revision" = "xyes" ], [
 
 AC_SUBST([UPDATE_REVISION], [$UPDATE_REVISION])
 
-AX_PTHREAD
-
 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
@@ -132,6 +130,8 @@ pkg-config.])])
 					 LIBS="-lcifpp $LIBS"
 				 ],
                  [AC_MSG_ERROR([libcif++ not found])])
+
+		CIFPP_RSRC="\$(datadir)/libcifpp"
 	fi
 ])