diff options
author | Arnold D. Robbins <arnold@skeeve.com> | 2013-03-20 19:06:08 +0200 |
---|---|---|
committer | Arnold D. Robbins <arnold@skeeve.com> | 2013-03-20 19:06:08 +0200 |
commit | 13b8d9034b58c51e06c05c70fe89a34ad1c7dcd9 (patch) | |
tree | 84bc18fa33af998c37aef00f1df7a2a221a2a955 /extension | |
parent | 15c90ed3319a297680282dba3a24cbdeaca7e8bb (diff) | |
download | egawk-13b8d9034b58c51e06c05c70fe89a34ad1c7dcd9.tar.gz egawk-13b8d9034b58c51e06c05c70fe89a34ad1c7dcd9.tar.bz2 egawk-13b8d9034b58c51e06c05c70fe89a34ad1c7dcd9.zip |
Additional fixes for MirBSD. Now passes make check.
Diffstat (limited to 'extension')
-rw-r--r-- | extension/ChangeLog | 7 | ||||
-rw-r--r-- | extension/Makefile.am | 3 | ||||
-rw-r--r-- | extension/Makefile.in | 3 | ||||
-rwxr-xr-x | extension/configure | 14 | ||||
-rw-r--r-- | extension/configure.ac | 11 |
5 files changed, 38 insertions, 0 deletions
diff --git a/extension/ChangeLog b/extension/ChangeLog index 62638fcc..1d85469d 100644 --- a/extension/ChangeLog +++ b/extension/ChangeLog @@ -1,3 +1,10 @@ +2013-03-20 Arnold D. Robbins <arnold@skeeve.com> + + * configure.ac: Add AC_OUTPUT_COMMANDS that drops in a do-nothing + Makefile for MirBSD, since the extensions can't be built on MirBSD. + * configure: Regenerated. + * Makefile.am (check-for-shared-lib-support): Update comment some. + 2013-03-04 Arnold D. Robbins <arnold@skeeve.com> * filefuncs.c (fill_stat_array): Adjust computation for block diff --git a/extension/Makefile.am b/extension/Makefile.am index 61e26976..d0484977 100644 --- a/extension/Makefile.am +++ b/extension/Makefile.am @@ -115,6 +115,9 @@ SUBDIRS = # This is an ugly hack, initially for MirBSD but probably needed for other # systems. If gawk doesn't have the API built in, don't try to build the # extensions. +# +# Given the workaround in configure, this isn't strictly necessary, but +# we're leaving it in, in case of some other system needing it. check-recursive all-recursive: check-for-shared-lib-support check-for-shared-lib-support: diff --git a/extension/Makefile.in b/extension/Makefile.in index 9aa75cee..87529d95 100644 --- a/extension/Makefile.in +++ b/extension/Makefile.in @@ -1186,6 +1186,9 @@ uninstall-man: uninstall-man3 # This is an ugly hack, initially for MirBSD but probably needed for other # systems. If gawk doesn't have the API built in, don't try to build the # extensions. +# +# Given the workaround in configure, this isn't strictly necessary, but +# we're leaving it in, in case of some other system needing it. check-recursive all-recursive: check-for-shared-lib-support check-for-shared-lib-support: diff --git a/extension/configure b/extension/configure index 797cf606..1f6b937c 100755 --- a/extension/configure +++ b/extension/configure @@ -14031,6 +14031,7 @@ ac_config_headers="$ac_config_headers config.h:configh.in" ac_config_files="$ac_config_files Makefile" +ac_config_commands="$ac_config_commands default-1" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -15034,6 +15035,7 @@ fi + _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 @@ -15047,6 +15049,7 @@ do "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:configh.in" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac @@ -16478,6 +16481,17 @@ fi chmod +x "$ofile" ;; + "default-1":C) +case `uname` in +MirBSD | MirOS) + cat << \EOF > Makefile +all dist check clean distclean install uninstall distcheck: + @exit 0 +EOF + ;; +*) +esac + ;; esac done # for ac_tag diff --git a/extension/configure.ac b/extension/configure.ac index b1d00e57..a1f42db6 100644 --- a/extension/configure.ac +++ b/extension/configure.ac @@ -78,4 +78,15 @@ AC_C_INLINE AC_CONFIG_HEADERS([config.h:configh.in]) AC_CONFIG_FILES(Makefile) +AC_OUTPUT_COMMANDS([ +case `uname` in +MirBSD | MirOS) + cat << \EOF > Makefile +all dist check clean distclean install uninstall distcheck: + @exit 0 +EOF + ;; +*) +esac +])dnl AC_OUTPUT |