Pre-0.27 'c' snapshot.

(This is a retrospective comment.)

diff --git a/Makefile.in b/Makefile.in
index c811bef90c1620a2600ca31788fb106cb2662e0d..ff864a8e8255331baa9ba741a66a98e4f34706c9 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -28,6 +28,8 @@ incdir = @includedir@/$(ick_specific_subdir)
 infodir = @infodir@
 # Directory to install manpages in.
 mandir = @mandir@
+# Directory file for Info installation.
+infodirfile = @INFODIRFILE@
 
 # This can be overridden from the command line
 DESTDIR=
@@ -213,7 +215,9 @@ install-common: all
        -mkdir -p $(DESTDIR)$(infodir)
        rm -f $(DESTDIR)$(infodir)/ick.info
        cp doc/ick.inf $(DESTDIR)$(infodir)
-       (mv $(DESTDIR)$(infodir)/ick.inf $(DESTDIR)$(infodir)/ick.info && @INSTALLINFO@ --quiet $(DESTDIR)$(infodir)/ick.info) || @INSTALLINFO@ --quiet $(DESTDIR)$(infodir)/ick.inf
+       mv $(DESTDIR)$(infodir)/ick.inf $(DESTDIR)$(infodir)/ick.info
+       sh -c "(test -f $(DESTDIR)$(infodir)/ick.info && @INSTALLINFO@ --quiet $(DESTDIR)$(infodir)/ick.info $(infodirfile)) || true"
+       sh -c "(test -f $(DESTDIR)$(infodir)/ick.inf && @INSTALLINFO@ --quiet $(DESTDIR)$(infodir)/ick.inf $(infodirfile)) || true"
 # Note that it's necessary to copy the info file to .inf on an 8.3 system
 # and .info otherwise; this is done by copying it to .inf, and then renaming
 # to .info; on an 8.3 system, this leaves the extension as .inf because mv
@@ -228,21 +232,22 @@ install: install-common
        -gzip -9 -f $(DESTDIR)$(infodir)/ick.i*[fo]
        -gzip -9 -f $(DESTDIR)$(mandir)/man1/ick.1
        -gzip -9 -f $(DESTDIR)$(mandir)/man1/convickt.1
-       @MANDB@ -q
+       sh -c "@MANDB@ -q"
 
 # install without gzipping the docs
 install-nozip: install-common
-       @MANDB@ -q
+       sh -c "@MANDB@ -q"
 
 uninstall:
-       @INSTALLINFO@ --quiet --remove ick
+       sh -c "@INSTALLINFO@ --quiet --remove ick $(infodirfile)"
        rm -f $(DESTDIR)$(bindir)/ick@EXEEXT@ $(DESTDIR)$(libdir)/libick.a
+       rm -f $(DESTDIR)$(bindir)/convickt@EXEEXT@
        rm -f $(DESTDIR)$(libdir)/libickmt.a $(DESTDIR)$(libdir)/libyuk.a
        rm -f ${DESTDIR}${infodir}/ick.i*
        rm -f $(DESTDIR)$(mandir)/man1/ick.1*
        rm -f $(DESTDIR)$(mandir)/man1/convickt.1*
        rm -fr $(DESTDIR)$(incdir) $(DESTDIR)$(datadir)
-       @MANDB@ -q
+       sh -c "@MANDB@ -q"
 
 TAGS: $(SOURCES)
        etags $(SOURCES)

diff --git a/cleanick.bat b/cleanick.bat
index 5a77cf0e53f91c37c7fcc36ffdb035184cb5a9d4..d8e3f6244992306fa9ed6edf95f613062bd88d46 100755 (executable)
--- a/cleanick.bat
+++ b/cleanick.bat
@@ -12,3 +12,6 @@ del /Q temp\*.l
 del /Q temp\*.bat\r
 del /Q temp\*.sh\r
 del /Q temp\*.exe\r
+del /Q temp\*.bin\r
+del /Q temp\*.in\r
+del /Q temp\*.oil\r

diff --git a/cleanick.sh b/cleanick.sh
index 176c2c37b9ec47881ac16f6dff4d411037372fcf..e6f5b62bcaecf3a72e099f92644a4e19d8dece09 100755 (executable)
--- a/cleanick.sh
+++ b/cleanick.sh
@@ -14,6 +14,9 @@ rm -f temp/*.l
 rm -f temp/*.bat
 rm -f temp/*.sh
 rm -f temp/*.exe
+rm -f temp/*.bin
+rm -f temp/*.in
+rm -f temp/*.oil
 rm -f temp/*~
 rm -f src/*~
 rm -f *~
\ No newline at end of file

diff --git a/config.in b/config.in
index 670bcb3cde38d23db0ea5592ea3ab01a00e490e7..59b23fc26e41d88de5a52e13fe8e2d5b8f77f84a 100644 (file)
--- a/config.in
+++ b/config.in
@@ -13,6 +13,35 @@ AC_PROG_RANLIB
 AC_CHECK_PROGS(INSTALLINFO,install-info,:)
 AC_CHECK_PROGS(MANDB,mandb,:)
 
+dnl Check the location of the Info dir file if we have install-info
+if test ! INSTALLINFO = ":"; then
+AC_MSG_CHECKING(the location of the Info dir file)
+# Try the following locations in order:
+INFODIRFILELOCATIONGUESSES=${infodir}/dir
+INFODIRFILELOCATIONGUESSES="${INFODIRFILELOCATIONGUESSES} ${infodir}/dir.gz"
+INFODIRFILELOCATIONGUESSES="${INFODIRFILELOCATIONGUESSES} /dev/env/DJDIR/info/dir"
+INFODIRFILELOCATIONGUESSES="${INFODIRFILELOCATIONGUESSES} /dev/env/DJDIR/info/dir.gz"
+INFODIRFILELOCATIONGUESSES="${INFODIRFILELOCATIONGUESSES} /usr/share/info/dir"
+INFODIRFILELOCATIONGUESSES="${INFODIRFILELOCATIONGUESSES} /usr/share/info/dir.gz"
+INFODIRFILELOCATIONGUESSES="${INFODIRFILELOCATIONGUESSES} /usr/local/share/info/dir"
+INFODIRFILELOCATIONGUESSES="${INFODIRFILELOCATIONGUESSES} /usr/local/share/info/dir.gz"
+for my_ac_infodirfile in ${INFODIRFILELOCATIONGUESSES}
+do
+INFODIRFILE=${my_ac_infodirfile}
+test -f "$INFODIRFILE" && break
+INFODIRFILE=/dev/null
+done
+if test $INFODIRFILE = /dev/null; then
+AC_MSG_RESULT(not found)
+AC_MSG_WARN([Could not find Info directory file, set infodirfile in the Makefile by hand])
+else
+AC_MSG_RESULT($INFODIRFILE)
+fi
+else
+INFODIRFILE=(irrelevant)
+fi
+AC_SUBST(INFODIRFILE)
+
 dnl Checks for libraries.
 
 dnl Checks for header files.
@@ -58,4 +87,4 @@ AC_SUBST(PACKAGE_VERSION)
 
 AC_OUTPUT(Makefile temp/coopt.sh:src/cooptsh.in)
 dnl After the output, chmod coopt.sh to be executable.
-chmod a+x temp/coopt.sh
\ No newline at end of file
+chmod a+x temp/coopt.sh

diff --git a/configdj.sh b/configdj.sh
index 6a7bd2a7ea7988904094d9eb482bd4f33fd4b6c1..3212a1b4a689df8474cb79ce3858987eeafbd3cb 100755 (executable)
--- a/configdj.sh
+++ b/configdj.sh
@@ -877,10 +877,79 @@ test -n "$INSTALLINFO" && break
 done\r
 test -n "$INSTALLINFO" || INSTALLINFO=":"\r
 \r
+for ac_prog in mandb\r
+do\r
+# Extract the first word of "$ac_prog", so it can be a program name with args.\r
+set dummy $ac_prog; ac_word=$2\r
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6\r
+echo "configure:886: checking for $ac_word" >&5\r
+if eval "test \"`echo '$''{'ac_cv_prog_MANDB'+set}'`\" = set"; then\r
+  echo $ac_n "(cached) $ac_c" 1>&6\r
+else\r
+  if test -n "$MANDB"; then\r
+  ac_cv_prog_MANDB="$MANDB" # Let the user override the test.\r
+else\r
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"\r
+  ac_test_flag="-f"\r
+  if ! test -z "$COMSPEC$ComSpec"; then\r
+    ac_test_flag="-x"\r
+    IFS="${PATH_SEPARATOR-;}"\r
+  fi\r
+  ac_dummy="$PATH"\r
+  for ac_dir in $ac_dummy; do\r
+    test -z "$ac_dir" && ac_dir=.\r
+    if test $ac_test_flag $ac_dir/$ac_word; then\r
+      ac_cv_prog_MANDB="$ac_prog"\r
+      break\r
+    fi\r
+  done\r
+  IFS="$ac_save_ifs"\r
+fi\r
+fi\r
+MANDB="$ac_cv_prog_MANDB"\r
+if test -n "$MANDB"; then\r
+  echo "$ac_t""$MANDB" 1>&6\r
+else\r
+  echo "$ac_t""no" 1>&6\r
+fi\r
+\r
+test -n "$MANDB" && break\r
+done\r
+test -n "$MANDB" || MANDB=":"\r
+\r
+\r
+if test ! INSTALLINFO = ":"; then\r
+echo $ac_n "checking the location of the Info dir file""... $ac_c" 1>&6\r
+echo "configure:924: checking the location of the Info dir file" >&5\r
+# Try the following locations in order:\r
+INFODIRFILELOCATIONGUESSES=${infodir}/dir\r
+INFODIRFILELOCATIONGUESSES="${INFODIRFILELOCATIONGUESSES} ${infodir}/dir.gz"\r
+INFODIRFILELOCATIONGUESSES="${INFODIRFILELOCATIONGUESSES} /dev/env/DJDIR/info/dir"\r
+INFODIRFILELOCATIONGUESSES="${INFODIRFILELOCATIONGUESSES} /dev/env/DJDIR/info/dir.gz"\r
+INFODIRFILELOCATIONGUESSES="${INFODIRFILELOCATIONGUESSES} /usr/share/info/dir"\r
+INFODIRFILELOCATIONGUESSES="${INFODIRFILELOCATIONGUESSES} /usr/share/info/dir.gz"\r
+INFODIRFILELOCATIONGUESSES="${INFODIRFILELOCATIONGUESSES} /usr/local/share/info/dir"\r
+INFODIRFILELOCATIONGUESSES="${INFODIRFILELOCATIONGUESSES} /usr/local/share/info/dir.gz"\r
+for my_ac_infodirfile in ${INFODIRFILELOCATIONGUESSES}\r
+do\r
+INFODIRFILE=${my_ac_infodirfile}\r
+test -f "$INFODIRFILE" && break\r
+INFODIRFILE=/dev/null\r
+done\r
+if test $INFODIRFILE = /dev/null; then\r
+echo "$ac_t""not found" 1>&6\r
+echo "configure: warning: Could not find Info directory file, set infodirfile in the Makefile by hand" 1>&2\r
+else\r
+echo "$ac_t""$INFODIRFILE" 1>&6\r
+fi\r
+else\r
+INFODIRFILE=(irrelevant)\r
+fi\r
+\r
 \r
 \r
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6\r
-echo "configure:884: checking how to run the C preprocessor" >&5\r
+echo "configure:953: checking how to run the C preprocessor" >&5\r
 # On Suns, sometimes $CPP names a directory.\r
 if test -n "$CPP" && test -d "$CPP"; then\r
   CPP=\r
@@ -895,13 +964,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,\r
   # not just through cpp.\r
   cat > conftest.$ac_ext <<EOF\r
-#line 899 "configure"\r
+#line 968 "configure"\r
 #include "confdefs.h"\r
 #include <assert.h>\r
 Syntax Error\r
 EOF\r
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"\r
-{ (eval echo configure:905: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }\r
+{ (eval echo configure:974: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }\r
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`\r
 if test -z "$ac_err"; then\r
   :\r
@@ -912,13 +981,13 @@ else
   rm -rf conftest*\r
   CPP="${CC-cc} -E -traditional-cpp"\r
   cat > conftest.$ac_ext <<EOF\r
-#line 916 "configure"\r
+#line 985 "configure"\r
 #include "confdefs.h"\r
 #include <assert.h>\r
 Syntax Error\r
 EOF\r
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"\r
-{ (eval echo configure:922: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }\r
+{ (eval echo configure:991: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }\r
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`\r
 if test -z "$ac_err"; then\r
   :\r
@@ -929,13 +998,13 @@ else
   rm -rf conftest*\r
   CPP="${CC-cc} -nologo -E"\r
   cat > conftest.$ac_ext <<EOF\r
-#line 933 "configure"\r
+#line 1002 "configure"\r
 #include "confdefs.h"\r
 #include <assert.h>\r
 Syntax Error\r
 EOF\r
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"\r
-{ (eval echo configure:939: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }\r
+{ (eval echo configure:1008: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }\r
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`\r
 if test -z "$ac_err"; then\r
   :\r
@@ -960,12 +1029,12 @@ fi
 echo "$ac_t""$CPP" 1>&6\r
 \r
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6\r
-echo "configure:964: checking for ANSI C header files" >&5\r
+echo "configure:1033: checking for ANSI C header files" >&5\r
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then\r
   echo $ac_n "(cached) $ac_c" 1>&6\r
 else\r
   cat > conftest.$ac_ext <<EOF\r
-#line 969 "configure"\r
+#line 1038 "configure"\r
 #include "confdefs.h"\r
 #include <stdlib.h>\r
 #include <stdarg.h>\r
@@ -973,7 +1042,7 @@ else
 #include <float.h>\r
 EOF\r
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"\r
-{ (eval echo configure:977: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }\r
+{ (eval echo configure:1046: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }\r
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`\r
 if test -z "$ac_err"; then\r
   rm -rf conftest*\r
@@ -990,7 +1059,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then\r
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.\r
 cat > conftest.$ac_ext <<EOF\r
-#line 994 "configure"\r
+#line 1063 "configure"\r
 #include "confdefs.h"\r
 #include <string.h>\r
 EOF\r
@@ -1008,7 +1077,7 @@ fi
 if test $ac_cv_header_stdc = yes; then\r
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.\r
 cat > conftest.$ac_ext <<EOF\r
-#line 1012 "configure"\r
+#line 1081 "configure"\r
 #include "confdefs.h"\r
 #include <stdlib.h>\r
 EOF\r
@@ -1029,7 +1098,7 @@ if test "$cross_compiling" = yes; then
   :\r
 else\r
   cat > conftest.$ac_ext <<EOF\r
-#line 1033 "configure"\r
+#line 1102 "configure"\r
 #include "confdefs.h"\r
 #include <ctype.h>\r
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')\r
@@ -1040,7 +1109,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }\r
 \r
 EOF\r
-if { (eval echo configure:1044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null\r
+if { (eval echo configure:1113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null\r
 then\r
   :\r
 else\r
@@ -1067,17 +1136,17 @@ for ac_hdr in sys/time.h unistd.h
 do\r
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`\r
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6\r
-echo "configure:1071: checking for $ac_hdr" >&5\r
+echo "configure:1140: checking for $ac_hdr" >&5\r
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then\r
   echo $ac_n "(cached) $ac_c" 1>&6\r
 else\r
   cat > conftest.$ac_ext <<EOF\r
-#line 1076 "configure"\r
+#line 1145 "configure"\r
 #include "confdefs.h"\r
 #include <$ac_hdr>\r
 EOF\r
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"\r
-{ (eval echo configure:1081: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }\r
+{ (eval echo configure:1150: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }\r
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`\r
 if test -z "$ac_err"; then\r
   rm -rf conftest*\r
@@ -1105,12 +1174,12 @@ done
 \r
 \r
 echo $ac_n "checking for working const""... $ac_c" 1>&6\r
-echo "configure:1109: checking for working const" >&5\r
+echo "configure:1178: checking for working const" >&5\r
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then\r
   echo $ac_n "(cached) $ac_c" 1>&6\r
 else\r
   cat > conftest.$ac_ext <<EOF\r
-#line 1114 "configure"\r
+#line 1183 "configure"\r
 #include "confdefs.h"\r
 \r
 int main() {\r
@@ -1159,7 +1228,7 @@ ccp = (char const *const *) p;
 \r
 ; return 0; }\r
 EOF\r
-if { (eval echo configure:1163: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then\r
+if { (eval echo configure:1232: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then\r
   rm -rf conftest*\r
   ac_cv_c_const=yes\r
 else\r
@@ -1180,7 +1249,7 @@ EOF
 fi\r
 \r
 echo $ac_n "checking size of long long int""... $ac_c" 1>&6\r
-echo "configure:1184: checking size of long long int" >&5\r
+echo "configure:1253: checking size of long long int" >&5\r
 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long_int'+set}'`\" = set"; then\r
   echo $ac_n "(cached) $ac_c" 1>&6\r
 else\r
@@ -1188,7 +1257,7 @@ else
   ac_cv_sizeof_long_long_int=0\r
 else\r
   cat > conftest.$ac_ext <<EOF\r
-#line 1192 "configure"\r
+#line 1261 "configure"\r
 #include "confdefs.h"\r
 #include <stdio.h>\r
 main()\r
@@ -1199,7 +1268,7 @@ main()
   exit(0);\r
 }\r
 EOF\r
-if { (eval echo configure:1203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null\r
+if { (eval echo configure:1272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null\r
 then\r
   ac_cv_sizeof_long_long_int=`cat conftestval`\r
 else\r
@@ -1219,7 +1288,7 @@ EOF
 \r
 \r
 echo $ac_n "checking size of _Bool""... $ac_c" 1>&6\r
-echo "configure:1223: checking size of _Bool" >&5\r
+echo "configure:1292: checking size of _Bool" >&5\r
 if eval "test \"`echo '$''{'ac_cv_sizeof__Bool'+set}'`\" = set"; then\r
   echo $ac_n "(cached) $ac_c" 1>&6\r
 else\r
@@ -1227,7 +1296,7 @@ else
   ac_cv_sizeof__Bool=0\r
 else\r
   cat > conftest.$ac_ext <<EOF\r
-#line 1231 "configure"\r
+#line 1300 "configure"\r
 #include "confdefs.h"\r
 #include <stdio.h>\r
 main()\r
@@ -1238,7 +1307,7 @@ main()
   exit(0);\r
 }\r
 EOF\r
-if { (eval echo configure:1242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null\r
+if { (eval echo configure:1311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null\r
 then\r
   ac_cv_sizeof__Bool=`cat conftestval`\r
 else\r
@@ -1258,12 +1327,12 @@ EOF
 \r
 \r
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6\r
-echo "configure:1262: checking whether time.h and sys/time.h may both be included" >&5\r
+echo "configure:1331: checking whether time.h and sys/time.h may both be included" >&5\r
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then\r
   echo $ac_n "(cached) $ac_c" 1>&6\r
 else\r
   cat > conftest.$ac_ext <<EOF\r
-#line 1267 "configure"\r
+#line 1336 "configure"\r
 #include "confdefs.h"\r
 #include <sys/types.h>\r
 #include <sys/time.h>\r
@@ -1272,7 +1341,7 @@ int main() {
 struct tm *tp;\r
 ; return 0; }\r
 EOF\r
-if { (eval echo configure:1276: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then\r
+if { (eval echo configure:1345: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then\r
   rm -rf conftest*\r
   ac_cv_header_time=yes\r
 else\r
@@ -1293,12 +1362,12 @@ EOF
 fi\r
 \r
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6\r
-echo "configure:1297: checking for Cygwin environment" >&5\r
+echo "configure:1366: checking for Cygwin environment" >&5\r
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then\r
   echo $ac_n "(cached) $ac_c" 1>&6\r
 else\r
   cat > conftest.$ac_ext <<EOF\r
-#line 1302 "configure"\r
+#line 1371 "configure"\r
 #include "confdefs.h"\r
 \r
 int main() {\r
@@ -1309,7 +1378,7 @@ int main() {
 return __CYGWIN__;\r
 ; return 0; }\r
 EOF\r
-if { (eval echo configure:1313: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then\r
+if { (eval echo configure:1382: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then\r
   rm -rf conftest*\r
   ac_cv_cygwin=yes\r
 else\r
@@ -1326,19 +1395,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=\r
 test "$ac_cv_cygwin" = yes && CYGWIN=yes\r
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6\r
-echo "configure:1330: checking for mingw32 environment" >&5\r
+echo "configure:1399: checking for mingw32 environment" >&5\r
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then\r
   echo $ac_n "(cached) $ac_c" 1>&6\r
 else\r
   cat > conftest.$ac_ext <<EOF\r
-#line 1335 "configure"\r
+#line 1404 "configure"\r
 #include "confdefs.h"\r
 \r
 int main() {\r
 return __MINGW32__;\r
 ; return 0; }\r
 EOF\r
-if { (eval echo configure:1342: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then\r
+if { (eval echo configure:1411: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then\r
   rm -rf conftest*\r
   ac_cv_mingw32=yes\r
 else\r
@@ -1357,7 +1426,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes
 \r
 \r
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6\r
-echo "configure:1361: checking for executable suffix" >&5\r
+echo "configure:1430: checking for executable suffix" >&5\r
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then\r
   echo $ac_n "(cached) $ac_c" 1>&6\r
 else\r
@@ -1367,7 +1436,7 @@ else
   rm -f conftest*\r
   echo 'int main () { return 0; }' > conftest.$ac_ext\r
   ac_cv_exeext=\r
-  if { (eval echo configure:1371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then\r
+  if { (eval echo configure:1440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then\r
     for file in conftest.*; do\r
       case $file in\r
       *.c | *.o | *.obj) ;;\r
@@ -1388,13 +1457,13 @@ echo "$ac_t""${ac_cv_exeext}" 1>&6
 ac_exeext=$EXEEXT\r
 \r
 echo $ac_n "checking for object suffix""... $ac_c" 1>&6\r
-echo "configure:1392: checking for object suffix" >&5\r
+echo "configure:1461: checking for object suffix" >&5\r
 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then\r
   echo $ac_n "(cached) $ac_c" 1>&6\r
 else\r
   rm -f conftest*\r
 echo 'int i = 1;' > conftest.$ac_ext\r
-if { (eval echo configure:1398: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then\r
+if { (eval echo configure:1467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then\r
   for ac_file in conftest.*; do\r
     case $ac_file in\r
     *.c) ;;\r
@@ -1414,7 +1483,7 @@ ac_objext=$ac_cv_objext
 # Extract the first word of "flex", so it can be a program name with args.\r
 set dummy flex; ac_word=$2\r
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6\r
-echo "configure:1418: checking for $ac_word" >&5\r
+echo "configure:1487: checking for $ac_word" >&5\r
 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then\r
   echo $ac_n "(cached) $ac_c" 1>&6\r
 else\r
@@ -1453,7 +1522,7 @@ then
   *) ac_lib=l ;;\r
   esac\r
   echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6\r
-echo "configure:1457: checking for yywrap in -l$ac_lib" >&5\r
+echo "configure:1526: checking for yywrap in -l$ac_lib" >&5\r
 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`\r
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then\r
   echo $ac_n "(cached) $ac_c" 1>&6\r
@@ -1461,7 +1530,7 @@ else
   ac_save_LIBS="$LIBS"\r
 LIBS="-l$ac_lib  $LIBS"\r
 cat > conftest.$ac_ext <<EOF\r
-#line 1465 "configure"\r
+#line 1534 "configure"\r
 #include "confdefs.h"\r
 /* Override any gcc2 internal prototype to avoid an error.  */\r
 /* We use char because int might match the return type of a gcc2\r
@@ -1472,7 +1541,7 @@ int main() {
 yywrap()\r
 ; return 0; }\r
 EOF\r
-if { (eval echo configure:1476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then\r
+if { (eval echo configure:1545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then\r
   rm -rf conftest*\r
   eval "ac_cv_lib_$ac_lib_var=yes"\r
 else\r
@@ -1495,7 +1564,7 @@ fi
 fi\r
 \r
 echo $ac_n "checking lex output file root""... $ac_c" 1>&6\r
-echo "configure:1499: checking lex output file root" >&5\r
+echo "configure:1568: checking lex output file root" >&5\r
 if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then\r
   echo $ac_n "(cached) $ac_c" 1>&6\r
 else\r
@@ -1516,7 +1585,7 @@ echo "$ac_t""$ac_cv_prog_lex_root" 1>&6
 LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root\r
 \r
 echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6\r
-echo "configure:1520: checking whether yytext is a pointer" >&5\r
+echo "configure:1589: checking whether yytext is a pointer" >&5\r
 if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then\r
   echo $ac_n "(cached) $ac_c" 1>&6\r
 else\r
@@ -1528,14 +1597,14 @@ echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
 ac_save_LIBS="$LIBS"\r
 LIBS="$LIBS $LEXLIB"\r
 cat > conftest.$ac_ext <<EOF\r
-#line 1532 "configure"\r
+#line 1601 "configure"\r
 #include "confdefs.h"\r
 `cat $LEX_OUTPUT_ROOT.c`\r
 int main() {\r
 \r
 ; return 0; }\r
 EOF\r
-if { (eval echo configure:1539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then\r
+if { (eval echo configure:1608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then\r
   rm -rf conftest*\r
   ac_cv_prog_lex_yytext_pointer=yes\r
 else\r
@@ -1559,7 +1628,7 @@ fi
 # Pull the hash mark out of the macro call to avoid m4 problems.\r
 ac_msg="whether #! works in shell scripts"\r
 echo $ac_n "checking $ac_msg""... $ac_c" 1>&6\r
-echo "configure:1563: checking $ac_msg" >&5\r
+echo "configure:1632: checking $ac_msg" >&5\r
 if eval "test \"`echo '$''{'ac_cv_sys_interpreter'+set}'`\" = set"; then\r
   echo $ac_n "(cached) $ac_c" 1>&6\r
 else\r
@@ -1581,13 +1650,13 @@ interpval="$ac_cv_sys_interpreter"
 \r
 \r
 echo $ac_n "checking whether yyrestart() is needed""... $ac_c" 1>&6\r
-echo "configure:1585: checking whether yyrestart() is needed" >&5\r
+echo "configure:1654: checking whether yyrestart() is needed" >&5\r
 # Write a lex program that will cause an error if yyrestart exists.\r
 echo '%%\r
 %%\r
 float yyrestart(int, ...);' | $LEX\r
 cat > conftest.$ac_ext <<EOF\r
-#line 1591 "configure"\r
+#line 1660 "configure"\r
 #include "confdefs.h"\r
 #include "${LEX_OUTPUT_ROOT}.c"\r
 \r
@@ -1595,7 +1664,7 @@ int main() {
 exit(0);\r
 ; return 0; }\r
 EOF\r
-if { (eval echo configure:1599: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then\r
+if { (eval echo configure:1668: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then\r
   rm -rf conftest*\r
   echo "$ac_t""no" 1>&6\r
 else\r
@@ -1623,12 +1692,12 @@ EOF
 \r
 \r
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6\r
-echo "configure:1627: checking return type of signal handlers" >&5\r
+echo "configure:1696: checking return type of signal handlers" >&5\r
 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then\r
   echo $ac_n "(cached) $ac_c" 1>&6\r
 else\r
   cat > conftest.$ac_ext <<EOF\r
-#line 1632 "configure"\r
+#line 1701 "configure"\r
 #include "confdefs.h"\r
 #include <sys/types.h>\r
 #include <signal.h>\r
@@ -1645,7 +1714,7 @@ int main() {
 int i;\r
 ; return 0; }\r
 EOF\r
-if { (eval echo configure:1649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then\r
+if { (eval echo configure:1718: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then\r
   rm -rf conftest*\r
   ac_cv_type_signal=void\r
 else\r
@@ -1666,12 +1735,12 @@ EOF
 for ac_func in gettimeofday gethrtime strdup strtol strtoul\r
 do\r
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6\r
-echo "configure:1670: checking for $ac_func" >&5\r
+echo "configure:1739: checking for $ac_func" >&5\r
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then\r
   echo $ac_n "(cached) $ac_c" 1>&6\r
 else\r
   cat > conftest.$ac_ext <<EOF\r
-#line 1675 "configure"\r
+#line 1744 "configure"\r
 #include "confdefs.h"\r
 /* System header to define __stub macros and hopefully few prototypes,\r
     which can conflict with char $ac_func(); below.  */\r
@@ -1694,7 +1763,7 @@ $ac_func();
 \r
 ; return 0; }\r
 EOF\r
-if { (eval echo configure:1698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then\r
+if { (eval echo configure:1767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then\r
   rm -rf conftest*\r
   eval "ac_cv_func_$ac_func=yes"\r
 else\r
@@ -1857,6 +1926,8 @@ s%@YACC@%$YACC%g
 s%@CC@%$CC%g\r
 s%@RANLIB@%$RANLIB%g\r
 s%@INSTALLINFO@%$INSTALLINFO%g\r
+s%@MANDB@%$MANDB%g\r
+s%@INFODIRFILE@%$INFODIRFILE%g\r
 s%@CPP@%$CPP%g\r
 s%@EXEEXT@%$EXEEXT%g\r
 s%@OBJEXT@%$OBJEXT%g\r
@@ -2078,3 +2149,4 @@ chmod +x $CONFIG_STATUS
 rm -fr confdefs* $ac_clean_files\r
 test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1\r
 \r
+chmod a+x temp/coopt.sh\r

diff --git a/makeick.bat b/makeick.bat
index c4d79a28a7bbffae46432d413c8bb3ebb8ca64b9..938e631d8580d78558db734f9539cd7c24b562c8 100755 (executable)
--- a/makeick.bat
+++ b/makeick.bat
@@ -26,6 +26,11 @@ set CFLAGS=-gstabs+ -O2 -DICKNOSEARCH -W -Wall
 echo Compiling...\r
 gcc %CFLAGS% -o oil.exe oil.c\r
 oil.exe < idiotism.oil > idiotism.c\r
+gcc %CFLAGS% -o bin2c.exe bin2c.c\r
+bin2c.exe clc_cset_atari < atari.bin > cset-a.c\r
+bin2c.exe clc_cset_baudot < baudot.bin > cset-b.c\r
+bin2c.exe clc_cset_ebcdic < ebcdic.bin > cset-e.c\r
+bin2c.exe clc_cset_latin1 < latin1.bin > cset-l.c\r
 gcc -c %CFLAGS% idiotism.c\r
 gcc -c %CFLAGS% parser.c\r
 gcc -c %CFLAGS% lexer.c\r
@@ -40,14 +45,23 @@ gcc -c %CFLAGS% arrgghh.c
 gcc -c %CFLAGS% lose.c\r
 gcc -c %CFLAGS% uncommon.c\r
 gcc -c %CFLAGS% yuk.c\r
-ar cr libick.a cesspool.o numerals.o fiddle.o arrgghh.o lose.o\r
+gcc -c %CFLAGS% convickt.c\r
+gcc -c %CFLAGS% clc-cset.c\r
+gcc -c %CFLAGS% cset-a.c\r
+gcc -c %CFLAGS% cset-b.c\r
+gcc -c %CFLAGS% cset-e.c\r
+gcc -c %CFLAGS% cset-l.c\r
+\r
+ar cr libick.a cesspool.o numerals.o fiddle.o arrgghh.o lose.o clc-cset.o cset-?.o uncommon.o\r
 ranlib libick.a\r
-ar cr libickmt.a cesspool.o numerals.o fiddle.o arrgghh.o lose.o unravel.o\r
+ar cr libickmt.a cesspool.o numerals.o fiddle.o arrgghh.o lose.o unravel.o clc-cset.o cset-?.o uncommon.o\r
 ranlib libickmt.a\r
 ar cr libyuk.a yuk.o uncommon.o\r
 ranlib libyuk.a\r
 gcc %CFLAGS% -oick.exe parser.o lexer.o perpet.o feh2.o idiotism.o dekludge.o lose.o fiddle.o uncommon.o\r
+gcc %CFLAGS% -oconvickt.exe convickt.o clc-cset.o uncommon.o\r
 copy /y ick.exe ..\bin\r
+copy /y convickt.exe ..\bin\r
 copy /y *.a ..\lib\r
 cd ..\r
 copy /y src\ick-wrap.c lib\r
@@ -59,6 +73,7 @@ copy /y src\fiddle.h include
 copy /y src\abcess.h include\r
 copy /y src\lose.h include\r
 copy /y src\yuk.h include\r
+copy /y src\*.bin include\r
 echo Compilation complete unless there were errors.\r
 goto :end\r
 :direrror\r

diff --git a/makeick.sh b/makeick.sh
index 8b312d0149d297f06116ddd274e3c19ca766a77e..b2af5d1150921b5e05374fc3f375c5a101f23770 100755 (executable)
--- a/makeick.sh
+++ b/makeick.sh
@@ -33,6 +33,11 @@ CFLAGS='-gstabs+ -O2 -DICKNOSEARCH -W -Wall'
 echo Compiling...
 gcc ${CFLAGS} -o oil.exe oil.c
 oil.exe < idiotism.oil > idiotism.c
+gcc ${CFLAGS} -o bin2c.exe bin2c.c
+bin2c.exe clc_cset_atari < atari.bin > cset-a.c
+bin2c.exe clc_cset_baudot < baudot.bin > cset-b.c
+bin2c.exe clc_cset_ebcdic < ebcdic.bin > cset-e.c
+bin2c.exe clc_cset_latin1 < latin1.bin > cset-l.c
 gcc -c ${CFLAGS} idiotism.c
 gcc -c ${CFLAGS} parser.c
 gcc -c ${CFLAGS} lexer.c
@@ -47,14 +52,22 @@ gcc -c ${CFLAGS} arrgghh.c
 gcc -c ${CFLAGS} lose.c
 gcc -c ${CFLAGS} uncommon.c
 gcc -c ${CFLAGS} yuk.c
-ar cr libick.a cesspool.o numerals.o fiddle.o arrgghh.o lose.o
+gcc -c ${CFLAGS} convickt.c
+gcc -c ${CFLAGS} clc-cset.c
+gcc -c ${CFLAGS} cset-a.c
+gcc -c ${CFLAGS} cset-b.c
+gcc -c ${CFLAGS} cset-e.c
+gcc -c ${CFLAGS} cset-l.c
+ar cr libick.a cesspool.o numerals.o fiddle.o arrgghh.o lose.o clc-cset.o cset-?.o uncommon.o
 ranlib libick.a
-ar cr libickmt.a cesspool.o numerals.o fiddle.o arrgghh.o lose.o unravel.o
+ar cr libickmt.a cesspool.o numerals.o fiddle.o arrgghh.o lose.o unravel.o clc-cset.o cset-?.o uncommon.o
 ranlib libickmt.a
 ar cr libyuk.a yuk.o uncommon.o
 ranlib libyuk.a
 gcc ${CFLAGS} -oick.exe parser.o lexer.o perpet.o feh2.o idiotism.o dekludge.o lose.o fiddle.o uncommon.o
+gcc ${CFLAGS} -oconvickt.exe convickt.o clc-cset.o uncommon.o
 cp ick.exe ../bin
+cp convickt.exe ../bin
 cp *.a ../lib
 cd ..
 cp src/ick-wrap.c lib
@@ -66,4 +79,5 @@ cp src/fiddle.h include
 cp src/abcess.h include
 cp src/lose.h include
 cp src/yuk.h include
+cp src/*.bin include
 echo Compilation complete unless there were errors.