Fixed compiling outside a git checked out directory

.gitignore

@@ -19,3 +19,4 @@ dssp
 src/config.hpp
 src/config.hpp
 src/config.hpp.in~
 src/config.hpp.in~
 src/revision.hpp
 src/revision.hpp
+mkdssp

configure

@@ -1373,7 +1373,7 @@ Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-resources      Use mrc to store data in resources
   --enable-resources      Use mrc to store data in resources
-  --disable-revision      Create a build number as revision
+  --enable-revision       Create a build number as revision
 
 
 Optional Packages:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -4129,7 +4129,7 @@ if test "${enable_revision+set}" = set; then :
 fi
 fi
 
 
 
 
-if test "x$enable_revision" != "xno" ; then :
+if test "x$enable_revision" = "xyes" ; then :
 
 
 	UPDATE_REVISION=1
 	UPDATE_REVISION=1
 
 
@@ -7079,7 +7079,7 @@ else
 fi
 fi
 
 
 			CIFPP_CFLAGS="-I ${withval}/include"
 			CIFPP_CFLAGS="-I ${withval}/include"
-			CIFPP_LIBS="-L${withval}/.libs -lcif++"
+			CIFPP_LIBS="-L${withval}/.libs -lcifpp"
 			CIFPP_RSRC="${withval}/rsrc"
 			CIFPP_RSRC="${withval}/rsrc"
 
 
 			CIFPP_CFLAGS=$CIFPP_CFLAGS
 			CIFPP_CFLAGS=$CIFPP_CFLAGS
@@ -7216,13 +7216,13 @@ fi
      ac_fn_cxx_check_header_mongrel "$LINENO" "cif++/Config.hpp" "ac_cv_header_cifpp_Config_hpp" "$ac_includes_default"
      ac_fn_cxx_check_header_mongrel "$LINENO" "cif++/Config.hpp" "ac_cv_header_cifpp_Config_hpp" "$ac_includes_default"
 if test "x$ac_cv_header_cifpp_Config_hpp" = xyes; then :
 if test "x$ac_cv_header_cifpp_Config_hpp" = xyes; then :
 
 
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lcif++" >&5
-$as_echo_n "checking for main in -lcif++... " >&6; }
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lcifpp" >&5
+$as_echo_n "checking for main in -lcifpp... " >&6; }
 if ${ac_cv_lib_cifpp_main+:} false; then :
 if ${ac_cv_lib_cifpp_main+:} false; then :
   $as_echo_n "(cached) " >&6
   $as_echo_n "(cached) " >&6
 else
 else
   ac_check_lib_save_LIBS=$LIBS
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcif++  $LIBS"
+LIBS="-lcifpp  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* end confdefs.h.  */
 
 
@@ -7271,7 +7271,7 @@ fi
 $as_echo "#define HAVE_CIFPP 1" >>confdefs.h
 $as_echo "#define HAVE_CIFPP 1" >>confdefs.h
 
 
 
 
-					 LIBS="-lcif++ $LIBS"
+					 LIBS="-lcifpp $LIBS"
 
 
 else
 else
   as_fn_error $? "libcif++ not found" "$LINENO" 5
   as_fn_error $? "libcif++ not found" "$LINENO" 5

configure.ac

@@ -52,9 +52,9 @@ AC_DEFINE_UNQUOTED([USE_RSRC], [$USE_RSRC], [Use mrc to store resources])
 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([--disable-revision], [Create a build number as revision])])
+	[AS_HELP_STRING([--enable-revision], [Create a build number as revision])])
 
 
-AS_IF([test "x$enable_revision" != "xno" ], [
+AS_IF([test "x$enable_revision" = "xyes" ], [
 	UPDATE_REVISION=1
 	UPDATE_REVISION=1
 ])
 ])
 
 
@@ -99,10 +99,10 @@ AC_ARG_WITH([cif++],
 				AC_MSG_ERROR(['${withval}'' is not a valid directory for --with-cif++])
 				AC_MSG_ERROR(['${withval}'' is not a valid directory for --with-cif++])
 			])
 			])
 			dnl AC_SUBST([CIFPP_CFLAGS], ["-I ${withval}/include"])
 			dnl AC_SUBST([CIFPP_CFLAGS], ["-I ${withval}/include"])
-			dnl AC_SUBST([CIFPP_LIBS], ["-L${withval}/.libs -lcif++"])
+			dnl AC_SUBST([CIFPP_LIBS], ["-L${withval}/.libs -lcifpp"])
 
 
 			CIFPP_CFLAGS="-I ${withval}/include"
 			CIFPP_CFLAGS="-I ${withval}/include"
-			CIFPP_LIBS="-L${withval}/.libs -lcif++"
+			CIFPP_LIBS="-L${withval}/.libs -lcifpp"
 			CIFPP_RSRC="${withval}/rsrc"
 			CIFPP_RSRC="${withval}/rsrc"
 
 
 			AC_SUBST([CIFPP_CFLAGS], [$CIFPP_CFLAGS])
 			AC_SUBST([CIFPP_CFLAGS], [$CIFPP_CFLAGS])
@@ -126,9 +126,9 @@ Can't find the libcif++ header, Config.hpp.  Make sure that it
 is installed, and either use the --with-cif++ option or install
 is installed, and either use the --with-cif++ option or install
 pkg-config.])])
 pkg-config.])])
 
 
-			AX_CHECK_LIBRARY([CIFPP], [cif++/Config.hpp], [cif++],
+			AX_CHECK_LIBRARY([CIFPP], [cif++/Config.hpp], [cifpp],
 				 [
 				 [
-					 LIBS="-lcif++ $LIBS"
+					 LIBS="-lcifpp $LIBS"
 				 ],
 				 ],
                  [AC_MSG_ERROR([libcif++ not found])])
                  [AC_MSG_ERROR([libcif++ not found])])
 	fi
 	fi

src/dssp.cpp

@@ -34,7 +34,6 @@
 #include <boost/format.hpp>
 #include <boost/format.hpp>
 #include <boost/date_time/gregorian/formatters.hpp>
 #include <boost/date_time/gregorian/formatters.hpp>
 
 
-#include <cif++/Config.hpp>
 #include <cif++/Structure.hpp>
 #include <cif++/Structure.hpp>
 #include <cif++/Secondary.hpp>
 #include <cif++/Secondary.hpp>
 #include <cif++/CifUtils.hpp>
 #include <cif++/CifUtils.hpp>