Make extensions controlled by configure time option.

13 files changed, 275 insertions, 244 deletions

diff --git a/ChangeLog b/ChangeLog
index fbc10a32..d1bf42d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-12-21         Mike Frysinger        <vapier@gentoo.org>
+
+	* configure.ac: Add --disable-extensions flag to control
+	compiling extensions.  Better for cross-compiling.
+	(AC_CANONICAL_HOST): Added. Changed case statments appropriately.
+	* Makefile.am (check-for-shared-lib-support): Removed.
+	(check-recursive, all-recursive): Removed.
+
 2013-12-21         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* config.guess: Updated.
diff --git a/NEWS b/NEWS
index fcc1f264..09f91720 100644
--- a/NEWS
+++ b/NEWS
@@ -27,6 +27,9 @@ Changes from 4.1.0 to 4.1.1
 
 9. Infrastructure updated to automake 1.13.4 and libtool 2.4.2.418.
 
+10. The configure script now accepts a --disable-extensions option,
+which disables checking for and building the extensions.
+
 XXX. A number of bugs have been fixed. See the ChangeLog.
 
 Changes from 4.0.2 to 4.1.0
diff --git a/configure b/configure
index aef8d003..7ee850e6 100755
--- a/configure
+++ b/configure
@@ -647,14 +647,6 @@ INTLLIBS
 LTLIBICONV
 LIBICONV
 INTL_MACOSX_LIBS
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
 XGETTEXT_EXTRA_OPTIONS
 MSGMERGE
 XGETTEXT_015
@@ -690,6 +682,14 @@ CPPFLAGS
 LDFLAGS
 CFLAGS
 CC
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
 AM_BACKSLASH
 AM_DEFAULT_VERBOSITY
 AM_DEFAULT_V
@@ -769,6 +769,7 @@ enable_rpath
 with_libiconv_prefix
 with_libintl_prefix
 with_libsigsegv_prefix
+enable_extensions
 with_readline
 with_mpfr
 '
@@ -1411,6 +1412,7 @@ Optional Features:
   --disable-largefile     omit support for large files
   --disable-nls           do not use Native Language Support
   --disable-rpath         do not hardcode runtime library paths
+  --disable-extensions    disable dynamic extensions (default is detect)
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -3180,6 +3182,77 @@ $as_echo "#define NO_LINT 1" >>confdefs.h
 fi
 
 
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if ${ac_cv_build+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if ${ac_cv_host+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
 DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
@@ -5926,8 +5999,8 @@ then
 	CFLAGS="$CFLAGS -D_SYSV3"
 fi
 
-case `uname` in
-MirBSD | MirOS)
+case $host_os in
+mirbsd*)
 
 $as_echo "#define LIBC_IS_BORKED 1" >>confdefs.h
 
@@ -6257,77 +6330,6 @@ fi
   eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
   prefix="$acl_save_prefix"
 
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
-else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
 
 # Check whether --with-gnu-ld was given.
 if test "${with_gnu_ld+set}" = set; then :
@@ -9441,8 +9443,8 @@ _ACEOF
 
 fi
 
-case `uname` in
-OSF1)	: ;;
+case $host_os in
+osf1)	: ;;
 *)
 
 
@@ -10057,17 +10059,25 @@ $as_echo "#define HAVE_MBRTOWC 1" >>confdefs.h
   fi
 
 
-case `uname` in
-MirBSD | MirOS)
-	: ;;
-*)
-ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
+# Check whether --enable-extensions was given.
+if test "${enable_extensions+set}" = set; then :
+  enableval=$enable_extensions;
+fi
+
+if test "x$enable_extensions" != "xno"; then
+	extensions_supported=no
+
+		case $host_os in
+	mirbsd*)
+		: ;;
+	*)
+	ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
 if test "x$ac_cv_header_dlfcn_h" = xyes; then :
 
-	# Check this separately. Some systems have dlopen
-	# in libc. Notably freebsd and cygwin.
-	# HP-NSK has it in zrldsrl
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
+		# Check this separately. Some systems have dlopen
+		# in libc. Notably freebsd and cygwin.
+		# HP-NSK has it in zrldsrl
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
 $as_echo_n "checking for library containing dlopen... " >&6; }
 if ${ac_cv_search_dlopen+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -10125,29 +10135,38 @@ else
   gawk_have_dlopen=no
 fi
 
-	# Only do DYNAMIC if we have the lib. z/OS (some versions) have
-	# the header but not the lib, apparently
-	if test "$gawk_have_dlopen" = yes
-	then
+		# Only do DYNAMIC if we have the lib. z/OS (some versions) have
+		# the header but not the lib, apparently
+		if test "$gawk_have_dlopen" = yes
+		then
+			extensions_supported=yes
 
 $as_echo "#define DYNAMIC 1" >>confdefs.h
 
-		# Add -export-dynamic for old extensions. Only works for GCC
-		if test "$GCC" = yes &&
-		   uname | $EGREP -i 'linux|freebsd' > /dev/null
-		then
-			LDFLAGS="$LDFLAGS -export-dynamic"
+			# Add -export-dynamic for old extensions. Only works for GCC
+			if test "$GCC" = yes; then
+				case $host_os in
+				linux*|freebsd*)
+					LDFLAGS="$LDFLAGS -export-dynamic"
+					;;
+				esac
+			fi
 		fi
-	fi
 
 fi
 
 
-	;;
-esac
+		;;
+	esac
 
-case `(uname) 2> /dev/null` in
-*VMS*|*BeOS*|*OS/2*|*MS-DOS*)
+	if test "x$enable_extensions$extensions_supported" = "xyesno"; then
+		as_fn_error $? "extension support requested, but unavailable" "$LINENO" 5
+	fi
+	enable_extensions=$extensions_supported
+fi
+
+case $host_os in
+vms*|beos*|os2*|msdos)
 
 $as_echo "#define GETPGRP_VOID 1" >>confdefs.h
 
@@ -10970,10 +10989,12 @@ esac
 
 ac_config_files="$ac_config_files Makefile awklib/Makefile doc/Makefile po/Makefile.in test/Makefile"
 
+if test "x$enable_extensions" = "xyes"; then
 
 
 subdirs="$subdirs extension"
 
+fi
 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
diff --git a/configure.ac b/configure.ac
index 02267978..e58d9590 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,6 +59,7 @@ AC_ARG_ENABLE([lint], [  --disable-lint	Disable gawk lint checking],
 	fi
 )
 
+AC_CANONICAL_HOST
 AC_USE_SYSTEM_EXTENSIONS
 
 dnl checks for programs
@@ -119,8 +120,8 @@ dnl	need -D_SYSV3 for ISC
 fi
 
 dnl check for systems where libc is borked for regex handling
-case `uname` in
-MirBSD | MirOS)
+case $host_os in
+mirbsd*)
 	AC_DEFINE([LIBC_IS_BORKED], 1, [libc is broken for regex handling])
 	;;
 esac
@@ -262,8 +263,8 @@ AC_CHECK_LIB(m, fmod)
 AC_CHECK_LIB(m, isinf)
 AC_CHECK_LIB(m, ismod)
 dnl Don't look for libsigsegv on OSF/1, gives us severe headaches
-case `uname` in
-OSF1)	: ;;
+case $host_os in
+osf1)	: ;;
 *)
 	gl_LIBSIGSEGV
 	;;
@@ -282,38 +283,52 @@ AC_FUNC_MBRTOWC
 
 dnl check for dynamic linking
 dnl This is known to be very primitive
-dnl On MirBSD (and probably other systems), don't even try.
-case `uname` in
-MirBSD | MirOS)
-	: ;;
-*)
-AC_CHECK_HEADER(dlfcn.h,
-	[
-	# Check this separately. Some systems have dlopen
-	# in libc. Notably freebsd and cygwin.
-	# HP-NSK has it in zrldsrl
-	AC_SEARCH_LIBS(dlopen, dl zrldsrl, gawk_have_dlopen=yes, gawk_have_dlopen=no)
-	# Only do DYNAMIC if we have the lib. z/OS (some versions) have
-	# the header but not the lib, apparently
-	if test "$gawk_have_dlopen" = yes
-	then
-		AC_DEFINE([DYNAMIC], 1, [dynamic loading is possible])
-		# Add -export-dynamic for old extensions. Only works for GCC
-		if test "$GCC" = yes &&
-		   uname | $EGREP -i 'linux|freebsd' > /dev/null
+AC_ARG_ENABLE([extensions],
+	[AS_HELP_STRING([--disable-extensions], [disable dynamic extensions (default is detect)])])
+if test "x$enable_extensions" != "xno"; then
+	extensions_supported=no
+
+	dnl On MirBSD (and probably other systems), don't even try.
+	case $host_os in
+	mirbsd*)
+		: ;;
+	*)
+	AC_CHECK_HEADER(dlfcn.h,
+		[
+		# Check this separately. Some systems have dlopen
+		# in libc. Notably freebsd and cygwin.
+		# HP-NSK has it in zrldsrl
+		AC_SEARCH_LIBS(dlopen, dl zrldsrl, gawk_have_dlopen=yes, gawk_have_dlopen=no)
+		# Only do DYNAMIC if we have the lib. z/OS (some versions) have
+		# the header but not the lib, apparently
+		if test "$gawk_have_dlopen" = yes
 		then
-			LDFLAGS="$LDFLAGS -export-dynamic"
+			extensions_supported=yes
+			AC_DEFINE([DYNAMIC], 1, [dynamic loading is possible])
+			# Add -export-dynamic for old extensions. Only works for GCC
+			if test "$GCC" = yes; then
+				case $host_os in
+				linux*|freebsd*)
+					LDFLAGS="$LDFLAGS -export-dynamic"
+					;;
+				esac
+			fi
 		fi
+	])
+		;;
+	esac
+
+	if test "x$enable_extensions$extensions_supported" = "xyesno"; then
+		AC_MSG_ERROR([extension support requested, but unavailable])
 	fi
-])
-	;;
-esac
+	enable_extensions=$extensions_supported
+fi
 
 dnl check for how to use getpgrp
 dnl have to hardwire it for VMS POSIX. Sigh.
 dnl ditto for BeOS, OS/2, and MS-DOS.
-case `(uname) 2> /dev/null` in
-*VMS*|*BeOS*|*OS/2*|*MS-DOS*)
+case $host_os in
+vms*|beos*|os2*|msdos)
 	AC_DEFINE(GETPGRP_VOID, 1,
 	  [Define to 1 if the getpgrp function requires zero arguments.])
 	;;
@@ -387,5 +402,7 @@ AC_CONFIG_FILES(Makefile
 	doc/Makefile
 	po/Makefile.in
 	test/Makefile)
-AC_CONFIG_SUBDIRS(extension)
+if test "x$enable_extensions" = "xyes"; then
+	AC_CONFIG_SUBDIRS(extension)
+fi
 AC_OUTPUT
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 9b77b107..24044c9a 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-21         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in (Additional Configuration Options): Document
+	the --disable-extensions option.
+
 2013-12-12         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* gawktexi.in: Fix the presentation of asort() and asorti().
diff --git a/doc/gawk.info b/doc/gawk.info
index 42228cae..ed3ab7b3 100644
--- a/doc/gawk.info
+++ b/doc/gawk.info
@@ -25827,6 +25827,12 @@ B.2.2 Additional Configuration Options
 There are several additional options you may use on the `configure'
 command line when compiling `gawk' from scratch, including:
 
+`--disable-extensions'
+     Disable configuring and building the sample extensions in the
+     `extension' directory. This is useful for cross-compiling.  The
+     default action is to dynamically check if the extensions can be
+     configured and compiled.
+
 `--disable-lint'
      Disable all lint checking within `gawk'.  The `--lint' and
      `--lint-old' options (*note Options::) are accepted, but silently
@@ -29452,10 +29458,12 @@ Index
 * --characters-as-bytes option:          Options.             (line  82)
 * --copyright option:                    Options.             (line 102)
 * --debug option:                        Options.             (line 122)
-* --disable-lint configuration option:   Additional Configuration Options.
+* --disable-extensions configuration option: Additional Configuration Options.
                                                               (line   9)
+* --disable-lint configuration option:   Additional Configuration Options.
+                                                              (line  15)
 * --disable-nls configuration option:    Additional Configuration Options.
-                                                              (line  24)
+                                                              (line  30)
 * --dump-variables option <1>:           Library Names.       (line  45)
 * --dump-variables option:               Options.             (line 107)
 * --exec option:                         Options.             (line 139)
@@ -29493,7 +29501,7 @@ Index
 * --use-lc-numeric option:               Options.             (line 215)
 * --version option:                      Options.             (line 293)
 * --with-whiny-user-strftime configuration option: Additional Configuration Options.
-                                                              (line  29)
+                                                              (line  35)
 * -b option:                             Options.             (line  82)
 * -C option:                             Options.             (line 102)
 * -D option:                             Options.             (line 122)
@@ -30088,12 +30096,14 @@ Index
 * concatenating:                         Concatenation.       (line   8)
 * condition debugger command:            Breakpoint Control.  (line  54)
 * conditional expressions:               Conditional Exp.     (line   6)
-* configuration option, --disable-lint:  Additional Configuration Options.
+* configuration option, --disable-extensions: Additional Configuration Options.
                                                               (line   9)
+* configuration option, --disable-lint:  Additional Configuration Options.
+                                                              (line  15)
 * configuration option, --disable-nls:   Additional Configuration Options.
-                                                              (line  24)
+                                                              (line  30)
 * configuration option, --with-whiny-user-strftime: Additional Configuration Options.
-                                                              (line  29)
+                                                              (line  35)
 * configuration options, gawk:           Additional Configuration Options.
                                                               (line   6)
 * constants, floating-point:             Floating-point Constants.
@@ -32644,52 +32654,52 @@ Node: Distribution contents1027860
 Node: Unix Installation1033380
 Node: Quick Installation1033997
 Node: Additional Configuration Options1036441
-Node: Configuration Philosophy1037918
-Node: Non-Unix Installation1040272
-Node: PC Installation1040730
-Node: PC Binary Installation1042029
-Node: PC Compiling1043877
-Node: PC Testing1046821
-Node: PC Using1047997
-Node: Cygwin1052182
-Node: MSYS1053182
-Node: VMS Installation1053696
-Node: VMS Compilation1054299
-Ref: VMS Compilation-Footnote-11055306
-Node: VMS Installation Details1055364
-Node: VMS Running1056999
-Node: VMS Old Gawk1058606
-Node: Bugs1059080
-Node: Other Versions1062936
-Node: Notes1069020
-Node: Compatibility Mode1069820
-Node: Additions1070603
-Node: Accessing The Source1071530
-Node: Adding Code1072970
-Node: New Ports1079015
-Node: Derived Files1083150
-Ref: Derived Files-Footnote-11088471
-Ref: Derived Files-Footnote-21088505
-Ref: Derived Files-Footnote-31089105
-Node: Future Extensions1089203
-Node: Implementation Limitations1089780
-Node: Extension Design1091032
-Node: Old Extension Problems1092186
-Ref: Old Extension Problems-Footnote-11093694
-Node: Extension New Mechanism Goals1093751
-Ref: Extension New Mechanism Goals-Footnote-11097116
-Node: Extension Other Design Decisions1097302
-Node: Extension Future Growth1099408
-Node: Old Extension Mechanism1100244
-Node: Basic Concepts1101984
-Node: Basic High Level1102665
-Ref: figure-general-flow1102936
-Ref: figure-process-flow1103535
-Ref: Basic High Level-Footnote-11106764
-Node: Basic Data Typing1106949
-Node: Glossary1110304
-Node: Copying1135766
-Node: GNU Free Documentation License1173323
-Node: Index1198460
+Node: Configuration Philosophy1038177
+Node: Non-Unix Installation1040531
+Node: PC Installation1040989
+Node: PC Binary Installation1042288
+Node: PC Compiling1044136
+Node: PC Testing1047080
+Node: PC Using1048256
+Node: Cygwin1052441
+Node: MSYS1053441
+Node: VMS Installation1053955
+Node: VMS Compilation1054558
+Ref: VMS Compilation-Footnote-11055565
+Node: VMS Installation Details1055623
+Node: VMS Running1057258
+Node: VMS Old Gawk1058865
+Node: Bugs1059339
+Node: Other Versions1063195
+Node: Notes1069279
+Node: Compatibility Mode1070079
+Node: Additions1070862
+Node: Accessing The Source1071789
+Node: Adding Code1073229
+Node: New Ports1079274
+Node: Derived Files1083409
+Ref: Derived Files-Footnote-11088730
+Ref: Derived Files-Footnote-21088764
+Ref: Derived Files-Footnote-31089364
+Node: Future Extensions1089462
+Node: Implementation Limitations1090039
+Node: Extension Design1091291
+Node: Old Extension Problems1092445
+Ref: Old Extension Problems-Footnote-11093953
+Node: Extension New Mechanism Goals1094010
+Ref: Extension New Mechanism Goals-Footnote-11097375
+Node: Extension Other Design Decisions1097561
+Node: Extension Future Growth1099667
+Node: Old Extension Mechanism1100503
+Node: Basic Concepts1102243
+Node: Basic High Level1102924
+Ref: figure-general-flow1103195
+Ref: figure-process-flow1103794
+Ref: Basic High Level-Footnote-11107023
+Node: Basic Data Typing1107208
+Node: Glossary1110563
+Node: Copying1136025
+Node: GNU Free Documentation License1173582
+Node: Index1198719
 
 End Tag Table
diff --git a/doc/gawk.texi b/doc/gawk.texi
index 80638e46..ba55737d 100644
--- a/doc/gawk.texi
+++ b/doc/gawk.texi
@@ -34352,6 +34352,14 @@ command line when compiling @command{gawk} from scratch, including:
 
 @table @code
 
+@cindex @code{--disable-extensions} configuration option
+@cindex configuration option, @code{--disable-extensions}
+@item --disable-extensions
+Disable configuring and building the sample extensions in the
+@file{extension} directory. This is useful for cross-compiling.
+The default action is to dynamically check if the extensions
+can be configured and compiled.
+
 @cindex @code{--disable-lint} configuration option
 @cindex configuration option, @code{--disable-lint}
 @item --disable-lint
diff --git a/doc/gawktexi.in b/doc/gawktexi.in
index f385107b..02aa713b 100644
--- a/doc/gawktexi.in
+++ b/doc/gawktexi.in
@@ -33501,6 +33501,14 @@ command line when compiling @command{gawk} from scratch, including:
 
 @table @code
 
+@cindex @code{--disable-extensions} configuration option
+@cindex configuration option, @code{--disable-extensions}
+@item --disable-extensions
+Disable configuring and building the sample extensions in the
+@file{extension} directory. This is useful for cross-compiling.
+The default action is to dynamically check if the extensions
+can be configured and compiled.
+
 @cindex @code{--disable-lint} configuration option
 @cindex configuration option, @code{--disable-lint}
 @item --disable-lint
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