This is an automated email from the git hooks/post-receive script. lkajan pushed a commit to branch master in repository freecontact.
commit a88b255f7b7233bfab51e825eac13aae1cd9ac19 Author: Laszlo Kajan <[email protected]> Date: Wed Sep 18 22:09:06 2013 +0200 Imported Upstream version 1.0.19 --- ChangeLog | 6 +++++ configure | 73 +++++++-------------------------------------------- configure.ac | 3 +-- lib/Makefile.am | 4 +-- lib/Makefile.in | 2 +- lib/config.h | 9 +++---- lib/config.hin | 3 --- lib/freecontact.cpp | 3 ++- lib/freecontact.h | 6 ++--- 9 files changed, 27 insertions(+), 82 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6a96f06..b36120c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +freecontact (1.0.19) unstable; urgency=low + + * Changed the condition on which x86intrin.h is included. + + -- Laszlo Kajan <[email protected]> Wed, 18 Sep 2013 17:55:09 +0200 + freecontact (1.0.18) unstable; urgency=low * Fixed compiler SSE2 support detection problem (Debian bug #721380). diff --git a/configure b/configure index bcc5c29..e0ab871 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for freecontact 1.0.18. +# Generated by GNU Autoconf 2.69 for freecontact 1.0.19. # # Report bugs to <[email protected]>. # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='freecontact' PACKAGE_TARNAME='freecontact' -PACKAGE_VERSION='1.0.18' -PACKAGE_STRING='freecontact 1.0.18' +PACKAGE_VERSION='1.0.19' +PACKAGE_STRING='freecontact 1.0.19' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -632,7 +632,6 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_header_list= ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS @@ -1425,7 +1424,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures freecontact 1.0.18 to adapt to many kinds of systems. +\`configure' configures freecontact 1.0.19 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1495,7 +1494,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of freecontact 1.0.18:";; + short | recursive ) echo "Configuration of freecontact 1.0.19:";; esac cat <<\_ACEOF @@ -1644,7 +1643,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -freecontact configure 1.0.18 +freecontact configure 1.0.19 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2328,42 +2327,11 @@ $as_echo "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_cxx_check_func - -# ac_fn_cxx_check_header_compile LINENO HEADER VAR INCLUDES -# --------------------------------------------------------- -# Tests whether HEADER exists and can be compiled using the include files in -# INCLUDES, setting the cache variable VAR accordingly. -ac_fn_cxx_check_header_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - eval "$3=yes" -else - eval "$3=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_cxx_check_header_compile cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by freecontact $as_me 1.0.18, which was +It was created by freecontact $as_me 1.0.19, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2643,7 +2611,6 @@ $as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi -as_fn_append ac_header_list " x86intrin.h" # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false @@ -3232,7 +3199,7 @@ fi # Define the identity of the package. PACKAGE='freecontact' - VERSION='1.0.18' + VERSION='1.0.19' cat >>confdefs.h <<_ACEOF @@ -26295,26 +26262,6 @@ $as_echo "$as_me: WARNING: Your processor support avx instructions but not your - for ac_header in $ac_header_list -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_cxx_check_header_compile "$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 - - - - - - - @@ -28734,7 +28681,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by freecontact $as_me 1.0.18, which was +This file was extended by freecontact $as_me 1.0.19, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -28800,7 +28747,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -freecontact config.status 1.0.18 +freecontact config.status 1.0.19 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 672cf72..46b8f90 100644 --- a/configure.ac +++ b/configure.ac @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. # -AC_INIT([freecontact], [1.0.18], [[email protected]]) +AC_INIT([freecontact], [1.0.19], [[email protected]]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([src/freecontact.cpp]) @@ -69,7 +69,6 @@ AM_COND_IF([HAVE_XSDCXX], ]) AX_EXT -AC_CHECK_HEADERS_ONCE([x86intrin.h]) DX_DOT_FEATURE(OFF) DX_PDF_FEATURE(OFF) diff --git a/lib/Makefile.am b/lib/Makefile.am index 513e17b..787d8c6 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -26,9 +26,9 @@ libfreecontact_la_SOURCES = config.h freecontact.h freecontact.cpp glassofast-re libfreecontact_la_LDFLAGS = $(AM_LDFLAGS) -pthread -version-info 0:0:0 libfreecontact_la_LIBADD = -lrt $(FCLIBS) $(BLAS_LIBS) $(LAPACK_LIBS) $(LIBS) -MOSTLYCLEANFILES = $(DX_CLEANFILES) - include doxygen.mk +MOSTLYCLEANFILES = $(DX_CLEANFILES) + clean-local: -rm -rf libfreecontact.tag diff --git a/lib/Makefile.in b/lib/Makefile.in index 6b77b87..2b61c7f 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -443,7 +443,6 @@ libfreecontact_la_FCFLAGS = $(AM_FCFLAGS) -pthread libfreecontact_la_SOURCES = config.h freecontact.h freecontact.cpp glassofast-real.f90 libfreecontact_la_LDFLAGS = $(AM_LDFLAGS) -pthread -version-info 0:0:0 libfreecontact_la_LIBADD = -lrt $(FCLIBS) $(BLAS_LIBS) $(LAPACK_LIBS) $(LIBS) -MOSTLYCLEANFILES = $(DX_CLEANFILES) @DX_COND_doc_TRUE@@DX_COND_html_TRUE@DX_CLEAN_HTML = @DX_DOCDIR@/html @DX_COND_chm_TRUE@@DX_COND_doc_TRUE@DX_CLEAN_CHM = @DX_DOCDIR@/chm @DX_COND_chi_TRUE@@DX_COND_chm_TRUE@@DX_COND_doc_TRUE@DX_CLEAN_CHI = @DX_DOCDIR@/@[email protected] @@ -468,6 +467,7 @@ MOSTLYCLEANFILES = $(DX_CLEANFILES) @DX_COND_doc_TRUE@ $(DX_CLEAN_PDF) \ @DX_COND_doc_TRUE@ $(DX_CLEAN_LATEX) +MOSTLYCLEANFILES = $(DX_CLEANFILES) all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am diff --git a/lib/config.h b/lib/config.h index 462b4c4..b5183eb 100644 --- a/lib/config.h +++ b/lib/config.h @@ -86,9 +86,6 @@ /* Define to 1 if you have the <unistd.h> header file. */ #define HAVE_UNISTD_H 1 -/* Define to 1 if you have the <x86intrin.h> header file. */ -#define HAVE_X86INTRIN_H 1 - /* Define if XSDCXX is enabled */ #define HAVE_XSDCXX 1 @@ -106,7 +103,7 @@ #define PACKAGE_NAME "freecontact" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "freecontact 1.0.18" +#define PACKAGE_STRING "freecontact 1.0.19" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "freecontact" @@ -115,7 +112,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.0.18" +#define PACKAGE_VERSION "1.0.19" /* Define to necessary symbol if this constant uses a non-standard name on your system. */ @@ -125,4 +122,4 @@ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "1.0.18" +#define VERSION "1.0.19" diff --git a/lib/config.hin b/lib/config.hin index dc5b745..125a234 100644 --- a/lib/config.hin +++ b/lib/config.hin @@ -85,9 +85,6 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H -/* Define to 1 if you have the <x86intrin.h> header file. */ -#undef HAVE_X86INTRIN_H - /* Define if XSDCXX is enabled */ #undef HAVE_XSDCXX diff --git a/lib/freecontact.cpp b/lib/freecontact.cpp index 4fb2795..4dbf84f 100644 --- a/lib/freecontact.cpp +++ b/lib/freecontact.cpp @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "freecontact.h" +#include "config.h" #ifdef HAVE_OPENMP #include <omp.h> @@ -28,6 +28,7 @@ #include <sys/time.h> #include <time.h> #include <unistd.h> +#include "freecontact.h" // lkajan: EVfold-mfDCA is calculate_evolutionary_constraints.m diff --git a/lib/freecontact.h b/lib/freecontact.h index 0608213..08174ff 100644 --- a/lib/freecontact.h +++ b/lib/freecontact.h @@ -17,8 +17,6 @@ #ifndef LIBFREECONTACT_H #define LIBFREECONTACT_H -#include "config.h" - #include <boost/format.hpp> #include <errno.h> #include <map> @@ -26,9 +24,9 @@ #include <stdint.h> #include <string.h> #include <vector> -#ifdef HAVE_X86INTRIN_H +#ifdef __SSE2__ #include <x86intrin.h> -#endif // HAVE_X86INTRIN_H +#endif // __SSE2__ #define LIBFREEC_API __attribute__ ((visibility ("default"))) #define LIBFREEC_LOCAL __attribute__ ((visibility ("hidden"))) -- Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/freecontact.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
