5 files changed, 6 insertions, 55 deletions
diff --git a/extension/ChangeLog b/extension/ChangeLog
index ec926f53..328d58ba 100644
--- a/extension/ChangeLog
+++ b/extension/ChangeLog
@@ -1,3 +1,9 @@
+2013-12-21         Mike Frysinger        <vapier@gentoo.org>
+
+	* configure.ac: Remove MirBSD and OS/390 hack to create
+	do-nothing Makefile. Should be handled by configure in the
+	parent directory.
+
 2013-12-21         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* configure, aclocal.m4: Updated to automake 1.13.4 and
diff --git a/extension/Makefile.am b/extension/Makefile.am
index 3ef72568..9c49bb81 100644
--- a/extension/Makefile.am
+++ b/extension/Makefile.am
@@ -122,18 +122,3 @@ dist_man_MANS = \
 
 # gettext requires this
 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:
-	@if ../gawk$(EXEEXT) --version | sed 1q | grep API > /dev/null; \
-	then	: do nothing ; \
-	else	echo Building the extensions is not supported on this platform ; \
-		exit 1; \
-	fi
diff --git a/extension/Makefile.in b/extension/Makefile.in
index 7d919ca4..040cdb8f 100644
--- a/extension/Makefile.in
+++ b/extension/Makefile.in
@@ -1240,21 +1240,6 @@ uninstall-so:
 
 uninstall-recursive: uninstall-so
 
-# 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:
-	@if ../gawk$(EXEEXT) --version | sed 1q | grep API > /dev/null; \
-	then	: do nothing ; \
-	else	echo Building the extensions is not supported on this platform ; \
-		exit 1; \
-	fi
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/extension/configure b/extension/configure
index 9e596d57..025e2723 100755
--- a/extension/configure
+++ b/extension/configure
@@ -14294,7 +14294,6 @@ 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
@@ -15299,7 +15298,6 @@ fi
 
 
 
-
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -15313,7 +15311,6 @@ 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
@@ -16592,17 +16589,6 @@ ltmain=$ac_aux_dir/ltmain.sh
   chmod +x "$ofile"
 
  ;;
-    "default-1":C)
-case `uname` in
-MirBSD | MirOS | "OS/390")
-	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 d819ebfa..412fec09 100644
--- a/extension/configure.ac
+++ b/extension/configure.ac
@@ -81,15 +81,4 @@ AC_C_INLINE
 AC_CONFIG_HEADERS([config.h:configh.in])
 
 AC_CONFIG_FILES(Makefile)
-AC_OUTPUT_COMMANDS([
-case `uname` in
-MirBSD | MirOS | "OS/390")
-	cat << \EOF > Makefile
-all dist check clean distclean install uninstall distcheck:
-	@exit 0
-EOF
-	;;
-*)
-esac
-])dnl
 AC_OUTPUT