disable download ccd in configure, for travis

.travis.yml

@@ -22,7 +22,7 @@ before_install:
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install make; fi
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install make; fi
 
 
 script:
 script:
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then ./configure --disable-shared --disable-revision ; else ./configure --disable-revision     ; fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then ./configure --disable-shared --disable-revision --disable-download-ccd ; else ./configure --disable-revision --disable-download-ccd ; fi
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then gmake                        ; else make             ; fi
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then gmake                        ; else make             ; fi
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then gmake test                   ; else make test        ; fi
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then gmake test                   ; else make test        ; fi
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then sudo gmake install           ; else sudo make install; fi
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then sudo gmake install           ; else sudo make install; fi

GNUmakefile.in

@@ -70,6 +70,12 @@ LIB_TARGET			= $(LIB_NAME).la
 VERSION             = @LIBCIF_SEMANTIC_VERSION@
 VERSION             = @LIBCIF_SEMANTIC_VERSION@
 DIST_NAME           = @PACKAGE_NAME@-$(subst :,.,$(VERSION))
 DIST_NAME           = @PACKAGE_NAME@-$(subst :,.,$(VERSION))
 
 
+SKIP_DOWNLOAD_CCD	= @SKIP_DOWNLOAD_CCD@
+
+ifneq "$(SKIP_DOWNLOAD_CCD)" "1"
+COMPONENTS_CIF		= components.cif
+endif
+
 # libtool stuff
 # libtool stuff
 
 
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
@@ -137,12 +143,14 @@ $(OBJDIR)/Symmetry.lo: src/SymOpTable_data.cpp
 
 
 endif
 endif
 
 
+ifneq "$(COMPONENTS_CIF)" ""
 data/components.cif.gz:
 data/components.cif.gz:
 	mkdir -p data
 	mkdir -p data
 	wget -O $@ ftp://ftp.wwpdb.org/pub/pdb/data/monomers/components.cif.gz
 	wget -O $@ ftp://ftp.wwpdb.org/pub/pdb/data/monomers/components.cif.gz
 
 
 data/components.cif: data/components.cif.gz
 data/components.cif: data/components.cif.gz
 	gunzip -c $^ > $@
 	gunzip -c $^ > $@
+endif
 
 
 # We have development releases and official releases, for each we
 # We have development releases and official releases, for each we
 # maintain different versioning schemes.
 # maintain different versioning schemes.
@@ -255,8 +263,22 @@ HEADERS = \
 	Secondary.hpp \
 	Secondary.hpp \
 	TlsParser.hpp
 	TlsParser.hpp
 
 
-.PHONY: install
-install: lib data/components.cif.gz
+.PHONY: install-data
+
+ifneq "$(COMPONENTS_CIF)" ""
+
+install-data: data/components.cif.gz
+	install -d $(datadir)/libcifpp
+	install -m644 data/components.cif.gz $(datadir)/libcifpp/
+
+else
+
+install-data:
+
+endif
+
+.PHONY: install-lib
+install: install-lib
 	install -d $(libdir)
 	install -d $(libdir)
 	$(LIBTOOL) --mode=install install $(LIB_TARGET) $(libdir)
 	$(LIBTOOL) --mode=install install $(LIB_TARGET) $(libdir)
 	install -d $(datadir)/libcifpp
 	install -d $(datadir)/libcifpp
@@ -266,7 +288,6 @@ install: lib data/components.cif.gz
 		install -m644 rsrc/$$d $(datadir)/libcifpp; \
 		install -m644 rsrc/$$d $(datadir)/libcifpp; \
 		gzip -f $(datadir)/libcifpp/$$d; \
 		gzip -f $(datadir)/libcifpp/$$d; \
 	done
 	done
-	install -m644 data/components.cif.gz $(datadir)/libcifpp/
 	install -d $(CACHE_DIR)
 	install -d $(CACHE_DIR)
 	install -d $(CRON_DIR)
 	install -d $(CRON_DIR)
 	if [ ! -f /etc/libcifpp.conf ] ; then \
 	if [ ! -f /etc/libcifpp.conf ] ; then \
@@ -282,6 +303,9 @@ install: lib data/components.cif.gz
 	install -d $(pkgconfigdir)
 	install -d $(pkgconfigdir)
 	install -m 644 $(LIB_NAME).pc $(pkgconfigdir)/$(LIB_NAME).pc
 	install -m 644 $(LIB_NAME).pc $(pkgconfigdir)/$(LIB_NAME).pc
 
 
+.PHONY: install
+install: install-lib install-data
+
 dist-clean: clean
 dist-clean: clean
 
 
 .PHONY: dist
 .PHONY: dist

configure

@@ -643,6 +643,7 @@ BOOST_IOSTREAMS_LIB
 BOOST_LDFLAGS
 BOOST_LDFLAGS
 BOOST_CPPFLAGS
 BOOST_CPPFLAGS
 SET_MAKE
 SET_MAKE
+SKIP_DOWNLOAD_CCD
 UPDATE_REVISION
 UPDATE_REVISION
 USE_RSRC
 USE_RSRC
 MRC
 MRC
@@ -759,6 +760,7 @@ with_sysroot
 enable_libtool_lock
 enable_libtool_lock
 enable_resources
 enable_resources
 enable_revision
 enable_revision
+enable_download_ccd
 with_boost
 with_boost
 with_boost_libdir
 with_boost_libdir
 with_boost_iostreams
 with_boost_iostreams
@@ -1418,6 +1420,8 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --disable-resources     Do not use mrc to store data in resources
   --disable-resources     Do not use mrc to store data in resources
   --disable-revision      Create a build number as revision
   --disable-revision      Create a build number as revision
+  --disable-download-ccd  Do not try to download a CCD components.cif file
+                          during build
 
 
 Optional Packages:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -17204,6 +17208,21 @@ fi
 UPDATE_REVISION=$UPDATE_REVISION
 UPDATE_REVISION=$UPDATE_REVISION
 
 
 
 
+# Check whether --enable-download-ccd was given.
+if test "${enable_download_ccd+set}" = set; then :
+  enableval=$enable_download_ccd;
+fi
+
+
+if test "x$enable_download_ccd" = "xno" ; then :
+
+	SKIP_DOWNLOAD_CCD=1
+
+fi
+
+SKIP_DOWNLOAD_CCD=$SKIP_DOWNLOAD_CCD
+
+
 
 
 	ac_fn_cxx_check_header_mongrel "$LINENO" "filesystem" "ac_cv_header_filesystem" "$ac_includes_default"
 	ac_fn_cxx_check_header_mongrel "$LINENO" "filesystem" "ac_cv_header_filesystem" "$ac_includes_default"
 if test "x$ac_cv_header_filesystem" = xyes; then :
 if test "x$ac_cv_header_filesystem" = xyes; then :

configure.ac

@@ -68,6 +68,17 @@ AS_IF([test "x$enable_revision" != "xno" ], [
 
 
 AC_SUBST([UPDATE_REVISION], [$UPDATE_REVISION])
 AC_SUBST([UPDATE_REVISION], [$UPDATE_REVISION])
 
 
+dnl Do not download CCD components file during make (for travis, won't work)
+AC_ARG_ENABLE(
+	download-ccd,
+	[AS_HELP_STRING([--disable-download-ccd], [Do not try to download a CCD components.cif file during build])])
+
+AS_IF([test "x$enable_download_ccd" != "xno" ], [
+	SKIP_DOWNLOAD_CCD=1
+])
+
+AC_SUBST([SKIP_DOWNLOAD_CCD], [$SKIP_DOWNLOAD_CCD])
+
 AX_FILESYSTEM
 AX_FILESYSTEM
 
 
 AC_CHECK_FUNCS([floor pow rint sqrt strchr strerror])
 AC_CHECK_FUNCS([floor pow rint sqrt strchr strerror])