Skip to content

Commit

Permalink
prepping for 0.3.8
Browse files Browse the repository at this point in the history
  • Loading branch information
molpopgen committed Sep 16, 2015
1 parent 0ee2ffe commit 2f6e73d
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 14 deletions.
23 changes: 12 additions & 11 deletions configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for fwdpp 0.3.7.
# Generated by GNU Autoconf 2.69 for fwdpp 0.3.8.
#
# Report bugs to <https://github.com/molpopgen/fwdpp>.
#
Expand Down Expand Up @@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='fwdpp'
PACKAGE_TARNAME='fwdpp'
PACKAGE_VERSION='0.3.7'
PACKAGE_STRING='fwdpp 0.3.7'
PACKAGE_VERSION='0.3.8'
PACKAGE_STRING='fwdpp 0.3.8'
PACKAGE_BUGREPORT='https://github.com/molpopgen/fwdpp'
PACKAGE_URL=''

Expand Down Expand Up @@ -1293,7 +1293,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 fwdpp 0.3.7 to adapt to many kinds of systems.
\`configure' configures fwdpp 0.3.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1359,7 +1359,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of fwdpp 0.3.7:";;
short | recursive ) echo "Configuration of fwdpp 0.3.8:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1461,7 +1461,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
fwdpp configure 0.3.7
fwdpp configure 0.3.8
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -1801,7 +1801,7 @@ 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 fwdpp $as_me 0.3.7, which was
It was created by fwdpp $as_me 0.3.8, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -2668,7 +2668,7 @@ fi
# Define the identity of the package.
PACKAGE='fwdpp'
VERSION='0.3.7'
VERSION='0.3.8'
cat >>confdefs.h <<_ACEOF
Expand Down Expand Up @@ -4445,7 +4445,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
ac_config_files="$ac_config_files Makefile fwdpp/Makefile fwdpp/internal/Makefile fwdpp/tags/Makefile fwdpp/sugar/Makefile fwdpp/sugar/singlepop/Makefile fwdpp/sugar/metapop/Makefile fwdpp/sugar/multiloc/Makefile fwdpp/sugar/poptypes/Makefile fwdpp/sugar/gsl/Makefile fwdpp/experimental/Makefile fwdpp/extensions/Makefile examples/Makefile unit/Makefile experimental_examples/Makefile src/Makefile"
ac_config_files="$ac_config_files Makefile fwdpp/Makefile fwdpp/internal/Makefile fwdpp/tags/Makefile fwdpp/sugar/Makefile fwdpp/sugar/singlepop/Makefile fwdpp/sugar/metapop/Makefile fwdpp/sugar/multiloc/Makefile fwdpp/sugar/poptypes/Makefile fwdpp/sugar/gsl/Makefile fwdpp/experimental/Makefile fwdpp/extensions/Makefile examples/Makefile unit/Makefile experimental_examples/Makefile src/Makefile doc/fwdpp.doxygen"
# Check whether --enable-boost was given.
Expand Down Expand Up @@ -5917,7 +5917,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 fwdpp $as_me 0.3.7, which was
This file was extended by fwdpp $as_me 0.3.8, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -5983,7 +5983,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="\\
fwdpp config.status 0.3.7
fwdpp config.status 0.3.8
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Expand Down Expand Up @@ -6130,6 +6130,7 @@ do
"unit/Makefile") CONFIG_FILES="$CONFIG_FILES unit/Makefile" ;;
"experimental_examples/Makefile") CONFIG_FILES="$CONFIG_FILES experimental_examples/Makefile" ;;
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"doc/fwdpp.doxygen") CONFIG_FILES="$CONFIG_FILES doc/fwdpp.doxygen" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
AC_PREREQ(2.59)

AC_INIT([fwdpp], [0.3.7], [https://github.com/molpopgen/fwdpp])
AC_INIT([fwdpp], [0.3.8], [https://github.com/molpopgen/fwdpp])
AC_CONFIG_SRCDIR([fwdpp/diploid.hh])
AC_CONFIG_SRCDIR([examples/diploid_ind.cc])
AC_CONFIG_SRCDIR([experimental_examples/sex_limited_ind.cc])
Expand All @@ -19,7 +19,7 @@ AM_MAINTAINER_MODE([disable])
AX_CXX_COMPILE_STDCXX_11([noext],[mandatory])

AC_LANG(C++)
AC_CONFIG_FILES([Makefile fwdpp/Makefile fwdpp/internal/Makefile fwdpp/tags/Makefile fwdpp/sugar/Makefile fwdpp/sugar/singlepop/Makefile fwdpp/sugar/metapop/Makefile fwdpp/sugar/multiloc/Makefile fwdpp/sugar/poptypes/Makefile fwdpp/sugar/gsl/Makefile fwdpp/experimental/Makefile fwdpp/extensions/Makefile examples/Makefile unit/Makefile experimental_examples/Makefile src/Makefile])
AC_CONFIG_FILES([Makefile fwdpp/Makefile fwdpp/internal/Makefile fwdpp/tags/Makefile fwdpp/sugar/Makefile fwdpp/sugar/singlepop/Makefile fwdpp/sugar/metapop/Makefile fwdpp/sugar/multiloc/Makefile fwdpp/sugar/poptypes/Makefile fwdpp/sugar/gsl/Makefile fwdpp/experimental/Makefile fwdpp/extensions/Makefile examples/Makefile unit/Makefile experimental_examples/Makefile src/Makefile doc/fwdpp.doxygen])

dnl AC_ARG_ENABLE([standard],AS_HELP_STRING([--enable-standard],[Disable use of boost containers when compiling examples]),[AC_DEFINE([USE_STANDARD_CONTAINERS],[1],[Prefer containers from namespace std when compiling])])
AC_ARG_ENABLE([boost],AS_HELP_STRING([--enable-boost],[Enable use of boost containers when compiling examples]),[AC_DEFINE([USE_BOOST_CONTAINERS],[1],[Use containers from namespace boost when compiling])])
Expand Down
2 changes: 1 addition & 1 deletion doc/fwdpp.doxygen → doc/fwdpp.doxygen.in
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME = fwdpp
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = 0.3.7
PROJECT_NUMBER = @PACKAGE_VERSION@

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
5 changes: 5 additions & 0 deletions doc/md/RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# FWDPP RELEASE NOTES

## 0.3.8

* Added some include directives whose omission resulted in failure to compile on clang.
* Doxygen input file now generated by ./configure. No more need to manually update the version.

## 0.3.7

* An declaration of KTfwd::recombine_gametes was fixed to match the implementation
Expand Down

0 comments on commit 2f6e73d

Please sign in to comment.