Commit aa52c8bf authored by Emmanuel Bertin's avatar Emmanuel Bertin
Browse files

Added support for the INTEL MKL library in place of ATLAS and FFTW (configure --enable-mkl option). 

Updated LevMar library to V2.6.
Pushed version number to 2.18.0.
parent 1b190b55

Makefile.am

+4 −4
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#

#	This file part of:	SExtractor

#

#	Copyright:		(C) 2002-2010 Emmanuel Bertin -- IAP/CNRS/UPMC

#	Copyright:		(C) 2002-2012 Emmanuel Bertin -- IAP/CNRS/UPMC

#

#	License:		GNU General Public License

#
@@ -22,7 +22,7 @@ 
#	You should have received a copy of the GNU General Public License

#	along with SExtractor. If not, see <http://www.gnu.org/licenses/>.

#

#	Last modified:		11/10/2010

#	Last modified:		09/07/2012

#

#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -31,8 +31,8 @@ SUBDIRS = man src tests 
dist_pkgdata_DATA	= config/* xsl/sextractor.xsl

EXTRA_DIST		= doc AUTHORS BUGS ChangeLog COPYRIGHT HISTORY \

			  INSTALL LICENSE README THANKS \

			  acx_atlas.m4 acx_prog_cc_optim.m4 \

			  acx_urbi_resolve_dir.m4

			  acx_atlas.m4 acx_fftw.m4 acx_mkl.m4 \

			  acx_prog_cc_optim.m4 acx_urbi_resolve_dir.m4

RPM_ROOTDIR		= `rpmbuild --nobuild -E %_topdir`

RPM_SRCDIR		= $(RPM_ROOTDIR)/SOURCES

dist-hook:

Makefile.in

+187 −82
Original line number Diff line number Diff line 
# Makefile.in generated by automake 1.10.1 from Makefile.am.

# Makefile.in generated by automake 1.11.1 from Makefile.am.

# @configure_input@



# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.

# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,

# Inc.

# This Makefile.in is free software; the Free Software Foundation

# gives unlimited permission to copy and/or distribute it,

# with or without modifications, as long as this notice is preserved.
@@ -23,7 +24,7 @@ 
#

#	This file part of:	SExtractor

#

#	Copyright:		(C) 2002-2010 Emmanuel Bertin -- IAP/CNRS/UPMC

#	Copyright:		(C) 2002-2012 Emmanuel Bertin -- IAP/CNRS/UPMC

#

#	License:		GNU General Public License

#
@@ -38,14 +39,15 @@ 
#	You should have received a copy of the GNU General Public License

#	along with SExtractor. If not, see <http://www.gnu.org/licenses/>.

#

#	Last modified:		11/10/2010

#	Last modified:		09/07/2012

#

#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%



VPATH = @srcdir@

pkgdatadir = $(datadir)/@PACKAGE@

pkglibdir = $(libdir)/@PACKAGE@

pkgincludedir = $(includedir)/@PACKAGE@

pkglibdir = $(libdir)/@PACKAGE@

pkglibexecdir = $(libexecdir)/@PACKAGE@

am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

install_sh_DATA = $(install_sh) -c -m 644

install_sh_PROGRAM = $(install_sh) -c
@@ -70,7 +72,8 @@ DIST_COMMON = README $(am__configure_deps) $(dist_pkgdata_DATA) \ 
	autoconf/mkinstalldirs

ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

am__aclocal_m4_deps = $(top_srcdir)/acx_atlas.m4 \

	$(top_srcdir)/acx_fftw.m4 $(top_srcdir)/acx_prog_cc_optim.m4 \

	$(top_srcdir)/acx_fftw.m4 $(top_srcdir)/acx_mkl.m4 \

	$(top_srcdir)/acx_prog_cc_optim.m4 \

	$(top_srcdir)/acx_pthread.m4 \

	$(top_srcdir)/acx_urbi_resolve_dir.m4 \

	$(top_srcdir)/configure.ac
@@ -81,6 +84,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ 
mkinstalldirs = $(SHELL) $(top_srcdir)/autoconf/mkinstalldirs

CONFIG_HEADER = config.h

CONFIG_CLEAN_FILES = sextractor.spec

CONFIG_CLEAN_VPATH_FILES =

depcomp =

am__depfiles_maybe =

SOURCES =
@@ -97,12 +101,29 @@ am__vpath_adj = case $$p in \ 
    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \

    *) f=$$p;; \

  esac;

am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;

am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;

am__install_max = 40

am__nobase_strip_setup = \

  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`

am__nobase_strip = \

  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"

am__nobase_list = $(am__nobase_strip_setup); \

  for p in $$list; do echo "$$p $$p"; done | \

  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \

  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \

    if (++n[$$2] == $(am__install_max)) \

      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \

    END { for (dir in files) print dir, files[dir] }'

am__base_list = \

  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \

  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'

am__installdirs = "$(DESTDIR)$(pkgdatadir)"

dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)

DATA = $(dist_pkgdata_DATA)

RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\

  distclean-recursive maintainer-clean-recursive

AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \

	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \

	distdir dist dist-all distcheck

ETAGS = etags

CTAGS = ctags

DIST_SUBDIRS = $(SUBDIRS)
@@ -110,9 +131,34 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 
distdir = $(PACKAGE)-$(VERSION)

top_distdir = $(distdir)

am__remove_distdir = \

  { test ! -d $(distdir) \

    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \

         && rm -fr $(distdir); }; }

  { test ! -d "$(distdir)" \

    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \

         && rm -fr "$(distdir)"; }; }

am__relativize = \

  dir0=`pwd`; \

  sed_first='s,^\([^/]*\)/.*$$,\1,'; \

  sed_rest='s,^[^/]*/*,,'; \

  sed_last='s,^.*/\([^/]*\)$$,\1,'; \

  sed_butlast='s,/*[^/]*$$,,'; \

  while test -n "$$dir1"; do \

    first=`echo "$$dir1" | sed -e "$$sed_first"`; \

    if test "$$first" != "."; then \

      if test "$$first" = ".."; then \

        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \

        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \

      else \

        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \

        if test "$$first2" = "$$first"; then \

          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \

        else \

          dir2="../$$dir2"; \

        fi; \

        dir0="$$dir0"/"$$first"; \

      fi; \

    fi; \

    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \

  done; \

  reldir="$$dir2"

DIST_ARCHIVES = $(distdir).tar.gz

GZIP_ENV = --best

distuninstallcheck_listfiles = find . -type f -print
@@ -125,8 +171,8 @@ AM_LDFLAGS = @AM_LDFLAGS@ 
AR = @AR@

ATLAS_CFLAGS = @ATLAS_CFLAGS@

ATLAS_ERROR = @ATLAS_ERROR@

ATLAS_LIB = @ATLAS_LIB@

ATLAS_LIBPATH = @ATLAS_LIBPATH@

ATLAS_LIBS = @ATLAS_LIBS@

ATLAS_WARN = @ATLAS_WARN@

AUTOCONF = @AUTOCONF@

AUTOHEADER = @AUTOHEADER@
@@ -137,47 +183,56 @@ CCDEPMODE = @CCDEPMODE@ 
CFLAGS = @CFLAGS@

CPP = @CPP@

CPPFLAGS = @CPPFLAGS@

CXX = @CXX@

CXXCPP = @CXXCPP@

CXXDEPMODE = @CXXDEPMODE@

CXXFLAGS = @CXXFLAGS@

CYGPATH_W = @CYGPATH_W@

DATE2 = @DATE2@

DATE3 = @DATE3@

DEFS = @DEFS@

DEPDIR = @DEPDIR@

ECHO = @ECHO@

DLLTOOL = @DLLTOOL@

DSYMUTIL = @DSYMUTIL@

DUMPBIN = @DUMPBIN@

ECHO_C = @ECHO_C@

ECHO_N = @ECHO_N@

ECHO_T = @ECHO_T@

EGREP = @EGREP@

EXEEXT = @EXEEXT@

F77 = @F77@

FFLAGS = @FFLAGS@

FFTW_ERROR = @FFTW_ERROR@

FFTW_LIBS = @FFTW_LIBS@

FFTW_WARN = @FFTW_WARN@

FGREP = @FGREP@

GREP = @GREP@

INSTALL = @INSTALL@

INSTALL_DATA = @INSTALL_DATA@

INSTALL_PROGRAM = @INSTALL_PROGRAM@

INSTALL_SCRIPT = @INSTALL_SCRIPT@

INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

LD = @LD@

LDFLAGS = @LDFLAGS@

LIBOBJS = @LIBOBJS@

LIBS = @LIBS@

LIBTOOL = @LIBTOOL@

LIPO = @LIPO@

LN_S = @LN_S@

LTLIBOBJS = @LTLIBOBJS@

MAKEINFO = @MAKEINFO@

MANIFEST_TOOL = @MANIFEST_TOOL@

MKDIR_P = @MKDIR_P@

MKL_CFLAGS = @MKL_CFLAGS@

MKL_LIBS = @MKL_LIBS@

MKL_WARN = @MKL_WARN@

NM = @NM@

NMEDIT = @NMEDIT@

OBJDUMP = @OBJDUMP@

OBJEXT = @OBJEXT@

OTOOL = @OTOOL@

OTOOL64 = @OTOOL64@

PACKAGE = @PACKAGE@

PACKAGER = @PACKAGER@

PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@

PACKAGE_NAME = @PACKAGE_NAME@

PACKAGE_STRING = @PACKAGE_STRING@

PACKAGE_TARNAME = @PACKAGE_TARNAME@

PACKAGE_URL = @PACKAGE_URL@

PACKAGE_VERSION = @PACKAGE_VERSION@

PATH_SEPARATOR = @PATH_SEPARATOR@

PTHREAD_CC = @PTHREAD_CC@
@@ -193,9 +248,9 @@ abs_builddir = @abs_builddir@ 
abs_srcdir = @abs_srcdir@

abs_top_builddir = @abs_top_builddir@

abs_top_srcdir = @abs_top_srcdir@

ac_ct_AR = @ac_ct_AR@

ac_ct_CC = @ac_ct_CC@

ac_ct_CXX = @ac_ct_CXX@

ac_ct_F77 = @ac_ct_F77@

ac_ct_DUMPBIN = @ac_ct_DUMPBIN@

am__include = @am__include@

am__leading_dot = @am__leading_dot@

am__quote = @am__quote@
@@ -246,8 +301,8 @@ SUBDIRS = man src tests 
dist_pkgdata_DATA = config/* xsl/sextractor.xsl

EXTRA_DIST = doc AUTHORS BUGS ChangeLog COPYRIGHT HISTORY \

			  INSTALL LICENSE README THANKS \

			  acx_atlas.m4 acx_prog_cc_optim.m4 \

			  acx_urbi_resolve_dir.m4

			  acx_atlas.m4 acx_fftw.m4 acx_mkl.m4 \

			  acx_prog_cc_optim.m4 acx_urbi_resolve_dir.m4



RPM_ROOTDIR = `rpmbuild --nobuild -E %_topdir`

RPM_SRCDIR = $(RPM_ROOTDIR)/SOURCES
@@ -262,13 +317,13 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) 
	  case '$(am__configure_deps)' in \

	    *$$dep*) \

	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \

	      cd $(srcdir) && $(AUTOMAKE) --foreign  \

	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \

		&& exit 0; \

	      exit 1;; \

	  esac; \

	done; \

	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \

	cd $(top_srcdir) && \

	$(am__cd) $(top_srcdir) && \

	  $(AUTOMAKE) --foreign Makefile

.PRECIOUS: Makefile

Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -285,9 +340,10 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENC 
	$(SHELL) ./config.status --recheck



$(top_srcdir)/configure:  $(am__configure_deps)

	cd $(srcdir) && $(AUTOCONF)

	$(am__cd) $(srcdir) && $(AUTOCONF)

$(ACLOCAL_M4):  $(am__aclocal_m4_deps)

	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)

	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)

$(am__aclocal_m4_deps):



config.h: stamp-h1

	@if test ! -f $@; then \
@@ -299,7 +355,7 @@ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status 
	@rm -f stamp-h1

	cd $(top_builddir) && $(SHELL) ./config.status config.h

$(srcdir)/config.h.in:  $(am__configure_deps) 

	cd $(top_srcdir) && $(AUTOHEADER)

	($(am__cd) $(top_srcdir) && $(AUTOHEADER))

	rm -f stamp-h1

	touch $@
@@ -315,24 +371,27 @@ clean-libtool: 
	-rm -rf .libs _libs



distclean-libtool:

	-rm -f libtool

	-rm -f libtool config.lt

install-dist_pkgdataDATA: $(dist_pkgdata_DATA)

	@$(NORMAL_INSTALL)

	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"

	@list='$(dist_pkgdata_DATA)'; for p in $$list; do \

	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \

	for p in $$list; do \

	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

	  f=$(am__strip_dir) \

	  echo " $(dist_pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \

	  $(dist_pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \

	  echo "$$d$$p"; \

	done | $(am__base_list) | \

	while read files; do \

	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \

	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \

	done



uninstall-dist_pkgdataDATA:

	@$(NORMAL_UNINSTALL)

	@list='$(dist_pkgdata_DATA)'; for p in $$list; do \

	  f=$(am__strip_dir) \

	  echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \

	  rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \

	done

	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \

	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \

	test -n "$$files" || exit 0; \

	echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \

	cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files



# This directory's subdirectories are mostly independent; you can cd

# into them and run `make' without going through this Makefile.
@@ -341,7 +400,7 @@ uninstall-dist_pkgdataDATA: 
#     (which will cause the Makefiles to be regenerated when you run `make');

# (2) otherwise, pass the desired values on the `make' command line.

$(RECURSIVE_TARGETS):

	@failcom='exit 1'; \

	@fail= failcom='exit 1'; \

	for f in x $$MAKEFLAGS; do \

	  case $$f in \

	    *=* | --[!k]*);; \
@@ -358,7 +417,7 @@ $(RECURSIVE_TARGETS): 
	  else \

	    local_target="$$target"; \

	  fi; \

	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

	  || eval $$failcom; \

	done; \

	if test "$$dot_seen" = "no"; then \
@@ -366,7 +425,7 @@ $(RECURSIVE_TARGETS): 
	fi; test -z "$$fail"



$(RECURSIVE_CLEAN_TARGETS):

	@failcom='exit 1'; \

	@fail= failcom='exit 1'; \

	for f in x $$MAKEFLAGS; do \

	  case $$f in \

	    *=* | --[!k]*);; \
@@ -392,16 +451,16 @@ $(RECURSIVE_CLEAN_TARGETS): 
	  else \

	    local_target="$$target"; \

	  fi; \

	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

	  || eval $$failcom; \

	done && test -z "$$fail"

tags-recursive:

	list='$(SUBDIRS)'; for subdir in $$list; do \

	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \

	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \

	done

ctags-recursive:

	list='$(SUBDIRS)'; for subdir in $$list; do \

	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \

	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \

	done



ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -409,14 +468,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) 
	unique=`for i in $$list; do \

	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

	  done | \

	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \

	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \

	      END { if (nonempty) { for (i in files) print i; }; }'`; \

	mkid -fID $$unique

tags: TAGS



TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \

		$(TAGS_FILES) $(LISP)

	tags=; \

	set x; \

	here=`pwd`; \

	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \

	  include_option=--etags-include; \
@@ -428,7 +487,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ 
	list='$(SUBDIRS)'; for subdir in $$list; do \

	  if test "$$subdir" = .; then :; else \

	    test ! -f $$subdir/TAGS || \

	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \

	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \

	  fi; \

	done; \

	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
@@ -437,36 +496,41 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ 
	  done | \

	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \

	      END { if (nonempty) { for (i in files) print i; }; }'`; \

	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \

	shift; \

	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \

	  test -n "$$unique" || unique=$$empty_fix; \

	  if test $$# -gt 0; then \

	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

	    $$tags $$unique; \

	      "$$@" $$unique; \

	  else \

	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

	      $$unique; \

	  fi; \

	fi

ctags: CTAGS

CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \

		$(TAGS_FILES) $(LISP)

	tags=; \

	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \

	unique=`for i in $$list; do \

	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

	  done | \

	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \

	      END { if (nonempty) { for (i in files) print i; }; }'`; \

	test -z "$(CTAGS_ARGS)$$tags$$unique" \

	test -z "$(CTAGS_ARGS)$$unique" \

	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \

	     $$tags $$unique

	     $$unique



GTAGS:

	here=`$(am__cd) $(top_builddir) && pwd` \

	  && cd $(top_srcdir) \

	  && gtags -i $(GTAGS_ARGS) $$here

	  && $(am__cd) $(top_srcdir) \

	  && gtags -i $(GTAGS_ARGS) "$$here"



distclean-tags:

	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags



distdir: $(DISTFILES)

	$(am__remove_distdir)

	test -d $(distdir) || mkdir $(distdir)

	test -d "$(distdir)" || mkdir "$(distdir)"

	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \

	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \

	list='$(DISTFILES)'; \
@@ -482,29 +546,44 @@ distdir: $(DISTFILES) 
	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

	  if test -d $$d/$$file; then \

	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \

	    if test -d "$(distdir)/$$file"; then \

	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

	    fi; \

	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \

	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \

	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

	    fi; \

	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \

	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \

	  else \

	    test -f $(distdir)/$$file \

	    || cp -p $$d/$$file $(distdir)/$$file \

	    test -f "$(distdir)/$$file" \

	    || cp -p $$d/$$file "$(distdir)/$$file" \

	    || exit 1; \

	  fi; \

	done

	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

	  if test "$$subdir" = .; then :; else \

	    test -d "$(distdir)/$$subdir" \

	    || $(MKDIR_P) "$(distdir)/$$subdir" \

	    || exit 1; \

	    distdir=`$(am__cd) $(distdir) && pwd`; \

	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \

	    (cd $$subdir && \

	  fi; \

	done

	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

	  if test "$$subdir" = .; then :; else \

	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \

	    $(am__relativize); \

	    new_distdir=$$reldir; \

	    dir1=$$subdir; dir2="$(top_distdir)"; \

	    $(am__relativize); \

	    new_top_distdir=$$reldir; \

	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \

	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \

	    ($(am__cd) $$subdir && \

	      $(MAKE) $(AM_MAKEFLAGS) \

	        top_distdir="$$top_distdir" \

	        distdir="$$distdir/$$subdir" \

	        top_distdir="$$new_top_distdir" \

	        distdir="$$new_distdir" \

		am__remove_distdir=: \

		am__skip_length_check=: \

		am__skip_mode_fix=: \

	        distdir) \

	      || exit 1; \

	  fi; \
@@ -512,11 +591,13 @@ distdir: $(DISTFILES) 
	$(MAKE) $(AM_MAKEFLAGS) \

	  top_distdir="$(top_distdir)" distdir="$(distdir)" \

	  dist-hook

	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \

	-test -n "$(am__skip_mode_fix)" \

	|| find "$(distdir)" -type d ! -perm -755 \

		-exec chmod u+rwx,go+rx {} \; -o \

	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \

	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \

	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \

	|| chmod -R a+r $(distdir)

	|| chmod -R a+r "$(distdir)"

dist-gzip: distdir

	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz

	$(am__remove_distdir)
@@ -529,6 +610,10 @@ dist-lzma: distdir 
	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma

	$(am__remove_distdir)



dist-xz: distdir

	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz

	$(am__remove_distdir)



dist-tarZ: distdir

	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z

	$(am__remove_distdir)
@@ -552,15 +637,17 @@ dist dist-all: distdir 
distcheck: dist

	case '$(DIST_ARCHIVES)' in \

	*.tar.gz*) \

	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\

	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\

	*.tar.bz2*) \

	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\

	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\

	*.tar.lzma*) \

	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\

	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\

	*.tar.xz*) \

	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\

	*.tar.Z*) \

	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\

	*.shar.gz*) \

	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\

	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\

	*.zip*) \

	  unzip $(distdir).zip ;;\

	esac
@@ -568,9 +655,11 @@ distcheck: dist 
	mkdir $(distdir)/_build

	mkdir $(distdir)/_inst

	chmod a-w $(distdir)

	test -d $(distdir)/_build || exit 0; \

	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \

	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \

	  && cd $(distdir)/_build \

	  && am__cwd=`pwd` \

	  && $(am__cd) $(distdir)/_build \

	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \

	    $(DISTCHECK_CONFIGURE_FLAGS) \

	  && $(MAKE) $(AM_MAKEFLAGS) \
@@ -592,13 +681,15 @@ distcheck: dist 
	  && rm -rf "$$dc_destdir" \

	  && $(MAKE) $(AM_MAKEFLAGS) dist \

	  && rm -rf $(DIST_ARCHIVES) \

	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck

	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \

	  && cd "$$am__cwd" \

	  || exit 1

	$(am__remove_distdir)

	@(echo "$(distdir) archives ready for distribution: "; \

	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \

	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'

distuninstallcheck:

	@cd $(distuninstallcheck_dir) \

	@$(am__cd) '$(distuninstallcheck_dir)' \

	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \

	   || { echo "ERROR: files left after uninstall:" ; \

	        if test -n "$(DESTDIR)"; then \
@@ -643,6 +734,7 @@ clean-generic: 


distclean-generic:

	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)



maintainer-clean-generic:

	@echo "This command is intended for maintainers to use"
@@ -663,6 +755,8 @@ dvi-am: 


html: html-recursive



html-am:



info: info-recursive



info-am:
@@ -671,18 +765,28 @@ install-data-am: install-dist_pkgdataDATA 


install-dvi: install-dvi-recursive



install-dvi-am:



install-exec-am:



install-html: install-html-recursive



install-html-am:



install-info: install-info-recursive



install-info-am:



install-man:



install-pdf: install-pdf-recursive



install-pdf-am:



install-ps: install-ps-recursive



install-ps-am:



installcheck-am:



maintainer-clean: maintainer-clean-recursive
@@ -705,14 +809,14 @@ ps-am: 


uninstall-am: uninstall-dist_pkgdataDATA



.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \

	install-strip

.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \

	ctags-recursive install-am install-strip tags-recursive



.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \

	all all-am am--refresh check check-am clean clean-generic \

	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \

	dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-zip \

	distcheck distclean distclean-generic distclean-hdr \

	dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-xz \

	dist-zip distcheck distclean distclean-generic distclean-hdr \

	distclean-libtool distclean-tags distcleancheck distdir \

	distuninstallcheck dvi dvi-am html html-am info info-am \

	install install-am install-data install-data-am \
@@ -740,6 +844,7 @@ rpm-icc: dist 
rpm-best:	dist

	cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)

	USE_BEST="1" rpmbuild -ba --clean --nodeps $(PACKAGE_NAME).spec



# 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:

aclocal.m4

+6748 −4828

File changed.

File size exceeds preview limit.

View original file
View changed file

acx_atlas.m4

+8 −8
Original line number Diff line number Diff line
@@ -23,11 +23,11 @@ dnl You should have received a copy of the GNU General Public License 
dnl	along with AstrOmatic software.

dnl	If not, see <http://www.gnu.org/licenses/>.

dnl

dnl	Last modified:		10/10/2010

dnl	Last modified:		12/12/2011

dnl

dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

dnl

dnl @synopsis ACX_ATLAS([ATLAS_LIBDIR, ATLAS_INCDIR, ATLAS_PFLAG,

dnl @synopsis ACX_ATLAS([ATLAS_LIBSDIR, ATLAS_INCDIR, ATLAS_PFLAG,

dnl                     [ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]])

dnl You may wish to use these variables in your default LIBS:

dnl
@@ -218,24 +218,24 @@ dnl Check whether the multithreaded version of ATLAS is there too: 
    AC_CHECK_LIB(ptcblas, cblas_dgemm, [acx_atlast_ok=yes], [acx_atlast_ok=no],

	[$ATLAS_LIBPATH -lcblas -latlas -lm])

    if test x$acx_atlast_ok = xyes; then

      ATLAS_LIB="$ATLAS_LIBPATH -llapack -lptcblas -lcblas -latlas"

      ATLAS_LIBS="$ATLAS_LIBPATH -llapack -lptcblas -lcblas -latlas"

      LIBS="$OLIBS"

      AC_SUBST(ATLAS_LIB)

      AC_SUBST(ATLAS_LIBS)

      AC_DEFINE(HAVE_ATLAS_MP,1,

	[Define if you have the parallel ATLAS libraries.])

      $4

    else

      ATLAS_LIB="$ATLAS_LIBPATH -llapack -lcblas -latlas"

      ATLAS_LIBS="$ATLAS_LIBPATH -llapack -lcblas -latlas"

      LIBS="$OLIBS"

      AC_SUBST(ATLAS_LIB)

      AC_SUBST(ATLAS_LIBS)

      ATLAS_WARN="CBLAS/LAPack was compiled without multithreading support!"

      AC_SUBST(ATLAS_WARN)

      $4         

    fi

  else

    ATLAS_LIB="$ATLAS_LIBPATH -llapack -lcblas -latlas"

    ATLAS_LIBS="$ATLAS_LIBPATH -llapack -lcblas -latlas"

    LIBS="$OLIBS"

    AC_SUBST(ATLAS_LIB)

    AC_SUBST(ATLAS_LIBS)

    $4

  fi

else

acx_mkl.m4

0 → 100644
+79 −0
Original line number Diff line number Diff line 
dnl

dnl				acx_mkl.m4

dnl

dnl Set up options for using the INTEL MKL library.

dnl

dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

dnl

dnl	This file part of:	AstrOmatic software

dnl

dnl	Copyright:		(C) 2003-2012 Emmanuel Bertin -- IAP/CNRS/UPMC

dnl

dnl	License:		GNU General Public License

dnl

dnl	AstrOmatic software is free software: you can redistribute it and/or

dnl	modify it under the terms of the GNU General Public License as

dnl	published by the Free Software Foundation, either version 3 of the

dnl	License, or (at your option) any later version.

dnl	AstrOmatic software is distributed in the hope that it will be useful,

dnl	but WITHOUT ANY WARRANTY; without even the implied warranty of

dnl	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

dnl	GNU General Public License for more details.

dnl	You should have received a copy of the GNU General Public License

dnl	along with AstrOmatic software.

dnl	If not, see <http://www.gnu.org/licenses/>.

dnl

dnl	Last modified:		09/07/2012

dnl

dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

dnl

dnl @synopsis ACX_MKL()

dnl

dnl You may wish to use these variables in your default LIBS:

dnl

dnl        LIBS="$MKL_LIBS $LIBS"

dnl

dnl You may wish to use these variables in your default CFLAGS:

dnl

dnl        CFLAGS="$CFLAGS $MKL_CFLAGS"

dnl



AC_DEFUN([ACX_MKL], [

AC_REQUIRE([AC_CANONICAL_HOST])



dnl ----------------------

dnl Set architecture flags

dnl ----------------------



dnl Try to find INTEL architecture (Intel 64 or ia32)

if icc -V 2>&1 | grep -i "Intel(R) 64" > /dev/null 2>&1; then

  AC_SUBST(MKL_CFLAGS, "-DMKL_ILP64")

  AC_SUBST(MKL_LIBS, "-mkl")

elif icc -V 2>&1 | grep -i "Intel(R)" > /dev/null 2>&1; then

  AC_SUBST(MKL_CFLAGS, "")

  AC_SUBST(MKL_LIBS, "-mkl")

else

  AC_SUBST(MKL_CFLAGS, "")

  AC_SUBST(MKL_LIBS, "")

  MKL_WARN="INTEL compiler not detected"

  AC_SUBST(MKL_WARN)

fi



dnl --------------------

dnl Set internal flags

dnl --------------------



AC_DEFINE(HAVE_FFTW,1, [Define if you have the FFTW libraries.])

AC_DEFINE(HAVE_LAPACK,1, [Define if you have the LAPACK libraries.])

AC_DEFINE(HAVE_LAPACKE,1, [Define if you have the LAPACKe libraries.])



dnl --------------------

dnl Set include files

dnl --------------------



AC_DEFINE_UNQUOTED(FFTW_H, "fftw/fftw3_mkl.h", [FFTW header filename.])

AC_DEFINE_UNQUOTED(LAPACK_H, "mkl_lapack.h", [LAPACK header filename.])

AC_DEFINE_UNQUOTED(LAPACKE_H, "mkl_lapacke.h", [LAPACKe header filename.])





])dnl ACX_MKL