diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | Makefile.in | 6 | ||||
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | extension/ChangeLog | 7 | ||||
| -rw-r--r-- | extension/Makefile.am | 12 | ||||
| -rw-r--r-- | extension/Makefile.in | 12 |
8 files changed, 59 insertions, 4 deletions
@@ -1,3 +1,10 @@ +2013-03-01 Arnold D. Robbins <arnold@skeeve.com> + + * Makefile.am (SUBDIRS): Move extension directory to last in case + building the extensions is not supported. + * configure.ac: Add check for MirBSD and don't even try to run the + checks for DYNAMIC if so. + 2013-02-28 Arnold D. Robbins <arnold@skeeve.com> Cause profiling / pretty printing to include a list of diff --git a/Makefile.am b/Makefile.am index 1f1929a9..844fa2cf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -67,13 +67,15 @@ distcleancheck_listfiles = \ # The order to do things in. # Build explicitly in "." in order to build gawk first, so # that `make check' without a prior `make' works. +# +# Put 'extension' last, in case building the extensions is not supported. SUBDIRS = \ . \ awklib \ doc \ po \ - extension \ - test + test \ + extension # what to make and install bin_PROGRAMS = gawk diff --git a/Makefile.in b/Makefile.in index 3b9963da..0e6723ce 100644 --- a/Makefile.in +++ b/Makefile.in @@ -398,13 +398,15 @@ distcleancheck_listfiles = \ # The order to do things in. # Build explicitly in "." in order to build gawk first, so # that `make check' without a prior `make' works. +# +# Put 'extension' last, in case building the extensions is not supported. SUBDIRS = \ . \ awklib \ doc \ po \ - extension \ - test + test \ + extension include_HEADERS = gawkapi.h @@ -10026,6 +10026,10 @@ $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" if test "x$ac_cv_header_dlfcn_h" = xyes; then : @@ -10108,6 +10112,8 @@ $as_echo "#define DYNAMIC 1" >>confdefs.h fi + ;; +esac case `(uname) 2> /dev/null` in *VMS*|*BeOS*|*OS/2*|*MS-DOS*) diff --git a/configure.ac b/configure.ac index 5b2507e5..2f42f4e7 100644 --- a/configure.ac +++ b/configure.ac @@ -287,6 +287,11 @@ 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 @@ -306,6 +311,8 @@ AC_CHECK_HEADER(dlfcn.h, fi fi ]) + ;; +esac dnl check for how to use getpgrp dnl have to hardwire it for VMS POSIX. Sigh. diff --git a/extension/ChangeLog b/extension/ChangeLog index 291b564d..5eff9782 100644 --- a/extension/ChangeLog +++ b/extension/ChangeLog @@ -1,3 +1,10 @@ +2013-02-26 Arnold D. Robbins <arnold@skeeve.com> + + * Makefile.am (check-recursive, all-recursive): Make dependant upon + check-for-shared-lib-support. + (check-for-shared-lib-support): New target. If gawk doesn't have the + API built-in, don't try to build. + 2013-02-11 Arnold D. Robbins <arnold@skeeve.com> * fnmatch.c: Pull in versions of C routine from missing_d diff --git a/extension/Makefile.am b/extension/Makefile.am index 48d315a9..61e26976 100644 --- a/extension/Makefile.am +++ b/extension/Makefile.am @@ -111,3 +111,15 @@ 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. +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 20a52404..9aa75cee 100644 --- a/extension/Makefile.in +++ b/extension/Makefile.in @@ -1183,6 +1183,18 @@ uninstall-man: uninstall-man3 uninstall-pkgextensionLTLIBRARIES +# 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. +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: |