From 12528331056ffef13466ece9e38ec13f24f78ff9 Mon Sep 17 00:00:00 2001 From: Scott Draves Date: Sat, 16 May 2015 14:27:59 -0400 Subject: [PATCH] increase version to 3.0.2, eliminate duplicated version string, rerun autoconf stuff --- aclocal.m4 | 3 +-- config.h | 2 +- configure | 31 +++++++++++++++---------------- configure.ac | 2 +- flam3.c | 2 +- libtool | 4 ++-- 6 files changed, 21 insertions(+), 23 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 5dbd16e..3cbf469 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -573,8 +573,7 @@ to "yes", and re-run configure. END AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) fi -fi -]) +fi]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further diff --git a/config.h b/config.h index cacd7bb..54ded41 100644 --- a/config.h +++ b/config.h @@ -84,7 +84,7 @@ #define TIME_WITH_SYS_TIME 1 /* Version number of package */ -#define VERSION "3.0.1" +#define VERSION "3.0.2" /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ diff --git a/configure b/configure index 8c68f9f..6e8b414 100755 --- a/configure +++ b/configure @@ -2827,7 +2827,7 @@ fi # Define the identity of the package. PACKAGE=flam3 - VERSION="3.0.1" + VERSION="3.0.2" cat >>confdefs.h <<_ACEOF @@ -2922,7 +2922,6 @@ fi - # Save CFLAGS from the environment save_CFLAGS=$CFLAGS @@ -4711,13 +4710,13 @@ if ${lt_cv_nm_interface+:} false; then : else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4714: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4713: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4717: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4716: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4720: output\"" >&5) + (eval echo "\"\$as_me:4719: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5923,7 +5922,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5926 "configure"' > conftest.$ac_ext + echo '#line 5925 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7422,11 +7421,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7425: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7424: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7429: \$? = $ac_status" >&5 + echo "$as_me:7428: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7761,11 +7760,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7764: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7763: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7768: \$? = $ac_status" >&5 + echo "$as_me:7767: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7866,11 +7865,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7869: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7868: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7873: \$? = $ac_status" >&5 + echo "$as_me:7872: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7921,11 +7920,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7924: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7923: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7928: \$? = $ac_status" >&5 + echo "$as_me:7927: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10305,7 +10304,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10308 "configure" +#line 10307 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10401,7 +10400,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10404 "configure" +#line 10403 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/configure.ac b/configure.ac index faac129..c2fcc71 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ AC_INIT(flam3-animate.c) AM_CONFIG_HEADER(config.h) AC_ARG_ENABLE(pthread, [ --enable-pthread compile FLAM3 with threads enabled (default=yes)]) AC_ARG_ENABLE(atomic_ops, [ --enable-atomic-ops compile FLAM3 with atom ops enabled (default=yes, independently checks for 32 and 64 bit sizes)]) -AM_INIT_AUTOMAKE(flam3,"3.0.1") +AM_INIT_AUTOMAKE(flam3,"3.0.2") AC_CONFIG_MACRO_DIR([m4]) diff --git a/flam3.c b/flam3.c index b1fed28..8b84629 100644 --- a/flam3.c +++ b/flam3.c @@ -62,7 +62,7 @@ char *flam3_version() { if (strcmp(GIT_REV, "")) - return flam3_os "-" VERSION "." GIT_REV; + return flam3_os "-" GIT_REV; return flam3_os "-" VERSION; } diff --git a/libtool b/libtool index eea358b..57d1e83 100755 --- a/libtool +++ b/libtool @@ -1,7 +1,7 @@ #! /bin/bash # libtool - Provide generalized library-building support services. -# Generated automatically by config.status (flam3) 3.0.1 +# Generated automatically by config.status (flam3) 3.0.2 # Libtool was configured on host nuc: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # @@ -86,7 +86,7 @@ NM="/usr/bin/nm -B" LN_S="ln -s" # What is the maximum length of a command? -max_cmd_len=1635000 +max_cmd_len=3458764513820540925 # Object file suffix (normally "o"). objext=o