diff options
| -rw-r--r-- | Makefile.in | 10 | ||||
| -rwxr-xr-x | configure | 44 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/include/config.h.in | 3 | ||||
| -rw-r--r-- | src/libcf/Makefile.in | 4 |
5 files changed, 36 insertions, 29 deletions
diff --git a/Makefile.in b/Makefile.in index 6326389..56edd75 100644 --- a/Makefile.in +++ b/Makefile.in @@ -161,8 +161,8 @@ CTAGS = ctags CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in \ - $(top_srcdir)/src/include/config.h.in compile config.guess \ - config.sub depcomp install-sh ltmain.sh missing + $(top_srcdir)/src/include/config.h.in COPYING INSTALL compile \ + config.guess config.sub depcomp install-sh ltmain.sh missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -357,7 +357,7 @@ INCLUDE_FILES = \ src/include/slamac.h noinst_HEADERS = $(INCLUDE_FILES) -EXTRA_DIST = $(DATADIRS) +EXTRA_DIST = $(DATADIRS) contrib all: all-recursive .SUFFIXES: @@ -844,6 +844,10 @@ install-data-local: $(DATADIRS) mkdir -p $(DESTDIR)$(pkgdatadir) ; \ find $(DATADIRS) -type f | xargs -I{} install -D -m 644 {} $(DESTDIR)$(pkgdatadir)/{} +download-data: + ( cd $(srcdir) ; \ + contrib/download_data; ) + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: @@ -16177,19 +16177,6 @@ _ACEOF fi -for ac_header in fcntl.h limits.h malloc.h stddef.h stdlib.h string.h strings.h unistd.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - @@ -16319,12 +16306,12 @@ if test -n "$cfitsio_CFLAGS"; then pkg_cv_cfitsio_CFLAGS="$cfitsio_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cfitsio >= 3\""; } >&5 - ($PKG_CONFIG --exists --print-errors "cfitsio >= 3") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cfitsio >= 2.7\""; } >&5 + ($PKG_CONFIG --exists --print-errors "cfitsio >= 2.7") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_cfitsio_CFLAGS=`$PKG_CONFIG --cflags "cfitsio >= 3" 2>/dev/null` + pkg_cv_cfitsio_CFLAGS=`$PKG_CONFIG --cflags "cfitsio >= 2.7" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -16336,12 +16323,12 @@ if test -n "$cfitsio_LIBS"; then pkg_cv_cfitsio_LIBS="$cfitsio_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cfitsio >= 3\""; } >&5 - ($PKG_CONFIG --exists --print-errors "cfitsio >= 3") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cfitsio >= 2.7\""; } >&5 + ($PKG_CONFIG --exists --print-errors "cfitsio >= 2.7") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_cfitsio_LIBS=`$PKG_CONFIG --libs "cfitsio >= 3" 2>/dev/null` + pkg_cv_cfitsio_LIBS=`$PKG_CONFIG --libs "cfitsio >= 2.7" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -16362,14 +16349,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - cfitsio_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "cfitsio >= 3" 2>&1` + cfitsio_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "cfitsio >= 2.7" 2>&1` else - cfitsio_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "cfitsio >= 3" 2>&1` + cfitsio_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "cfitsio >= 2.7" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$cfitsio_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (cfitsio >= 3) were not met: + as_fn_error $? "Package requirements (cfitsio >= 2.7) were not met: $cfitsio_PKG_ERRORS @@ -16401,6 +16388,19 @@ else $as_echo "yes" >&6; } fi +for ac_header in fcntl.h limits.h malloc.h stddef.h stdlib.h string.h strings.h unistd.h fitsio.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + # Checks for typedefs, structures, and compiler characteristics. #AC_CHECK_HEADER_STDBOOL ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" diff --git a/configure.ac b/configure.ac index c2f3056..6c11be9 100644 --- a/configure.ac +++ b/configure.ac @@ -18,8 +18,8 @@ AC_PROG_LN_S # Checks for header files. AC_FUNC_ALLOCA -AC_CHECK_HEADERS([fcntl.h limits.h malloc.h stddef.h stdlib.h string.h strings.h unistd.h]) -PKG_CHECK_MODULES([cfitsio], [cfitsio >= 3]) +PKG_CHECK_MODULES([cfitsio], [cfitsio >= 2.7]) +AC_CHECK_HEADERS([fcntl.h limits.h malloc.h stddef.h stdlib.h string.h strings.h unistd.h fitsio.h]) # Checks for typedefs, structures, and compiler characteristics. #AC_CHECK_HEADER_STDBOOL AC_TYPE_SIZE_T diff --git a/src/include/config.h.in b/src/include/config.h.in index 9134e7f..1d6fab2 100644 --- a/src/include/config.h.in +++ b/src/include/config.h.in @@ -21,6 +21,9 @@ /* Define to 1 if you have the <fcntl.h> header file. */ #undef HAVE_FCNTL_H +/* Define to 1 if you have the <fitsio.h> header file. */ +#undef HAVE_FITSIO_H + /* Define to 1 if you have the `floor' function. */ #undef HAVE_FLOOR diff --git a/src/libcf/Makefile.in b/src/libcf/Makefile.in index 8f50d5c..3d7372d 100644 --- a/src/libcf/Makefile.in +++ b/src/libcf/Makefile.in @@ -132,7 +132,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = libcf_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - ../slalib/libslarandom.la + ../slalib/libslarandom.la ../slalib/libsla.la am_libcf_la_OBJECTS = libcf_la-calfits.lo libcf_la-sgp4.lo \ libcf_la-eclipse.lo libcf_la-saa.lo libcf_la-state_limb.lo \ libcf_la-state_geod.lo libcf_la-space_vel.lo \ @@ -411,7 +411,7 @@ libcf_la_SOURCES = \ libcf_la_LDFLAGS = -lm -lgfortran libcf_la_CFLAGS = $(cfitsio_CFLAGS) -I$(srcdir)/include -DCFORTRAN -Df2cFortran -libcf_la_LIBADD = $(cfitsio_LIBS) ../slalib/libslarandom.la +libcf_la_LIBADD = $(cfitsio_LIBS) ../slalib/libslarandom.la ../slalib/libsla.la all: all-am .SUFFIXES: |