Added support for Gaussian priors on (transformed) model parameters (deactivated). (f8fe9609) · Commits · csst-pipeline / msc / sextractor

Makefile.in

+151 −98

Original line number	Diff line number	Diff line
		# Makefile.in generated by automake 1.11.1 from Makefile.am.
		# Makefile.in generated by automake 1.12.2 from Makefile.am.
		# @configure_input@

		# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
		# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
		# Inc.
		# Copyright (C) 1994-2012 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.
		@@ -44,6 +43,23 @@
		#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

		VPATH = @srcdir@
		am__make_dryrun = \
		{ \
		am__dry=no; \
		case $$MAKEFLAGS in \
		\\[\ \ ]) \
		echo 'am--echo: ; @echo "AM" OK' \| $(MAKE) -f - 2>/dev/null \
		\| grep '^AM OK$$' >/dev/null \|\| am__dry=yes;; \
		*) \
		for am__flg in $$MAKEFLAGS; do \
		case $$am__flg in \
		=\|--*) ;; \
		n) am__dry=yes; break;; \
		esac; \
		done;; \
		esac; \
		test $$am__dry = yes; \
		}
		pkgdatadir = $(datadir)/@PACKAGE@
		pkgincludedir = $(includedir)/@PACKAGE@
		pkglibdir = $(libdir)/@PACKAGE@
		@@ -66,10 +82,15 @@ subdir = .
		DIST_COMMON = README $(am__configure_deps) $(dist_pkgdata_DATA) \
		$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
		$(srcdir)/config.h.in $(srcdir)/sextractor.spec.in \
		$(top_srcdir)/configure AUTHORS ChangeLog INSTALL THANKS \
		autoconf/config.guess autoconf/config.sub autoconf/depcomp \
		autoconf/install-sh autoconf/ltmain.sh autoconf/missing \
		autoconf/mkinstalldirs
		$(top_srcdir)/autoconf/config.guess \
		$(top_srcdir)/autoconf/config.sub \
		$(top_srcdir)/autoconf/install-sh \
		$(top_srcdir)/autoconf/ltmain.sh \
		$(top_srcdir)/autoconf/missing \
		$(top_srcdir)/autoconf/mkinstalldirs $(top_srcdir)/configure \
		AUTHORS ChangeLog INSTALL THANKS autoconf/config.guess \
		autoconf/config.sub autoconf/depcomp autoconf/install-sh \
		autoconf/ltmain.sh autoconf/missing 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_mkl.m4 \
		@@ -96,6 +117,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
		install-pdf-recursive install-ps-recursive install-recursive \
		installcheck-recursive installdirs-recursive pdf-recursive \
		ps-recursive uninstall-recursive
		am__can_run_installinfo = \
		case $$AM_UPDATE_INFO_DIR in \
		n\|no\|NO) false;; \
		*) (install-info --version) >/dev/null 2>&1;; \
		esac
		am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" \| sed 's\|.\|.\|g'`;
		am__vpath_adj = case $$p in \
		$(srcdir)/*) f=`echo "$$p" \| sed "s\|^$$srcdirstrip/\|\|"`;; \
		@@ -117,23 +143,33 @@ am__nobase_list = $(am__nobase_strip_setup); \
		am__base_list = \
		sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' \| \
		sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
		am__uninstall_files_from_dir = { \
		test -z "$$files" \
		\|\| { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
		\|\| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
		$(am__cd) "$$dir" && rm -f $$files; }; \
		}
		am__installdirs = "$(DESTDIR)$(pkgdatadir)"
		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
		cscope distdir dist dist-all distcheck
		ETAGS = etags
		CTAGS = ctags
		CSCOPE = cscope
		DIST_SUBDIRS = $(SUBDIRS)
		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)"; }; }
		if test -d "$(distdir)"; then \
		find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
		&& rm -rf "$(distdir)" \
		\|\| { sleep 5 && rm -rf "$(distdir)"; }; \
		else :; fi
		am__post_remove_distdir = $(am__remove_distdir)
		am__relativize = \
		dir0=`pwd`; \
		sed_first='s,^$[^/]$/.$$,\1,'; \
		@@ -161,7 +197,10 @@ am__relativize = \
		reldir="$$dir2"
		DIST_ARCHIVES = $(distdir).tar.gz
		GZIP_ENV = --best
		DIST_TARGETS = dist-gzip
		distuninstallcheck_listfiles = find . -type f -print
		am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
		\| sed 's\|^\./\|$(prefix)/\|' \| grep -v '$(infodir)/dir$$'
		distcleancheck_listfiles = find . -type f -print
		ACLOCAL = @ACLOCAL@
		AMTAR = @AMTAR@
		@@ -218,6 +257,7 @@ MAKEINFO = @MAKEINFO@
		MANIFEST_TOOL = @MANIFEST_TOOL@
		MKDIR_P = @MKDIR_P@
		MKL_CFLAGS = @MKL_CFLAGS@
		MKL_LDFLAGS = @MKL_LDFLAGS@
		MKL_LIBS = @MKL_LIBS@
		MKL_WARN = @MKL_WARN@
		NM = @NM@
		@@ -310,7 +350,7 @@ all: config.h
		$(MAKE) $(AM_MAKEFLAGS) all-recursive

		.SUFFIXES:
		am--refresh:
		am--refresh: Makefile
		@:
		$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
		@for dep in $?; do \
		@@ -346,10 +386,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
		$(am__aclocal_m4_deps):

		config.h: stamp-h1
		@if test ! -f $@; then \
		rm -f stamp-h1; \
		$(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
		else :; fi
		@if test ! -f $@; then rm -f stamp-h1; else :; fi
		@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi

		stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
		@rm -f stamp-h1
		@@ -374,8 +412,11 @@ distclean-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)'; test -n "$(pkgdatadir)" \|\| list=; \
		if test -n "$$list"; then \
		echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
		$(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" \|\| exit 1; \
		fi; \
		for p in $$list; do \
		if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
		echo "$$d$$p"; \
		@@ -389,17 +430,15 @@ uninstall-dist_pkgdataDATA:
		@$(NORMAL_UNINSTALL)
		@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
		dir='$(DESTDIR)$(pkgdatadir)'; $(am__uninstall_files_from_dir)

		# This directory's subdirectories are mostly independent; you can cd
		# into them and run `make' without going through this Makefile.
		# To change the values of `make' variables: instead of editing Makefiles,
		# (1) if the variable is set in `config.status', edit `config.status'
		# (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):
		# into them and run 'make' without going through this Makefile.
		# To change the values of 'make' variables: instead of editing Makefiles,
		# (1) if the variable is set in 'config.status', edit 'config.status'
		# (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) $(RECURSIVE_CLEAN_TARGETS):
		@fail= failcom='exit 1'; \
		for f in x $$MAKEFLAGS; do \
		case $$f in \
		@@ -409,7 +448,11 @@ $(RECURSIVE_TARGETS):
		done; \
		dot_seen=no; \
		target=`echo $@ \| sed s/-recursive//`; \
		list='$(SUBDIRS)'; for subdir in $$list; do \
		case "$@" in \
		distclean-* \| maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
		*) list='$(SUBDIRS)' ;; \
		esac; \
		for subdir in $$list; do \
		echo "Making $$target in $$subdir"; \
		if test "$$subdir" = "."; then \
		dot_seen=yes; \
		@@ -423,37 +466,6 @@ $(RECURSIVE_TARGETS):
		if test "$$dot_seen" = "no"; then \
		$(MAKE) $(AM_MAKEFLAGS) "$$target-am" \|\| exit 1; \
		fi; test -z "$$fail"

		$(RECURSIVE_CLEAN_TARGETS):
		@fail= failcom='exit 1'; \
		for f in x $$MAKEFLAGS; do \
		case $$f in \
		= \| --[!k]*);; \
		k) failcom='fail=yes';; \
		esac; \
		done; \
		dot_seen=no; \
		case "$@" in \
		distclean-* \| maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
		*) list='$(SUBDIRS)' ;; \
		esac; \
		rev=''; for subdir in $$list; do \
		if test "$$subdir" = "."; then :; else \
		rev="$$subdir $$rev"; \
		fi; \
		done; \
		rev="$$rev ."; \
		target=`echo $@ \| sed s/-recursive//`; \
		for subdir in $$rev; do \
		echo "Making $$target in $$subdir"; \
		if test "$$subdir" = "."; then \
		local_target="$$target-am"; \
		else \
		local_target="$$target"; \
		fi; \
		($(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" = . \|\| ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
		@@ -462,6 +474,10 @@ ctags-recursive:
		list='$(SUBDIRS)'; for subdir in $$list; do \
		test "$$subdir" = . \|\| ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
		done
		cscopelist-recursive:
		list='$(SUBDIRS)'; for subdir in $$list; do \
		test "$$subdir" = . \|\| ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \
		done

		ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
		list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
		@@ -525,8 +541,32 @@ GTAGS:
		&& $(am__cd) $(top_srcdir) \
		&& gtags -i $(GTAGS_ARGS) "$$here"

		cscope: cscope.files
		test ! -s cscope.files \
		\|\| $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)

		clean-cscope:
		-rm -f cscope.files

		cscope.files: clean-cscope cscopelist-recursive cscopelist

		cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP)
		list='$(SOURCES) $(HEADERS) $(LISP)'; \
		case "$(srcdir)" in \
		[\\/]* \| ?:[\\/]*) sdir="$(srcdir)" ;; \
		*) sdir=$(subdir)/$(srcdir) ;; \
		esac; \
		for i in $$list; do \
		if test -f "$$i"; then \
		echo "$(subdir)/$$i"; \
		else \
		echo "$$sdir/$$i"; \
		fi; \
		done >> $(top_builddir)/cscope.files

		distclean-tags:
		-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
		-rm -f cscope.out cscope.in.out cscope.po.out cscope.files

		distdir: $(DISTFILES)
		$(am__remove_distdir)
		@@ -562,13 +602,10 @@ distdir: $(DISTFILES)
		done
		@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
		if test "$$subdir" = .; then :; else \
		test -d "$(distdir)/$$subdir" \
		$(am__make_dryrun) \
		\|\| test -d "$(distdir)/$$subdir" \
		\|\| $(MKDIR_P) "$(distdir)/$$subdir" \
		\|\| exit 1; \
		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; \
		@@ -600,36 +637,36 @@ distdir: $(DISTFILES)
		\|\| chmod -R a+r "$(distdir)"
		dist-gzip: distdir
		tardir=$(distdir) && $(am__tar) \| GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
		$(am__remove_distdir)
		$(am__post_remove_distdir)

		dist-bzip2: distdir
		tardir=$(distdir) && $(am__tar) \| bzip2 -9 -c >$(distdir).tar.bz2
		$(am__remove_distdir)
		tardir=$(distdir) && $(am__tar) \| BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
		$(am__post_remove_distdir)

		dist-lzma: distdir
		tardir=$(distdir) && $(am__tar) \| lzma -9 -c >$(distdir).tar.lzma
		$(am__remove_distdir)
		dist-lzip: distdir
		tardir=$(distdir) && $(am__tar) \| lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
		$(am__post_remove_distdir)

		dist-xz: distdir
		tardir=$(distdir) && $(am__tar) \| xz -c >$(distdir).tar.xz
		$(am__remove_distdir)
		tardir=$(distdir) && $(am__tar) \| XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
		$(am__post_remove_distdir)

		dist-tarZ: distdir
		tardir=$(distdir) && $(am__tar) \| compress -c >$(distdir).tar.Z
		$(am__remove_distdir)
		$(am__post_remove_distdir)

		dist-shar: distdir
		shar $(distdir) \| GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
		$(am__remove_distdir)
		$(am__post_remove_distdir)

		dist-zip: distdir
		-rm -f $(distdir).zip
		zip -rq $(distdir).zip $(distdir)
		$(am__remove_distdir)
		$(am__post_remove_distdir)

		dist dist-all: distdir
		tardir=$(distdir) && $(am__tar) \| GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
		$(am__remove_distdir)
		dist dist-all:
		$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
		$(am__post_remove_distdir)

		# This target untars the dist file and tries a VPATH configuration. Then
		# it guarantees that the distribution is self-contained by making another
		@@ -640,8 +677,8 @@ distcheck: dist
		GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz \| $(am__untar) ;;\
		.tar.bz2) \
		bzip2 -dc $(distdir).tar.bz2 \| $(am__untar) ;;\
		.tar.lzma) \
		lzma -dc $(distdir).tar.lzma \| $(am__untar) ;;\
		.tar.lz) \
		lzip -dc $(distdir).tar.lz \| $(am__untar) ;;\
		.tar.xz) \
		xz -dc $(distdir).tar.xz \| $(am__untar) ;;\
		.tar.Z) \
		@@ -651,7 +688,7 @@ distcheck: dist
		.zip) \
		unzip $(distdir).zip ;;\
		esac
		chmod -R a-w $(distdir); chmod a+w $(distdir)
		chmod -R a-w $(distdir); chmod u+w $(distdir)
		mkdir $(distdir)/_build
		mkdir $(distdir)/_inst
		chmod a-w $(distdir)
		@@ -661,6 +698,7 @@ distcheck: dist
		&& am__cwd=`pwd` \
		&& $(am__cd) $(distdir)/_build \
		&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
		$(AM_DISTCHECK_CONFIGURE_FLAGS) \
		$(DISTCHECK_CONFIGURE_FLAGS) \
		&& $(MAKE) $(AM_MAKEFLAGS) \
		&& $(MAKE) $(AM_MAKEFLAGS) dvi \
		@@ -684,13 +722,21 @@ distcheck: dist
		&& $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
		&& cd "$$am__cwd" \
		\|\| exit 1
		$(am__remove_distdir)
		$(am__post_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:
		@$(am__cd) '$(distuninstallcheck_dir)' \
		&& test `$(distuninstallcheck_listfiles) \| wc -l` -le 1 \
		@test -n '$(distuninstallcheck_dir)' \|\| { \
		echo 'ERROR: trying to run $@ with an empty' \
		'$$(distuninstallcheck_dir)' >&2; \
		exit 1; \
		}; \
		$(am__cd) '$(distuninstallcheck_dir)' \|\| { \
		echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
		exit 1; \
		}; \
		test `$(am__distuninstallcheck_listfiles) \| wc -l` -eq 0 \
		\|\| { echo "ERROR: files left after uninstall:" ; \
		if test -n "$(DESTDIR)"; then \
		echo " (check DESTDIR support)"; \
		@@ -724,10 +770,15 @@ install-am: all-am

		installcheck: installcheck-recursive
		install-strip:
		if test -z '$(STRIP)'; then \
		$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
		install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
		`test -z '$(STRIP)' \|\| \
		echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
		install; \
		else \
		$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
		install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
		"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
		fi
		mostlyclean-generic:

		clean-generic:
		@@ -810,16 +861,18 @@ ps-am:
		uninstall-am: uninstall-dist_pkgdataDATA

		.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
		ctags-recursive install-am install-strip tags-recursive
		cscopelist-recursive 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-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 \
		all all-am am--refresh check check-am clean clean-cscope \
		clean-generic clean-libtool cscope cscopelist \
		cscopelist-recursive ctags ctags-recursive dist dist-all \
		dist-bzip2 dist-gzip dist-hook dist-lzip 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 \
		install-dist_pkgdataDATA install-dvi install-dvi-am \
		install-exec install-exec-am install-html install-html-am \
		install-info install-info-am install-man install-pdf \

aclocal.m4

+411 −229

File changed.

Preview size limit exceeded, changes collapsed.

acx_mkl.m4

+91 −20

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@ dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
		dnl
		dnl This file part of: AstrOmatic software
		dnl
		dnl Copyright: (C) 2003-2012 Emmanuel Bertin -- IAP/CNRS/UPMC
		dnl Copyright: (C) 2003-2013 Emmanuel Bertin -- IAP/CNRS/UPMC
		dnl
		dnl License: GNU General Public License
		dnl
		@@ -23,42 +23,113 @@ 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: 11/07/2012
		dnl Last modified: 03/04/2013
		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 @synopsis ACX_MKL([MKL_DIR, ILP64_FLAG, STATIC_FLAG, CONV_LIBS])
		dnl
		dnl This macro sets the MKL_CFLAGS, MKL_LDFLAGS and MKL_LIBS variables to
		dnl for compiling and linking with INTEL's MKL. A coma-separated list of
		dnl convenience libraries may be included in the linked group for static linking.
		dnl You may wish to use these variables in your default CFLAGS:
		dnl
		dnl CFLAGS="$CFLAGS $MKL_CFLAGS"
		dnl
		dnl You may wish to use these variables in your default LDFLAGS:
		dnl
		dnl LDFLAGS="$LDFLAGS $MKL_LDLAGS"
		dnl
		dnl You may wish to use these variables in your default LIBS:
		dnl
		dnl LIBS="$LIBS $MKL_LIBS"
		dnl

		AC_DEFUN([ACX_MKL], [
		AC_REQUIRE([AC_CANONICAL_HOST])

		dnl ------------------------
		dnl Set MKL's root directory
		dnl ------------------------

		if test x$1 = x; then
		mklroot=${MKLROOT}
		else
		mklroot=$1
		fi

		dnl -----------------------------
		dnl Include convenience libraries
		dnl -----------------------------

		if test x$4 = x; then
		startgroup="-Wl,--start-group"
		else
		startgroup="-Wl,--start-group,$4"
		fi

		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
		dnl INTEL compiler uses x86_64 architecture
		if test x$2 = xyes; then
		dnl 64 bit pointers
		AC_SUBST(MKL_CFLAGS, "-DMKL_ILP64")
		AC_SUBST(MKL_LIBS, "-mkl")
		if test x$3 = xyes; then
		dnl Static linking uses a duplicated libmkl_intel_ilp64.a to fool libtool
		AC_SUBST(MKL_LIBS,
		["$startgroup,$mklroot/lib/intel64/libmkl_intel_ilp64.a,\
		$mklroot/lib/intel64/libmkl_intel_thread.a \
		$mklroot/lib/intel64/libmkl_core.a --end-group -openmp -lpthread -lm"])
		else
		AC_SUBST(MKL_LIBS, "-lmkl_intel_ilp64 -lmkl_intel_thread -lmkl_core \
		-openmp -lpthread -lm")
		fi
		else
		dnl 32 bit pointers
		AC_SUBST(MKL_CFLAGS, "")
		if test x$3 = xyes; then
		dnl Static linking uses a duplicated libmkl_intel.a to fool libtool
		AC_SUBST(MKL_LIBS,
		["$startgroup,$mklroot/lib/intel64/libmkl_intel_lp64.a,\
		$mklroot/lib/intel64/libmkl_intel_thread.a,\
		$mklroot/lib/intel64/libmkl_core.a,--end-group -openmp -lpthread -lm"])
		else
		dnl Dynamic linking
		AC_SUBST(MKL_LIBS, "-lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core \
		-openmp -lpthread -lm")
		fi
		fi

		elif icc -V 2>&1 \| grep -i "Intel(R)" > /dev/null 2>&1; then
		dnl INTEL compiler uses IA32 architecture
		AC_SUBST(MKL_CFLAGS, "")
		AC_SUBST(MKL_LIBS, "-mkl")
		if test x$3 = xyes; then
		dnl Static linking uses a duplicated libmkl_intel.a to fool libtool
		AC_SUBST(MKL_LIBS, ["$startgroup,$mklroot/lib/ia32/libmkl_intel.a,\
		$mklroot/lib/ia32/libmkl_intel_thread.a,\
		$mklroot/lib/ia32/libmkl_core.a,--end-group -openmp -lpthread -lm"])
		else
		dnl Dynamic linking
		AC_SUBST(MKL_LIBS, "-lmkl_intel -lmkl_intel_thread -lmkl_core \
		-openmp -lpthread -lm")
		fi

		AC_SUBST(MKL_LDFLAGS, "")

		else
		dnl INTEL compiler not found
		AC_SUBST(MKL_CFLAGS, "")
		AC_SUBST(MKL_LDFLAGS, "")
		AC_SUBST(MKL_LIBS, "")
		MKL_WARN="INTEL compiler not detected"
		AC_SUBST(MKL_WARN)
		fi

		if test x$MKL_WARN = x; then

		dnl --------------------
		dnl Set internal flags
		dnl --------------------
		@@ -76,6 +147,6 @@ AC_DEFINE_UNQUOTED(MKL_H, "mkl.h", [MKL header filename.])
		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.])

		fi

		])dnl ACX_MKL

acx_prog_cc_optim.m4

+5 −5

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@ dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
		dnl
		dnl This file part of: AstrOmatic software
		dnl
		dnl Copyright: (C) 2002-2012 Emmanuel Bertin -- IAP/CNRS/UPMC
		dnl Copyright: (C) 2002-2013 Emmanuel Bertin -- IAP/CNRS/UPMC
		dnl (C) 2002 Ville Lauriki (original version)
		dnl
		dnl Licenses: GPL (this version)
		@@ -25,7 +25,7 @@ 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: 19/07/2012
		dnl Last modified: 13/03/2013
		dnl
		dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
		dnl
		@@ -60,15 +60,15 @@ EOF
		if $CC -V 2>&1 \| grep -i "Intel(R) 64" > /dev/null 2>&1 &&
		$CC -c -O conftest.c > /dev/null 2>&1 &&
		test -f conftest.o; then
		prog_cc_optim_cv_flags="-O3 -axSSE3,SSE4.1,SSE4.2,AVX,CORE-AVX2,CORE-AVX-I -no-prec-div -unroll"
		prog_ld_optim_cv_flags="-static-intel"
		prog_cc_optim_cv_flags="-O3 -axSSSE3,SSE4.1,SSE4.2,AVX,CORE-AVX2,CORE-AVX-I -no-prec-div -unroll"
		prog_ld_optim_cv_flags=""

		dnl INTEL C 32bits compiler
		elif $CC -V 2>&1 \| grep -i "Intel(R)" > /dev/null 2>&1 &&
		$CC -c -O conftest.c > /dev/null 2>&1 &&
		test -f conftest.o; then
		prog_cc_optim_cv_flags="-O3 -axSSE2,SSE3,SSE4.1,SSE4.2,AVX,CORE-AVX2,CORE-AVX-I -no-prec-div -unroll"
		prog_ld_optim_cv_flags="-static-intel"
		prog_ld_optim_cv_flags=""

		dnl GCC
		elif test "$GCC" = "yes"; then

autoconf/ltmain.sh

+56 −37

Original line number	Diff line number	Diff line

		# libtool (GNU libtool) 2.4
		# libtool (GNU libtool) 2.4.2
		# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996

		# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
		# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
		# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
		# This is free software; see the source for copying conditions. There is NO
		# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

		@@ -41,6 +41,7 @@
		# --quiet, --silent don't print informational messages
		# --no-quiet, --no-silent
		# print informational messages (default)
		# --no-warn don't display warning messages
		# --tag=TAG use configuration variables from tag TAG
		# -v, --verbose print more informational messages than default
		# --no-verbose don't print the extra informational messages
		@@ -69,7 +70,7 @@
		# compiler: $LTCC
		# compiler flags: $LTCFLAGS
		# linker: $LD (gnu? $with_gnu_ld)
		# $progname: (GNU libtool) 2.4
		# $progname: (GNU libtool) 2.4.2
		# automake: $automake_version
		# autoconf: $autoconf_version
		#
		@@ -79,9 +80,9 @@

		PROGRAM=libtool
		PACKAGE=libtool
		VERSION=2.4
		VERSION=2.4.2
		TIMESTAMP=""
		package_revision=1.3293
		package_revision=1.3337

		# Be Bourne compatible
		if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
		@@ -136,15 +137,10 @@ progpath="$0"

		: ${CP="cp -f"}
		test "${ECHO+set}" = set \|\| ECHO=${as_echo-'printf %s\n'}
		: ${EGREP="/bin/grep -E"}
		: ${FGREP="/bin/grep -F"}
		: ${GREP="/bin/grep"}
		: ${LN_S="ln -s"}
		: ${MAKE="make"}
		: ${MKDIR="mkdir"}
		: ${MV="mv -f"}
		: ${RM="rm -f"}
		: ${SED="/bin/sed"}
		: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
		: ${Xsed="$SED -e 1s/^X//"}

		@@ -387,7 +383,7 @@ case $progpath in
		;;
		*)
		save_IFS="$IFS"
		IFS=:
		IFS=${PATH_SEPARATOR-:}
		for progdir in $PATH; do
		IFS="$save_IFS"
		test -x "$progdir/$progname" && break
		@@ -771,8 +767,8 @@ func_help ()
		s\$LTCFLAGS'"$LTCFLAGS"'*
		s\$LD'"$LD"'*
		s/\$with_gnu_ld/'"$with_gnu_ld"'/
		s/\$automake_version/'"`(automake --version) 2>/dev/null \|$SED 1q`"'/
		s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null \|$SED 1q`"'/
		s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null \|$SED 1q`"'/
		s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null \|$SED 1q`"'/
		p
		d
		}
		@@ -1052,6 +1048,7 @@ opt_finish=false
		opt_help=false
		opt_help_all=false
		opt_silent=:
		opt_warning=:
		opt_verbose=:
		opt_silent=false
		opt_verbose=false
		@@ -1118,6 +1115,10 @@ esac
		;;
		--no-silent\|--no-quiet)
		opt_silent=false
		func_append preserve_args " $opt"
		;;
		--no-warning\|--no-warn)
		opt_warning=false
		func_append preserve_args " $opt"
		;;
		--no-verbose)
		@@ -2059,7 +2060,7 @@ func_mode_compile ()
		*.[cCFSifmso] \| \
		.ada \| .adb \| .ads \| .asm \| \
		.c++ \| .cc \| .ii \| .class \| .cpp \| .cxx \| \
		.[fF][09]? \| .for \| .java \| .obj \| .sx \| .cu \| *.cup)
		.[fF][09]? \| .for \| .java \| .go \| .obj \| .sx \| .cu \| .cup)
		func_xform "$libobj"
		libobj=$func_xform_result
		;;
		@@ -3201,11 +3202,13 @@ func_mode_install ()

		# Set up the ranlib parameters.
		oldlib="$destdir/$name"
		func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
		tool_oldlib=$func_to_tool_file_result

		func_show_eval "$install_prog \$file \$oldlib" 'exit $?'

		if test -n "$stripme" && test -n "$old_striplib"; then
		func_show_eval "$old_striplib $oldlib" 'exit $?'
		func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
		fi

		# Do each command in the postinstall commands.
		@@ -3470,7 +3473,7 @@ static const void *lt_preloaded_setup() {
		# linked before any other PIC object. But we must not use
		# pic_flag when linking with -static. The problem exists in
		# FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
		--freebsd2\|--freebsd3.0\|--freebsdelf3.0*)
		--freebsd2.\|--freebsd3.0\|--freebsdelf3.0*)
		pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
		--hpux*)
		pic_flag_for_symtable=" $pic_flag" ;;
		@@ -3982,6 +3985,8 @@ func_exec_program_core ()
		# launches target application with the remaining arguments.
		func_exec_program ()
		{
		case \" \$* \" in
		\\ --lt-)
		for lt_wr_arg
		do
		case \$lt_wr_arg in
		@@ -3989,7 +3994,8 @@ func_exec_program ()
		*) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
		esac
		shift
		done
		done ;;
		esac
		func_exec_program_core \${1+\"\$@\"}
		}

		@@ -5057,9 +5063,15 @@ void lt_dump_script (FILE* f)
		{
		EOF
		func_emit_wrapper yes \|
		$SED -e 's/$[\\"]$/\\\1/g' \
		-e 's/^/ fputs ("/' -e 's/$/\\n", f);/'

		$SED -n -e '
		s/^$.\{79\}$$..*$/\1\
		\2/
		h
		s/$[\\"]$/\\\1/g
		s/$/\\n/
		s/$[^\n]$./ fputs ("\1", f);/p
		g
		D'
		cat <<"EOF"
		}
		EOF
		@@ -5643,7 +5655,8 @@ func_mode_link ()
		continue
		;;

		-mt\|-mthreads\|-kthread\|-Kthread\|-pthread\|-pthreads\|--thread-safe\|-threads)
		-mt\|-mthreads\|-kthread\|-Kthread\|-pthread\|-pthreads\|--thread-safe \
		\|-threads\|-fopenmp\|-openmp\|-mp\|-xopenmp\|-omp\|-qsmp=*)
		func_append compiler_flags " $arg"
		func_append compile_command " $arg"
		func_append finalize_command " $arg"
		@@ -6147,7 +6160,8 @@ func_mode_link ()
		lib=
		found=no
		case $deplib in
		-mt\|-mthreads\|-kthread\|-Kthread\|-pthread\|-pthreads\|--thread-safe\|-threads)
		-mt\|-mthreads\|-kthread\|-Kthread\|-pthread\|-pthreads\|--thread-safe \
		\|-threads\|-fopenmp\|-openmp\|-mp\|-xopenmp\|-omp\|-qsmp=*)
		if test "$linkmode,$pass" = "prog,link"; then
		compile_deplibs="$deplib $compile_deplibs"
		finalize_deplibs="$deplib $finalize_deplibs"
		@@ -6831,7 +6845,7 @@ func_mode_link ()
		test "$hardcode_direct_absolute" = no; then
		add="$dir/$linklib"
		elif test "$hardcode_minus_L" = yes; then
		add_dir="-L$dir"
		add_dir="-L$absdir"
		# Try looking first in the location we're being installed to.
		if test -n "$inst_prefix_dir"; then
		case $libdir in
		@@ -7316,6 +7330,7 @@ func_mode_link ()
		# which has an extra 1 added just for fun
		#
		case $version_type in
		# correct linux to gnu/linux during the next big refactor
		darwin\|linux\|osf\|windows\|none)
		func_arith $number_major + $number_minor
		current=$func_arith_result
		@@ -7432,7 +7447,7 @@ func_mode_link ()
		versuffix="$major.$revision"
		;;

		linux)
		linux) # correct to gnu/linux during the next big refactor
		func_arith $current - $age
		major=.$func_arith_result
		versuffix="$major.$age.$revision"
		@@ -8020,6 +8035,11 @@ EOF

		# Test again, we may have decided not to build it any more
		if test "$build_libtool_libs" = yes; then
		# Remove ${wl} instances when linking with ld.
		# FIXME: should test the right _cmds variable.
		case $archive_cmds in
		\$LD\ ) wl= ;;
		esac
		if test "$hardcode_into_libs" = yes; then
		# Hardcode the library paths
		hardcode_libdirs=
		@@ -8058,11 +8078,7 @@ EOF
		if test -n "$hardcode_libdir_separator" &&
		test -n "$hardcode_libdirs"; then
		libdir="$hardcode_libdirs"
		if test -n "$hardcode_libdir_flag_spec_ld"; then
		eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
		else
		eval dep_rpath=\"$hardcode_libdir_flag_spec\"
		fi
		eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
		fi
		if test -n "$runpath_var" && test -n "$perm_rpath"; then
		# We should set the runpath_var.
		@@ -9152,6 +9168,8 @@ EOF
		esac
		done
		fi
		func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
		tool_oldlib=$func_to_tool_file_result
		eval cmds=\"$old_archive_cmds\"

		func_len " $cmds"
		@@ -9261,7 +9279,8 @@ EOF
		*.la)
		func_basename "$deplib"
		name="$func_basename_result"
		eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $deplib`
		func_resolve_sysroot "$deplib"
		eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $func_resolve_sysroot_result`
		test -z "$libdir" && \
		func_fatal_error "\`$deplib' is not a valid libtool archive"
		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"