# vile 9.4c - 2003/11/5 - T.Dickey <dickey@his.com>
# ------------------------------------------------------------------------------
# CHANGES             |   12 ++
# MANIFEST            |    2 
# builtflt.c          |    4 
# configure           |  211 +++++++++++++++++++++++++++++++++++++++-----------
# configure.in        |   65 +++++++++++----
# filters/makefile.in |   14 +--
# filters/mk-1st.awk  |    6 -
# filters/mk-2nd.awk  |   12 +-
# makefile.in         |   79 +++++++++---------
# patchlev.h          |    2 
# revlist             |   24 ++---
# statevar.c          |    8 -
# vile-9.4.spec       |    9 +-
# 13 files changed, 313 insertions(+), 135 deletions(-)
# ------------------------------------------------------------------------------
Index: CHANGES
--- vile-9.4b+/CHANGES	2003-11-02 17:19:48.000000000 -0500
+++ vile-9.4c/CHANGES	2003-11-04 21:09:55.000000000 -0500
@@ -1,5 +1,17 @@
 Changes for vile 9.5 (released ??? ??? ?? ????)
 
+ 20031105 (c)
+ 	> Tom Dickey:
+	+ improved check for dlsym to make loadable filters work on Solaris and
+	  IRIX64.
+	+ make "--disable-echo" apply to making the loadable filters.
+	+ use EXEEXT and OBJEXT in generated makefiles.
+	+ corrected parameter to lookup_filter(); it did not account for the
+	  $filtername symbol, e.g., as used for cshmode to invoke vile-sh-filt.
+	+ corrected ifdef's in cfgopts() used to build xvile's $cfgopts values. 
+	  The ifdef's used "#ifdef" rather than "#if", causing all possible
+	  values to be shown (from 9.3e).
+
  20031102 (b)
 	> Brendan O'Dea:
 	+ add code to support dynamic loading of syntax filters which are
Index: MANIFEST
--- vile-9.4b+/MANIFEST	2003-11-02 18:19:58.000000000 -0500
+++ vile-9.4c/MANIFEST	2003-11-05 20:45:46.000000000 -0500
@@ -1,4 +1,4 @@
-MANIFEST for vile, version v9_4b
+MANIFEST for vile, version v9_4c
 --------------------------------------------------------------------------------
 MANIFEST                        this file
 CHANGES                         Change-log for VILE
Index: builtflt.c
Prereq:  1.33 
--- vile-9.4b+/builtflt.c	2003-11-02 14:29:08.000000000 -0500
+++ vile-9.4c/builtflt.c	2003-11-03 15:45:31.000000000 -0500
@@ -1,7 +1,7 @@
 /*
  * Main program and I/O for external vile syntax/highlighter programs
  *
- * $Header: /usr/build/vile/vile/RCS/builtflt.c,v 1.33 2003/11/02 19:29:08 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/builtflt.c,v 1.34 2003/11/03 20:45:31 tom Exp $
  *
  */
 
@@ -394,7 +394,7 @@
     TRACE(("flt_start(%s)\n", name));
     if (flt_lookup(name)
 #ifdef HAVE_LIBDL
-	&& (current_filter->loaded || load_filter(name))
+	&& (current_filter->loaded || load_filter(current_filter->filter_name))
 #endif
 	) {
 	MARK save_dot;
Index: configure
--- vile-9.4b+/configure	2003-11-02 18:03:27.000000000 -0500
+++ vile-9.4c/configure	2003-11-04 21:12:23.000000000 -0500
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.199 .
+# From configure.in Revision: 1.202 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20030208.
 #
@@ -15358,7 +15358,72 @@
 fi
 
 if test "$VILE_LOADABLE_FILTERS" != none ; then
-	echo "$as_me:15361: checking for dlsym in -ldl" >&5
+	cf_have_dlsym=no
+	cf_have_libdl=no
+
+	echo "$as_me:15364: checking for dlsym" >&5
+echo $ECHO_N "checking for dlsym... $ECHO_C" >&6
+if test "${ac_cv_func_dlsym+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 15370 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char dlsym (); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dlsym ();
+char (*f) ();
+
+int
+main ()
+{
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_dlsym) || defined (__stub___dlsym)
+choke me
+#else
+f = dlsym;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:15401: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:15404: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:15407: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:15410: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_dlsym=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_func_dlsym=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:15420: result: $ac_cv_func_dlsym" >&5
+echo "${ECHO_T}$ac_cv_func_dlsym" >&6
+if test $ac_cv_func_dlsym = yes; then
+  cf_have_dlsym=yes
+else
+
+		echo "$as_me:15426: checking for dlsym in -ldl" >&5
 echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6
 if test "${ac_cv_lib_dl_dlsym+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15366,7 +15431,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 15369 "configure"
+#line 15434 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15385,16 +15450,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15388: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15453: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15391: \$? = $ac_status" >&5
+  echo "$as_me:15456: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15394: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15459: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15397: \$? = $ac_status" >&5
+  echo "$as_me:15462: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dl_dlsym=yes
 else
@@ -15405,44 +15470,102 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15408: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:15473: result: $ac_cv_lib_dl_dlsym" >&5
 echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6
 if test $ac_cv_lib_dl_dlsym = yes; then
 
-		LIBS="-ldl $LIBS"
-		test "$GCC" = yes && CFLAGS="-rdynamic $CFLAGS"
-	cat >conftest.$ac_ext <<_ACEOF
-#line 15415 "configure"
+			cf_have_dlsym=yes
+			cf_have_libdl=yes
+fi
+
+fi
+
+	if test "$cf_have_dlsym" = yes ; then
+		test "$cf_have_libdl" = yes && LIBS="-ldl $LIBS"
+		if test "$GCC" = yes ; then
+
+			# FIXME:  this doesn't work (gcc doesn't give an error
+			# on an unrecognized option).
+			cf_opt_rdynamic=no
+			cf_save_CFLAGS="$CFLAGS"
+			CFLAGS="-Wall -rdynamic $CFLAGS"
+			echo "$as_me:15492: checking if gcc has -rdynamic option" >&5
+echo $ECHO_N "checking if gcc has -rdynamic option... $ECHO_C" >&6
+			cat >conftest.$ac_ext <<_ACEOF
+#line 15495 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+int
+main ()
+{
+printf("Hello");
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:15507: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:15510: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:15513: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:15516: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  cf_opt_rdynamic=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_opt_rdynamic=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+			echo "$as_me:15525: result: $cf_opt_rdynamic" >&5
+echo "${ECHO_T}$cf_opt_rdynamic" >&6
+			test "$cf_opt_rdynamic" = no && CFLAGS="$cf_save_CFLAGS"
+
+			SH_CFLAGS="-fPIC"
+			SH_LDFLAGS="-shared"
+		else
+			# this works for Solaris and IRIX64
+			SH_CFLAGS="-KPIC"
+			SH_LDFLAGS="-G"
+		fi
+
+		cat >conftest.$ac_ext <<_ACEOF
+#line 15538 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int
 main ()
 {
 
-		void *obj;
-		if ((obj = dlopen("filename", RTLD_NOW)) != 0) {
-			if (dlsym(obj, "symbolname") == 0) {
-			dlclose(obj);
+			void *obj;
+			if ((obj = dlopen("filename", RTLD_NOW)) != 0) {
+				if (dlsym(obj, "symbolname") == 0) {
+				dlclose(obj);
+				}
 			}
-		}
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15433: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15556: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15436: \$? = $ac_status" >&5
+  echo "$as_me:15559: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15439: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15562: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15442: \$? = $ac_status" >&5
+  echo "$as_me:15565: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
-		cat >>confdefs.h <<\EOF
+			cat >>confdefs.h <<\EOF
 #define HAVE_LIBDL 1
 EOF
 
@@ -15450,25 +15573,23 @@
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-		{ { echo "$as_me:15453: error: Cannot link test program for libdl" >&5
+			{ { echo "$as_me:15576: error: Cannot link test program for libdl" >&5
 echo "$as_me: error: Cannot link test program for libdl" >&2;}
    { (exit 1); exit 1; }; }
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-
-else
-  { { echo "$as_me:15460: error: Cannot find libdl" >&5
-echo "$as_me: error: Cannot find libdl" >&2;}
+	else
+		{ { echo "$as_me:15582: error: Cannot find dlsym function" >&5
+echo "$as_me: error: Cannot find dlsym function" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+	fi
 fi
 
 for ac_prog in ispell spell
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:15471: checking for $ac_word" >&5
+echo "$as_me:15592: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_SPELL_PROG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15483,7 +15604,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_SPELL_PROG="$ac_prog"
-echo "$as_me:15486: found $ac_dir/$ac_word" >&5
+echo "$as_me:15607: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -15491,10 +15612,10 @@
 fi
 SPELL_PROG=$ac_cv_prog_SPELL_PROG
 if test -n "$SPELL_PROG"; then
-  echo "$as_me:15494: result: $SPELL_PROG" >&5
+  echo "$as_me:15615: result: $SPELL_PROG" >&5
 echo "${ECHO_T}$SPELL_PROG" >&6
 else
-  echo "$as_me:15497: result: no" >&5
+  echo "$as_me:15618: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -15597,7 +15718,7 @@
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:15600: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:15721: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -15773,7 +15894,7 @@
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:15776: error: ambiguous option: $1
+    { { echo "$as_me:15897: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -15792,7 +15913,7 @@
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:15795: error: unrecognized option: $1
+  -*) { { echo "$as_me:15916: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -15850,7 +15971,7 @@
   "filters/makefile.tmp" ) CONFIG_FILES="$CONFIG_FILES filters/makefile.tmp:filters/makefile.2nd" ;;
   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config_h.in" ;;
-  *) { { echo "$as_me:15853: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:15974: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -15997,6 +16118,8 @@
 s,@BUILTLIBS@,$BUILTLIBS,;t t
 s,@FILTER_LIBS@,$FILTER_LIBS,;t t
 s,@LIBBUILTFLT@,$LIBBUILTFLT,;t t
+s,@SH_CFLAGS@,$SH_CFLAGS,;t t
+s,@SH_LDFLAGS@,$SH_LDFLAGS,;t t
 s,@SPELL_PROG@,$SPELL_PROG,;t t
 s,@filters_bindir@,$filters_bindir,;t t
 CEOF
@@ -16113,7 +16236,7 @@
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:16116: creating $ac_file" >&5
+    { echo "$as_me:16239: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -16131,7 +16254,7 @@
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:16134: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:16257: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -16144,7 +16267,7 @@
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:16147: error: cannot find input file: $f" >&5
+           { { echo "$as_me:16270: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -16210,7 +16333,7 @@
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:16213: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:16336: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -16221,7 +16344,7 @@
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:16224: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:16347: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -16234,7 +16357,7 @@
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:16237: error: cannot find input file: $f" >&5
+           { { echo "$as_me:16360: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -16292,7 +16415,7 @@
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
-      { echo "$as_me:16295: $ac_file is unchanged" >&5
+      { echo "$as_me:16418: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
Index: configure.in
Prereq:  1.199 
--- vile-9.4b+/configure.in	2003-11-02 18:00:35.000000000 -0500
+++ vile-9.4c/configure.in	2003-11-04 21:05:25.000000000 -0500
@@ -1,12 +1,12 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Revision: 1.199 $)
+AC_REVISION($Revision: 1.202 $)
 AC_PREREQ(2.13.20020210)
 rm -f config.cache
 
 ### Use "configure -with-screen" to override the default configuration, which is
 ### termcap-based on unix systems.
 
-dnl $Header: /usr/build/vile/vile/RCS/configure.in,v 1.199 2003/11/02 23:00:35 tom Exp $
+dnl $Header: /usr/build/vile/vile/RCS/configure.in,v 1.202 2003/11/05 02:05:25 tom Exp $
 
 define(MAKELIST, sh $srcdir/filters/makelist.sh $srcdir/filters/genmake.mak)
 
@@ -820,21 +820,56 @@
 AC_SUBST(LIBBUILTFLT)
 
 if test "$VILE_LOADABLE_FILTERS" != none ; then
-	AC_CHECK_LIB(dl,dlsym,[
-		LIBS="-ldl $LIBS"
-		test "$GCC" = yes && CFLAGS="-rdynamic $CFLAGS"
-	AC_TRY_LINK([#include <dlfcn.h>],[
-		void *obj;
-		if ((obj = dlopen("filename", RTLD_NOW)) != 0) {
-			if (dlsym(obj, "symbolname") == 0) {
-			dlclose(obj);
-			}
-		}],[
-		AC_DEFINE(HAVE_LIBDL)],[
-		AC_MSG_ERROR(Cannot link test program for libdl)])
-	],[AC_MSG_ERROR(Cannot find libdl)])
+	cf_have_dlsym=no
+	cf_have_libdl=no
+
+	AC_CHECK_FUNC(dlsym,cf_have_dlsym=yes,[
+		AC_CHECK_LIB(dl,dlsym,[
+			cf_have_dlsym=yes
+			cf_have_libdl=yes])])
+
+	if test "$cf_have_dlsym" = yes ; then
+		test "$cf_have_libdl" = yes && LIBS="-ldl $LIBS"
+		if test "$GCC" = yes ; then
+
+			# FIXME:  this doesn't work (gcc doesn't give an error
+			# on an unrecognized option).
+			cf_opt_rdynamic=no
+			cf_save_CFLAGS="$CFLAGS"
+			CFLAGS="-Wall -rdynamic $CFLAGS"
+			AC_MSG_CHECKING(if gcc has -rdynamic option)
+			AC_TRY_LINK([#include <stdio.h>],
+				    [printf("Hello");],
+				    [cf_opt_rdynamic=yes],
+				    [cf_opt_rdynamic=no])
+			AC_MSG_RESULT($cf_opt_rdynamic)
+			test "$cf_opt_rdynamic" = no && CFLAGS="$cf_save_CFLAGS"
+
+			SH_CFLAGS="-fPIC"
+			SH_LDFLAGS="-shared"
+		else
+			# this works for Solaris and IRIX64
+			SH_CFLAGS="-KPIC"
+			SH_LDFLAGS="-G"
+		fi
+
+		AC_TRY_LINK([#include <dlfcn.h>],[
+			void *obj;
+			if ((obj = dlopen("filename", RTLD_NOW)) != 0) {
+				if (dlsym(obj, "symbolname") == 0) {
+				dlclose(obj);
+				}
+			}],[
+			AC_DEFINE(HAVE_LIBDL)],[
+			AC_MSG_ERROR(Cannot link test program for libdl)])
+	else
+		AC_MSG_ERROR(Cannot find dlsym function)
+	fi
 fi
 
+AC_SUBST(SH_CFLAGS)
+AC_SUBST(SH_LDFLAGS)
+
 AC_CHECK_PROGS(SPELL_PROG, ispell spell, [])
 case .$SPELL_PROG in
 .ispell) AC_DEFINE(ISPELL_PROG);;
Index: filters/makefile.in
Prereq:  1.75 
--- vile-9.4b+/filters/makefile.in	2003-11-02 17:56:23.000000000 -0500
+++ vile-9.4c/filters/makefile.in	2003-11-05 19:37:36.000000000 -0500
@@ -1,4 +1,4 @@
-# $Header: /usr/build/vile/vile/filters/RCS/makefile.in,v 1.75 2003/11/02 22:56:23 tom Exp $
+# $Header: /usr/build/vile/vile/filters/RCS/makefile.in,v 1.77 2003/11/06 00:37:36 tom Exp $
 #
 
 #### Start of system configuration section. ####
@@ -17,6 +17,7 @@
 
 EXTRA_CFLAGS	= @EXTRA_CFLAGS@
 CFLAGS		= @CFLAGS@ $(EXTRA_CFLAGS)
+LDFLAGS		= @IMAKE_LOADFLAGS@ @LDFLAGS@
 LIBS		= @LIBS@
 LINT		= @LINT@
 
@@ -27,8 +28,11 @@
 LEXLIB		= @LEXLIB@
 LEX_OUTPUT_ROOT	= @LEX_OUTPUT_ROOT@
 
-x		= @PROG_EXT@
-o		= .o
+SH_CFLAGS	= @SH_CFLAGS@
+SH_LDFLAGS	= @SH_LDFLAGS@
+
+x		= @EXEEXT@
+o		= .@OBJEXT@
 so		= .so
 
 SCREEN		= @SCREEN@
@@ -37,7 +41,7 @@
 prefix		= @prefix@
 exec_prefix	= @exec_prefix@
 
-libdir		= @libdir@/vile
+libdir		= @libdir@
 bindir		= @filters_bindir@
 datadir		= @datadir@/vile
 
@@ -49,8 +53,6 @@
 QUOTDEFS	= -DVILE_STARTUP_PATH=\"@VILE_STARTUP_PATH@\"
 CPPFLAGS	= -I. -I.. -I$(srcdir) -I$(top_srcdir) -DHAVE_CONFIG_H @CPPFLAGS@
 
-LDFLAGS		= @IMAKE_LOADFLAGS@ @LDFLAGS@
-
 DESTDIR		=
 BINDIR		= $(DESTDIR)$(bindir)
 LIBDIR		= $(DESTDIR)$(libdir)
Index: filters/mk-1st.awk
Prereq:  1.9 
--- vile-9.4b+/filters/mk-1st.awk	2003-11-02 17:22:24.000000000 -0500
+++ vile-9.4c/filters/mk-1st.awk	2003-11-05 19:38:29.000000000 -0500
@@ -1,4 +1,4 @@
-# $Header: /usr/build/vile/vile/filters/RCS/mk-1st.awk,v 1.9 2003/11/02 22:22:24 tom Exp $
+# $Header: /usr/build/vile/vile/filters/RCS/mk-1st.awk,v 1.10 2003/11/06 00:38:29 tom Exp $
 #
 # Generate makefile lists for vile's external and built-in filters.  We will
 # build each filter only one way (external _or_ built-in).  This script uses
@@ -68,7 +68,7 @@
 	    } else {
 		dump_list("%s", "C_DYN", prog, ".c");
 		dump_list("%s", "LEX_DYN", prog, ".l");
-		dump_list("$(LIBDIR)/%s", "INSTALL_DYN_C", prog, ".c");
-		dump_list("$(LIBDIR)/%s", "INSTALL_DYN_LEX", prog, ".l");
+		dump_list("$(BINDIR)/%s", "INSTALL_DYN_C", prog, ".c");
+		dump_list("$(BINDIR)/%s", "INSTALL_DYN_LEX", prog, ".l");
 	    }
 	}
Index: filters/mk-2nd.awk
Prereq:  1.10 
--- vile-9.4b+/filters/mk-2nd.awk	2003-11-02 17:22:24.000000000 -0500
+++ vile-9.4c/filters/mk-2nd.awk	2003-11-05 19:38:42.000000000 -0500
@@ -1,4 +1,4 @@
-# $Header: /usr/build/vile/vile/filters/RCS/mk-2nd.awk,v 1.10 2003/11/02 22:22:24 tom Exp $
+# $Header: /usr/build/vile/vile/filters/RCS/mk-2nd.awk,v 1.12 2003/11/06 00:38:42 tom Exp $
 #
 # Generate makefile rules for vile's external and built-in filters.  We will
 # build each filter only one way, to avoid conflict with the generated files. 
@@ -95,22 +95,22 @@
 			printf "\t@echo compiling %s\n", file[i]
 		    if (type[i] == "l") {
 			printf "\t%s$(LEX) -P%s_ -t %s/%s > %s.c\n", show, name[i], from, file[i], root[i]
-			printf "\t%s$(CC) -c -fPIC $(CPPFLAGS) $(CFLAGS) -Dfilter_def=define_%s %s/%s.c\n", show, name[i], ".", root[i]
-			printf "\t%s $(RM) %s.c\n", show, root[i]
+			printf "\t%s$(CC) -c $(SH_CFLAGS) $(CPPFLAGS) $(CFLAGS) -Dfilter_def=define_%s %s/%s.c\n", show, name[i], ".", root[i]
+			printf "\t%s-$(RM) %s.c\n", show, root[i]
 		    } else {
-			printf "\t%s$(CC) -c -fPIC $(CPPFLAGS) $(CFLAGS) -Dfilter_def=define_%s %s/%s.c\n", show, name[i], from, root[i]
+			printf "\t%s$(CC) -c $(SH_CFLAGS) $(CPPFLAGS) $(CFLAGS) -Dfilter_def=define_%s %s/%s.c\n", show, name[i], from, root[i]
 		    }
 		}
 		print ""
 		for (i = 0; i < count; i++) {
 		    printf "%s : %s$o\n", prog[i], root[i]
-		    printf "\t$(LINK) $(LDFLAGS) -o $@ -shared $?\n"
+		    printf "\t%s$(LINK) $(LDFLAGS) -o $@ $(SH_LDFLAGS) $?\n", show
 		    print ""
 		}
 		print "# dependency-rules for install/installdirs (%s)", mode
 		for (i = 0; i < count; i++) {
 		    src = prog[i];
-		    dst = sprintf("$(LIBDIR)/%s", src);
+		    dst = sprintf("$(BINDIR)/%s", src);
 		    printf "%s :\t%s\t\t; $(INSTALL_PROGRAM) $? $@\n", dst, src
 		}
 	    }
Index: makefile.in
Prereq:  1.188 
--- vile-9.4b+/makefile.in	2003-11-02 18:13:28.000000000 -0500
+++ vile-9.4c/makefile.in	2003-11-03 18:55:50.000000000 -0500
@@ -20,7 +20,7 @@
 #
 # gnu autoconf support by kevin buettner, 5/94
 #
-# $Header: /usr/build/vile/vile/RCS/makefile.in,v 1.188 2003/11/02 23:13:28 tom Exp $
+# $Header: /usr/build/vile/vile/RCS/makefile.in,v 1.189 2003/11/03 23:55:50 tom Exp $
 
 SHELL		= /bin/sh
 
@@ -43,7 +43,8 @@
 LIBS		= @FILTER_LIBS@ @LIBS@
 LINT		= @LINT@
 
-x		= @PROG_EXT@
+x		= @EXEEXT@
+o		= .@OBJEXT@
 
 X_LIBS		= @X_LIBS@
 
@@ -90,12 +91,12 @@
 
 INSTALL_DIRS    = $(BINDIR) $(DATADIR) $(MANDIR) @EXTRA_INSTALL_DIRS@
 
-.SUFFIXES: .c .i .o
+.SUFFIXES: .c .i $o
 
 .c.i:
 @RULE_CC@
 	@ECHO_CC@$(CPP) -C $(CPPFLAGS) $(QUOTDEFS) $< >$@
-.c.o:
+.c$o:
 @RULE_CC@
 	@ECHO_CC@$(CC) -c $(CPPFLAGS) $(QUOTDEFS) $(CFLAGS) -DHELP_LOC=\"$(datadir)\" $<
 
@@ -273,15 +274,15 @@
 #	spawn.o
 #	statevar.o
 #	ucrypt.o
-OBJ = $(SCREEN).o \
-	main.o basic.o bind.o buffer.o csrch.o \
-	display.o dumbterm.o eval.o exec.o externs.o fences.o file.o \
-	filec.o fileio.o finderr.o glob.o globals.o \
-	input.o insert.o itbuff.o lckfiles.o line.o map.o \
-	modes.o msgs.o oneliner.o opers.o path.o random.o \
-	regexp.o region.o search.o tags.o \
-	tbuff.o termio.o undo.o version.o \
-	watch.o window.o word.o wordmov.o @EXTRAOBJS@
+OBJ = $(SCREEN)$o \
+	main$o basic$o bind$o buffer$o csrch$o \
+	display$o dumbterm$o eval$o exec$o externs$o fences$o file$o \
+	filec$o fileio$o finderr$o glob$o globals$o \
+	input$o insert$o itbuff$o lckfiles$o line$o map$o \
+	modes$o msgs$o oneliner$o opers$o path$o random$o \
+	regexp$o region$o search$o tags$o \
+	tbuff$o termio$o undo$o version$o \
+	watch$o window$o word$o wordmov$o @EXTRAOBJS@
 
 ALL =	$(TARGET)
 
@@ -328,7 +329,7 @@
 nemode.h:	modetbl $(MKTBLS)
 	$(MKTBLS) $(srcdir)/modetbl
 
-builtflt.o :	builtflt.h
+builtflt$o :	builtflt.h
 
 builtflt.h :
 	$(AWK) -f $(srcdir)/filters/mk-0th.awk <$(srcdir)/filters/genmake.mak static="@VILE_BUILT_IN_FILTERS@" dynamic="@VILE_LOADABLE_FILTERS@" >$@
@@ -600,30 +601,30 @@
 
 $(OBJ): estruct.h nemode.h edef.h neproto.h proto.h config.h
 
-api.o:		api.h
-bind.o:		nefunc.h btree.h
-btree.o:	btree.h
-eval.o:		nevars.h
-exec.o:		neexec.h nefunc.h
-externs.o:	nebind.h nename.h neproto.h nefunc.h
-filec.o:	dirstuff.h
-glob.o:		dirstuff.h
-globals.o:	nefunc.h
-main.o:		chgdfunc.h nevars.h
-modes.o:	chgdfunc.h nefsms.h
-opers.o:	nefunc.h
-path.o:		dirstuff.h
-perl.o:		api.h
-random.o:	nefunc.h
-select.o:	nefunc.h
-statevar.o:	nevars.h
-spawn.o:	nefunc.h
-tags.o:		btree.h
-tcap.o:		tcap.h
-termio.o:	nefunc.h
-version.o:	patchlev.h
-word.o:		nefunc.h
-x11.o:		nefunc.h
+api$o :		api.h
+bind$o :	nefunc.h btree.h
+btree$o :	btree.h
+eval$o :	nevars.h
+exec$o :	neexec.h nefunc.h
+externs$o :	nebind.h nename.h neproto.h nefunc.h
+filec$o :	dirstuff.h
+glob$o :	dirstuff.h
+globals$o :	nefunc.h
+main$o :	chgdfunc.h nevars.h
+modes$o :	chgdfunc.h nefsms.h
+opers$o :	nefunc.h
+path$o :	dirstuff.h
+perl$o :	api.h
+random$o :	nefunc.h
+select$o :	nefunc.h
+statevar$o :	nevars.h
+spawn$o :	nefunc.h
+tags$o :	btree.h
+tcap$o :	tcap.h
+termio$o :	nefunc.h
+version$o :	patchlev.h
+word$o :	nefunc.h
+x11$o :		nefunc.h
 
 test_btree$x:	btree.c
 	$(CC) -o $@ -DDEBUG_BTREE $(CPPFLAGS) $(CFLAGS) btree.c $(LDFLAGS)
@@ -735,6 +736,6 @@
 ALWAYS:
 
 depend : $(BUILTHDRS) $(OBJ)
-	makedepend $(CPPFLAGS) -- $(CFLAGS) -- `echo $(OBJ) | sed -e 's/\.o/.c/g'`
+	makedepend $(CPPFLAGS) -- $(CFLAGS) -- `echo $(OBJ) | sed -e 's/\.@OBJEXT@/.c/g'`
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
Index: patchlev.h
--- vile-9.4b+/patchlev.h	2003-11-02 11:47:35.000000000 -0500
+++ vile-9.4c/patchlev.h	2003-11-04 21:10:14.000000000 -0500
@@ -1,2 +1,2 @@
 /* set to "" for no patches */
-#define PATCHLEVEL "b"
+#define PATCHLEVEL "c"
Index: revlist
--- vile-9.4b+/revlist	2003-11-02 20:41:26.000000000 -0500
+++ vile-9.4c/revlist	2003-11-05 20:45:18.000000000 -0500
@@ -1,6 +1,6 @@
-revlist for vile, version v9_4b
+revlist for vile, version v9_4c
 --------------------------------------------------------------------------------
-CHANGES	1.732
+CHANGES	1.733
 CHANGES.R3	1.1
 CHANGES.R4	1.1
 CHANGES.R5	1.1
@@ -24,13 +24,13 @@
 btree.h	1.4
 buffer.c	1.263
 buglist	1.398
-builtflt.c	1.33
+builtflt.c	1.34
 chgdfunc.h	1.16
 cmdtbl	1.228
 config.emx	1.2
 config_h.in	1.2
 configure	none
-configure.in	1.199
+configure.in	1.202
 csrch.c	1.31
 curses.c	1.20
 descrip.mms	1.44
@@ -65,7 +65,7 @@
 makefile.djg	1.32
 makefile.emx	1.5
 makefile.icc	1.13
-makefile.in	1.188
+makefile.in	1.189
 makefile.tbc	1.24
 makefile.wat	1.26
 makefile.wnt	1.76
@@ -85,7 +85,7 @@
 os2keys.h	1.1
 os2pipe.c	1.5
 os2vio.c	1.29
-patchlev.h	1.306
+patchlev.h	1.307
 path.c	1.135
 perl.xs	1.89
 proto.h	1.521
@@ -94,12 +94,12 @@
 random.c	1.272
 regexp.c	1.107
 region.c	1.126
-revlist	v9_4b
+revlist	v9_4c
 search.c	1.134
 select.c	1.147
 sinstall.sh	1.1
 spawn.c	1.178
-statevar.c	1.75
+statevar.c	1.76
 tags.c	1.120
 tbuff.c	1.44
 tcap.c	1.152
@@ -110,7 +110,7 @@
 ucrypt.c	1.15
 undo.c	1.84
 version.c	1.55
-vile-9.4.spec	1.3
+vile-9.4.spec	1.4
 vile.1	1.30
 vile.hlp	1.568
 vile.wmconfig	1.1
@@ -221,16 +221,16 @@
 filters/makefile.djg	1.3
 filters/makefile.emx	1.4
 filters/makefile.icc	1.3
-filters/makefile.in	1.75
+filters/makefile.in	1.77
 filters/makefile.wnt	1.30
 filters/makefilt.l	1.49
 filters/makelist.sh	1.3
 filters/manfilt.c	1.35
 filters/mk-0th.awk	1.7
 filters/mk-0th.bat	1.6
-filters/mk-1st.awk	1.9
+filters/mk-1st.awk	1.10
 filters/mk-1st.bat	1.6
-filters/mk-2nd.awk	1.10
+filters/mk-2nd.awk	1.12
 filters/mk-2nd.bat	1.6
 filters/mk-key.awk	1.2
 filters/mms-filt.l	1.9
Index: statevar.c
Prereq:  1.75 
--- vile-9.4b+/statevar.c	2003-07-27 13:11:36.000000000 -0400
+++ vile-9.4c/statevar.c	2003-11-03 15:34:05.000000000 -0500
@@ -3,7 +3,7 @@
  *	for getting and setting the values of the vile state variables,
  *	plus helper utility functions.
  *
- * $Header: /usr/build/vile/vile/RCS/statevar.c,v 1.75 2003/07/27 17:11:36 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/statevar.c,v 1.76 2003/11/03 20:34:05 tom Exp $
  */
 
 #include	"estruct.h"
@@ -345,13 +345,13 @@
 # endif
 #endif
 #if DISP_X11
-# ifdef OL_WIDGETS
+# if OL_WIDGETS
 	"openlook",
 # endif
-# ifdef MOTIF_WIDGETS
+# if MOTIF_WIDGETS
 	"motif",
 # endif
-# ifdef ATHENA_WIDGETS
+# if ATHENA_WIDGETS
 	"athena",
 #  ifdef HAVE_LIB_XAW
 	"xaw",
Index: vile-9.4.spec
Prereq:  1.3 
--- vile-9.4b+/vile-9.4.spec	2003-11-02 11:46:59.000000000 -0500
+++ vile-9.4c/vile-9.4.spec	2003-11-04 21:10:52.000000000 -0500
@@ -1,7 +1,7 @@
 Summary: VILE VI Like Emacs editor
-# $Header: /usr/build/vile/vile/RCS/vile-9.4.spec,v 1.3 2003/11/02 16:46:59 tom Exp $
+# $Header: /usr/build/vile/vile/RCS/vile-9.4.spec,v 1.4 2003/11/05 02:10:52 tom Exp $
 Name: vile
-Version: 9.4b
+Version: 9.4c
 # each patch should update the version
 Release: 1
 Copyright: GPL
@@ -10,6 +10,7 @@
 Source0: vile-9.4.tgz
 Patch1: vile-9.4a.patch.gz
 Patch2: vile-9.4b.patch.gz
+Patch3: vile-9.4c.patch.gz
 # each patch should add itself to this list
 Packager: Thomas Dickey <dickey@invisible-island.net>
 BuildRoot: %{_tmppath}/%{name}-root
@@ -24,6 +25,7 @@
 %setup -q -n vile-9.4
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 # each patch should add itself to this list
 
 %build
@@ -71,6 +73,9 @@
 %changelog
 # each patch should add its ChangeLog entries here
 
+* Tue Nov 04 2003 Thomas Dickey
+- added patch for 9.4c
+
 * Sun Nov 02 2003 Thomas Dickey
 - added patch for 9.4b