diff options
| author | Aiden Woodruff <aiden.woodruff@gmail.com> | 2018-07-30 16:15:06 -0500 |
|---|---|---|
| committer | Aiden Woodruff <aiden.woodruff@gmail.com> | 2018-07-30 16:15:06 -0500 |
| commit | ee2c4d4241dbb9087e24db6bc46cc35475e93db4 (patch) | |
| tree | 105b4a2e2c383ee086e8a0491080148ea560dc57 | |
| parent | 03975c128a504d259f76d4c06cad2236b32e4a9f (diff) | |
| download | life-1.5.4.tar.gz life-1.5.4.tar.bz2 life-1.5.4.zip | |
GNU compat of malloc doesn't matterlife-1.5.4
Remove GNU malloc check in configure (extra fluff I don't need).
Signed-off-by: Aiden Woodruff <aiden.woodruff@gmail.com>
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | config.h.in | 7 | ||||
| -rwxr-xr-x | configure | 89 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | life-1.5.3.tar.gz | bin | 117220 -> 0 bytes | |||
| -rw-r--r-- | life-1.5.3.tar.gz.sig | bin | 310 -> 0 bytes | |||
| -rw-r--r-- | life-1.5.4.tar.gz | bin | 0 -> 116910 bytes | |||
| -rw-r--r-- | life-1.5.4.tar.gz.sig | bin | 0 -> 310 bytes |
8 files changed, 15 insertions, 87 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5245f77 --- /dev/null +++ b/.gitignore | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | # Ignore backups | ||
| 2 | *~ | ||
| 3 | \#*# | ||
diff --git a/config.h.in b/config.h.in index e9ca3fb..b47e612 100644 --- a/config.h.in +++ b/config.h.in | |||
| @@ -6,10 +6,6 @@ | |||
| 6 | /* Define to 1 if you have the `ncurses' library (-lncurses). */ | 6 | /* Define to 1 if you have the `ncurses' library (-lncurses). */ |
| 7 | #undef HAVE_LIBNCURSES | 7 | #undef HAVE_LIBNCURSES |
| 8 | 8 | ||
| 9 | /* Define to 1 if your system has a GNU libc compatible `malloc' function, and | ||
| 10 | to 0 otherwise. */ | ||
| 11 | #undef HAVE_MALLOC | ||
| 12 | |||
| 13 | /* Define to 1 if you have the <memory.h> header file. */ | 9 | /* Define to 1 if you have the <memory.h> header file. */ |
| 14 | #undef HAVE_MEMORY_H | 10 | #undef HAVE_MEMORY_H |
| 15 | 11 | ||
| @@ -66,6 +62,3 @@ | |||
| 66 | 62 | ||
| 67 | /* Version number of package */ | 63 | /* Version number of package */ |
| 68 | #undef VERSION | 64 | #undef VERSION |
| 69 | |||
| 70 | /* Define to rpl_malloc if the replacement function should be used. */ | ||
| 71 | #undef malloc | ||
| @@ -1,6 +1,6 @@ | |||
| 1 | #! /bin/sh | 1 | #! /bin/sh |
| 2 | # Guess values for system-dependent variables and create Makefiles. | 2 | # Guess values for system-dependent variables and create Makefiles. |
| 3 | # Generated by GNU Autoconf 2.69 for life 1.5.3. | 3 | # Generated by GNU Autoconf 2.69 for life 1.5.4. |
| 4 | # | 4 | # |
| 5 | # Report bugs to <aiden.woodruff@gmail.com>. | 5 | # Report bugs to <aiden.woodruff@gmail.com>. |
| 6 | # | 6 | # |
| @@ -580,8 +580,8 @@ MAKEFLAGS= | |||
| 580 | # Identity of this package. | 580 | # Identity of this package. |
| 581 | PACKAGE_NAME='life' | 581 | PACKAGE_NAME='life' |
| 582 | PACKAGE_TARNAME='life' | 582 | PACKAGE_TARNAME='life' |
| 583 | PACKAGE_VERSION='1.5.3' | 583 | PACKAGE_VERSION='1.5.4' |
| 584 | PACKAGE_STRING='life 1.5.3' | 584 | PACKAGE_STRING='life 1.5.4' |
| 585 | PACKAGE_BUGREPORT='aiden.woodruff@gmail.com' | 585 | PACKAGE_BUGREPORT='aiden.woodruff@gmail.com' |
| 586 | PACKAGE_URL='' | 586 | PACKAGE_URL='' |
| 587 | 587 | ||
| @@ -625,6 +625,7 @@ ac_includes_default="\ | |||
| 625 | ac_subst_vars='am__EXEEXT_FALSE | 625 | ac_subst_vars='am__EXEEXT_FALSE |
| 626 | am__EXEEXT_TRUE | 626 | am__EXEEXT_TRUE |
| 627 | LTLIBOBJS | 627 | LTLIBOBJS |
| 628 | LIBOBJS | ||
| 628 | AM_BACKSLASH | 629 | AM_BACKSLASH |
| 629 | AM_DEFAULT_VERBOSITY | 630 | AM_DEFAULT_VERBOSITY |
| 630 | AM_DEFAULT_V | 631 | AM_DEFAULT_V |
| @@ -662,7 +663,6 @@ am__isrc | |||
| 662 | INSTALL_DATA | 663 | INSTALL_DATA |
| 663 | INSTALL_SCRIPT | 664 | INSTALL_SCRIPT |
| 664 | INSTALL_PROGRAM | 665 | INSTALL_PROGRAM |
| 665 | LIBOBJS | ||
| 666 | EGREP | 666 | EGREP |
| 667 | GREP | 667 | GREP |
| 668 | CPP | 668 | CPP |
| @@ -1277,7 +1277,7 @@ if test "$ac_init_help" = "long"; then | |||
| 1277 | # Omit some internal or obsolete options to make the list less imposing. | 1277 | # Omit some internal or obsolete options to make the list less imposing. |
| 1278 | # This message is too long to be a string in the A/UX 3.1 sh. | 1278 | # This message is too long to be a string in the A/UX 3.1 sh. |
| 1279 | cat <<_ACEOF | 1279 | cat <<_ACEOF |
| 1280 | \`configure' configures life 1.5.3 to adapt to many kinds of systems. | 1280 | \`configure' configures life 1.5.4 to adapt to many kinds of systems. |
| 1281 | 1281 | ||
| 1282 | Usage: $0 [OPTION]... [VAR=VALUE]... | 1282 | Usage: $0 [OPTION]... [VAR=VALUE]... |
| 1283 | 1283 | ||
| @@ -1344,7 +1344,7 @@ fi | |||
| 1344 | 1344 | ||
| 1345 | if test -n "$ac_init_help"; then | 1345 | if test -n "$ac_init_help"; then |
| 1346 | case $ac_init_help in | 1346 | case $ac_init_help in |
| 1347 | short | recursive ) echo "Configuration of life 1.5.3:";; | 1347 | short | recursive ) echo "Configuration of life 1.5.4:";; |
| 1348 | esac | 1348 | esac |
| 1349 | cat <<\_ACEOF | 1349 | cat <<\_ACEOF |
| 1350 | 1350 | ||
| @@ -1435,7 +1435,7 @@ fi | |||
| 1435 | test -n "$ac_init_help" && exit $ac_status | 1435 | test -n "$ac_init_help" && exit $ac_status |
| 1436 | if $ac_init_version; then | 1436 | if $ac_init_version; then |
| 1437 | cat <<\_ACEOF | 1437 | cat <<\_ACEOF |
| 1438 | life configure 1.5.3 | 1438 | life configure 1.5.4 |
| 1439 | generated by GNU Autoconf 2.69 | 1439 | generated by GNU Autoconf 2.69 |
| 1440 | 1440 | ||
| 1441 | Copyright (C) 2012 Free Software Foundation, Inc. | 1441 | Copyright (C) 2012 Free Software Foundation, Inc. |
| @@ -1804,7 +1804,7 @@ cat >config.log <<_ACEOF | |||
| 1804 | This file contains any messages produced by compilers while | 1804 | This file contains any messages produced by compilers while |
| 1805 | running configure, to aid debugging if configure makes a mistake. | 1805 | running configure, to aid debugging if configure makes a mistake. |
| 1806 | 1806 | ||
| 1807 | It was created by life $as_me 1.5.3, which was | 1807 | It was created by life $as_me 1.5.4, which was |
| 1808 | generated by GNU Autoconf 2.69. Invocation command line was | 1808 | generated by GNU Autoconf 2.69. Invocation command line was |
| 1809 | 1809 | ||
| 1810 | $ $0 $@ | 1810 | $ $0 $@ |
| @@ -3678,73 +3678,6 @@ done | |||
| 3678 | # Checks for typedefs, structures, and compiler characteristics. | 3678 | # Checks for typedefs, structures, and compiler characteristics. |
| 3679 | 3679 | ||
| 3680 | # Checks for library functions. | 3680 | # Checks for library functions. |
| 3681 | for ac_header in stdlib.h | ||
| 3682 | do : | ||
| 3683 | ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" | ||
| 3684 | if test "x$ac_cv_header_stdlib_h" = xyes; then : | ||
| 3685 | cat >>confdefs.h <<_ACEOF | ||
| 3686 | #define HAVE_STDLIB_H 1 | ||
| 3687 | _ACEOF | ||
| 3688 | |||
| 3689 | fi | ||
| 3690 | |||
| 3691 | done | ||
| 3692 | |||
| 3693 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5 | ||
| 3694 | $as_echo_n "checking for GNU libc compatible malloc... " >&6; } | ||
| 3695 | if ${ac_cv_func_malloc_0_nonnull+:} false; then : | ||
| 3696 | $as_echo_n "(cached) " >&6 | ||
| 3697 | else | ||
| 3698 | if test "$cross_compiling" = yes; then : | ||
| 3699 | ac_cv_func_malloc_0_nonnull=no | ||
| 3700 | else | ||
| 3701 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
| 3702 | /* end confdefs.h. */ | ||
| 3703 | #if defined STDC_HEADERS || defined HAVE_STDLIB_H | ||
| 3704 | # include <stdlib.h> | ||
| 3705 | #else | ||
| 3706 | char *malloc (); | ||
| 3707 | #endif | ||
| 3708 | |||
| 3709 | int | ||
| 3710 | main () | ||
| 3711 | { | ||
| 3712 | return ! malloc (0); | ||
| 3713 | ; | ||
| 3714 | return 0; | ||
| 3715 | } | ||
| 3716 | _ACEOF | ||
| 3717 | if ac_fn_c_try_run "$LINENO"; then : | ||
| 3718 | ac_cv_func_malloc_0_nonnull=yes | ||
| 3719 | else | ||
| 3720 | ac_cv_func_malloc_0_nonnull=no | ||
| 3721 | fi | ||
| 3722 | rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ | ||
| 3723 | conftest.$ac_objext conftest.beam conftest.$ac_ext | ||
| 3724 | fi | ||
| 3725 | |||
| 3726 | fi | ||
| 3727 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5 | ||
| 3728 | $as_echo "$ac_cv_func_malloc_0_nonnull" >&6; } | ||
| 3729 | if test $ac_cv_func_malloc_0_nonnull = yes; then : | ||
| 3730 | |||
| 3731 | $as_echo "#define HAVE_MALLOC 1" >>confdefs.h | ||
| 3732 | |||
| 3733 | else | ||
| 3734 | $as_echo "#define HAVE_MALLOC 0" >>confdefs.h | ||
| 3735 | |||
| 3736 | case " $LIBOBJS " in | ||
| 3737 | *" malloc.$ac_objext "* ) ;; | ||
| 3738 | *) LIBOBJS="$LIBOBJS malloc.$ac_objext" | ||
| 3739 | ;; | ||
| 3740 | esac | ||
| 3741 | |||
| 3742 | |||
| 3743 | $as_echo "#define malloc rpl_malloc" >>confdefs.h | ||
| 3744 | |||
| 3745 | fi | ||
| 3746 | |||
| 3747 | |||
| 3748 | for ac_func in memset strtol | 3681 | for ac_func in memset strtol |
| 3749 | do : | 3682 | do : |
| 3750 | as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` | 3683 | as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` |
| @@ -4306,7 +4239,7 @@ fi | |||
| 4306 | 4239 | ||
| 4307 | # Define the identity of the package. | 4240 | # Define the identity of the package. |
| 4308 | PACKAGE='life' | 4241 | PACKAGE='life' |
| 4309 | VERSION='1.5.3' | 4242 | VERSION='1.5.4' |
| 4310 | 4243 | ||
| 4311 | 4244 | ||
| 4312 | cat >>confdefs.h <<_ACEOF | 4245 | cat >>confdefs.h <<_ACEOF |
| @@ -5057,7 +4990,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | |||
| 5057 | # report actual input values of CONFIG_FILES etc. instead of their | 4990 | # report actual input values of CONFIG_FILES etc. instead of their |
| 5058 | # values after options handling. | 4991 | # values after options handling. |
| 5059 | ac_log=" | 4992 | ac_log=" |
| 5060 | This file was extended by life $as_me 1.5.3, which was | 4993 | This file was extended by life $as_me 1.5.4, which was |
| 5061 | generated by GNU Autoconf 2.69. Invocation command line was | 4994 | generated by GNU Autoconf 2.69. Invocation command line was |
| 5062 | 4995 | ||
| 5063 | CONFIG_FILES = $CONFIG_FILES | 4996 | CONFIG_FILES = $CONFIG_FILES |
| @@ -5123,7 +5056,7 @@ _ACEOF | |||
| 5123 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | 5056 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
| 5124 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" | 5057 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
| 5125 | ac_cs_version="\\ | 5058 | ac_cs_version="\\ |
| 5126 | life config.status 1.5.3 | 5059 | life config.status 1.5.4 |
| 5127 | configured by $0, generated by GNU Autoconf 2.69, | 5060 | configured by $0, generated by GNU Autoconf 2.69, |
| 5128 | with options \\"\$ac_cs_config\\" | 5061 | with options \\"\$ac_cs_config\\" |
| 5129 | 5062 | ||
diff --git a/configure.ac b/configure.ac index 6c508d3..412cb00 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | # Process this file with autoconf to produce a configure script. | 2 | # Process this file with autoconf to produce a configure script. |
| 3 | 3 | ||
| 4 | AC_PREREQ([2.69]) | 4 | AC_PREREQ([2.69]) |
| 5 | AC_INIT([life], [1.5.3], [aiden.woodruff@gmail.com]) | 5 | AC_INIT([life], [1.5.4], [aiden.woodruff@gmail.com]) |
| 6 | AC_CONFIG_SRCDIR([life.c]) | 6 | AC_CONFIG_SRCDIR([life.c]) |
| 7 | AC_CONFIG_HEADERS([config.h]) | 7 | AC_CONFIG_HEADERS([config.h]) |
| 8 | 8 | ||
| @@ -19,7 +19,6 @@ AC_CHECK_HEADERS([stdlib.h string.h unistd.h]) | |||
| 19 | # Checks for typedefs, structures, and compiler characteristics. | 19 | # Checks for typedefs, structures, and compiler characteristics. |
| 20 | 20 | ||
| 21 | # Checks for library functions. | 21 | # Checks for library functions. |
| 22 | AC_FUNC_MALLOC | ||
| 23 | AC_CHECK_FUNCS([memset strtol]) | 22 | AC_CHECK_FUNCS([memset strtol]) |
| 24 | 23 | ||
| 25 | AC_CONFIG_FILES([Makefile]) | 24 | AC_CONFIG_FILES([Makefile]) |
diff --git a/life-1.5.3.tar.gz b/life-1.5.3.tar.gz deleted file mode 100644 index 128bf0e..0000000 --- a/life-1.5.3.tar.gz +++ /dev/null | |||
| Binary files differ | |||
diff --git a/life-1.5.3.tar.gz.sig b/life-1.5.3.tar.gz.sig deleted file mode 100644 index 8f74c16..0000000 --- a/life-1.5.3.tar.gz.sig +++ /dev/null | |||
| Binary files differ | |||
diff --git a/life-1.5.4.tar.gz b/life-1.5.4.tar.gz new file mode 100644 index 0000000..fa6a7ee --- /dev/null +++ b/life-1.5.4.tar.gz | |||
| Binary files differ | |||
diff --git a/life-1.5.4.tar.gz.sig b/life-1.5.4.tar.gz.sig new file mode 100644 index 0000000..c4b9fdc --- /dev/null +++ b/life-1.5.4.tar.gz.sig | |||
| Binary files differ | |||
