Fix minor bugs in configure.ac and awkgram.y.

4 files changed, 22 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 2b17e4f7..fb1b247e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-03-27         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* TODO.xgawk: Update to reflect debate about how to support Cygwin
+	and other platforms that cannot link shared libraries with unresolved
+	references.
+	* awkgram.y (add_srcfile): Minor bug fix: reverse sense of test
+	added by Arnold in last patch.
+	* configure.ac: AC_DISABLE_STATIC must come before AC_PROG_LIBTOOL.
+
 2012-03-26         Arnold D. Robbins     <arnold@skeeve.com>
 
 	Some cleanups.
diff --git a/TODO.xgawk b/TODO.xgawk
index 0e30165c..0198a451 100644
--- a/TODO.xgawk
+++ b/TODO.xgawk
@@ -16,8 +16,17 @@ Done:
 
 To do (not necessarily in this order):
 
-- Fix Makefile.am to build gawk as a stub calling into a shared library.
-  This will allow extensions to work on Cygwin and Mingw.
+- Figure out how to support xgawk on platforms such as Cygwin where a DLL
+  cannot be linked with unresolved references.  There are currently 3
+  possible solutions:
+    1. Restructure gawk as a stub calling into a shared library.
+    2. Move a subset of gawk interfaces into a shared library that can be
+       called by extensions.
+    3. Change the interface between gawk and extensions so that gawk will
+       pass a pointer to a structure into dlload that contains the addresses
+       of all variables and functions to which the extension may need access.
+
+- Add valgrind-noleak target.
 
 - Enable default ".awk" search in io.c:find_source().  The simple change
   is to add this code inline in io.c:
diff --git a/awkgram.y b/awkgram.y
index 18e758f9..fb394600 100644
--- a/awkgram.y
+++ b/awkgram.y
@@ -2289,7 +2289,7 @@ add_srcfile(int stype, char *src, SRCFILE *thisfile, int *already_included, int
 			return NULL;
 		}
 		/* use full messages to ease translation */
-		fatal(stype == SRC_EXTLIB
+		fatal(stype != SRC_EXTLIB
 			? _("can't open source file `%s' for reading (%s)")
 			: _("can't open shared library `%s' for reading (%s)"),
 				src,
diff --git a/configure.ac b/configure.ac
index ac9b4d9b..260f0dfa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,8 +67,8 @@ AC_PROG_YACC
 AC_PROG_LN_S
 AC_PROG_CC
 AC_PROG_CPP
-AC_PROG_LIBTOOL
 AC_DISABLE_STATIC
+AC_PROG_LIBTOOL
 
 AC_OBJEXT
 AC_EXEEXT