From eda3bee60fef085f435409d7f1429df9e5fd1812 Mon Sep 17 00:00:00 2001 From: Alex Smith Date: Sat, 22 Dec 2007 10:51:50 -0500 Subject: [PATCH] Pre-0.27 'c' snapshot. (This is a retrospective comment.) --- Makefile.in | 15 +++-- cleanick.bat | 3 + cleanick.sh | 3 + config.in | 31 ++++++++- configdj.sh | 186 +++++++++++++++++++++++++++++++++++---------------- makeick.bat | 19 +++++- makeick.sh | 18 ++++- 7 files changed, 208 insertions(+), 67 deletions(-) diff --git a/Makefile.in b/Makefile.in index c811bef..ff864a8 100644 --- 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 5a77cf0..d8e3f62 100755 --- a/cleanick.bat +++ b/cleanick.bat @@ -12,3 +12,6 @@ del /Q temp\*.l del /Q temp\*.bat del /Q temp\*.sh del /Q temp\*.exe +del /Q temp\*.bin +del /Q temp\*.in +del /Q temp\*.oil diff --git a/cleanick.sh b/cleanick.sh index 176c2c3..e6f5b62 100755 --- 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 670bcb3..59b23fc 100644 --- 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 6a7bd2a..3212a1b 100755 --- a/configdj.sh +++ b/configdj.sh @@ -877,10 +877,79 @@ test -n "$INSTALLINFO" && break done test -n "$INSTALLINFO" || INSTALLINFO=":" +for ac_prog in mandb +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 $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:886: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_MANDB'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$MANDB"; then + ac_cv_prog_MANDB="$MANDB" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_test_flag="-f" + if ! test -z "$COMSPEC$ComSpec"; then + ac_test_flag="-x" + IFS="${PATH_SEPARATOR-;}" + fi + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test $ac_test_flag $ac_dir/$ac_word; then + ac_cv_prog_MANDB="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +MANDB="$ac_cv_prog_MANDB" +if test -n "$MANDB"; then + echo "$ac_t""$MANDB" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$MANDB" && break +done +test -n "$MANDB" || MANDB=":" + + +if test ! INSTALLINFO = ":"; then +echo $ac_n "checking the location of the Info dir file""... $ac_c" 1>&6 +echo "configure:924: checking the location of the Info dir file" >&5 +# 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 +echo "$ac_t""not found" 1>&6 +echo "configure: warning: Could not find Info directory file, set infodirfile in the Makefile by hand" 1>&2 +else +echo "$ac_t""$INFODIRFILE" 1>&6 +fi +else +INFODIRFILE=(irrelevant) +fi + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:884: checking how to run the C preprocessor" >&5 +echo "configure:953: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -895,13 +964,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:905: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:974: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -912,13 +981,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:922: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:991: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -929,13 +998,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:939: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1008: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -960,12 +1029,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:964: checking for ANSI C header files" >&5 +echo "configure:1033: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -973,7 +1042,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:977: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1046: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -990,7 +1059,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1008,7 +1077,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1029,7 +1098,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1040,7 +1109,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1067,17 +1136,17 @@ for ac_hdr in sys/time.h unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1071: checking for $ac_hdr" >&5 +echo "configure:1140: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1081: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1150: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1105,12 +1174,12 @@ done echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1109: checking for working const" >&5 +echo "configure:1178: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1232: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1180,7 +1249,7 @@ EOF fi echo $ac_n "checking size of long long int""... $ac_c" 1>&6 -echo "configure:1184: checking size of long long int" >&5 +echo "configure:1253: checking size of long long int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1188,7 +1257,7 @@ else ac_cv_sizeof_long_long_int=0 else cat > conftest.$ac_ext < main() @@ -1199,7 +1268,7 @@ main() exit(0); } EOF -if { (eval echo configure:1203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_long_int=`cat conftestval` else @@ -1219,7 +1288,7 @@ EOF echo $ac_n "checking size of _Bool""... $ac_c" 1>&6 -echo "configure:1223: checking size of _Bool" >&5 +echo "configure:1292: checking size of _Bool" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof__Bool'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1227,7 +1296,7 @@ else ac_cv_sizeof__Bool=0 else cat > conftest.$ac_ext < main() @@ -1238,7 +1307,7 @@ main() exit(0); } EOF -if { (eval echo configure:1242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof__Bool=`cat conftestval` else @@ -1258,12 +1327,12 @@ EOF echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:1262: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:1331: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1272,7 +1341,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:1276: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1345: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -1293,12 +1362,12 @@ EOF fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:1297: checking for Cygwin environment" >&5 +echo "configure:1366: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1382: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -1326,19 +1395,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:1330: checking for mingw32 environment" >&5 +echo "configure:1399: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1411: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -1357,7 +1426,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1361: checking for executable suffix" >&5 +echo "configure:1430: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1367,7 +1436,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1388,13 +1457,13 @@ echo "$ac_t""${ac_cv_exeext}" 1>&6 ac_exeext=$EXEEXT echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:1392: checking for object suffix" >&5 +echo "configure:1461: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:1398: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -1414,7 +1483,7 @@ ac_objext=$ac_cv_objext # Extract the first word of "flex", so it can be a program name with args. set dummy flex; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1418: checking for $ac_word" >&5 +echo "configure:1487: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1453,7 +1522,7 @@ then *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:1457: checking for yywrap in -l$ac_lib" >&5 +echo "configure:1526: checking for yywrap in -l$ac_lib" >&5 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1461,7 +1530,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$ac_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1495,7 +1564,7 @@ fi fi echo $ac_n "checking lex output file root""... $ac_c" 1>&6 -echo "configure:1499: checking lex output file root" >&5 +echo "configure:1568: checking lex output file root" >&5 if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1516,7 +1585,7 @@ echo "$ac_t""$ac_cv_prog_lex_root" 1>&6 LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6 -echo "configure:1520: checking whether yytext is a pointer" >&5 +echo "configure:1589: checking whether yytext is a pointer" >&5 if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1528,14 +1597,14 @@ echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c ac_save_LIBS="$LIBS" LIBS="$LIBS $LEXLIB" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_prog_lex_yytext_pointer=yes else @@ -1559,7 +1628,7 @@ fi # Pull the hash mark out of the macro call to avoid m4 problems. ac_msg="whether #! works in shell scripts" echo $ac_n "checking $ac_msg""... $ac_c" 1>&6 -echo "configure:1563: checking $ac_msg" >&5 +echo "configure:1632: checking $ac_msg" >&5 if eval "test \"`echo '$''{'ac_cv_sys_interpreter'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1581,13 +1650,13 @@ interpval="$ac_cv_sys_interpreter" echo $ac_n "checking whether yyrestart() is needed""... $ac_c" 1>&6 -echo "configure:1585: checking whether yyrestart() is needed" >&5 +echo "configure:1654: checking whether yyrestart() is needed" >&5 # Write a lex program that will cause an error if yyrestart exists. echo '%% %% float yyrestart(int, ...);' | $LEX cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1668: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""no" 1>&6 else @@ -1623,12 +1692,12 @@ EOF echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:1627: checking return type of signal handlers" >&5 +echo "configure:1696: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1645,7 +1714,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:1649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1718: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -1666,12 +1735,12 @@ EOF for ac_func in gettimeofday gethrtime strdup strtol strtoul do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1670: checking for $ac_func" >&5 +echo "configure:1739: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1857,6 +1926,8 @@ s%@YACC@%$YACC%g s%@CC@%$CC%g s%@RANLIB@%$RANLIB%g s%@INSTALLINFO@%$INSTALLINFO%g +s%@MANDB@%$MANDB%g +s%@INFODIRFILE@%$INFODIRFILE%g s%@CPP@%$CPP%g s%@EXEEXT@%$EXEEXT%g s%@OBJEXT@%$OBJEXT%g @@ -2078,3 +2149,4 @@ chmod +x $CONFIG_STATUS rm -fr confdefs* $ac_clean_files test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 +chmod a+x temp/coopt.sh diff --git a/makeick.bat b/makeick.bat index c4d79a2..938e631 100755 --- a/makeick.bat +++ b/makeick.bat @@ -26,6 +26,11 @@ set 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 @@ -40,14 +45,23 @@ 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 copy /y ick.exe ..\bin +copy /y convickt.exe ..\bin copy /y *.a ..\lib cd .. copy /y src\ick-wrap.c lib @@ -59,6 +73,7 @@ copy /y src\fiddle.h include copy /y src\abcess.h include copy /y src\lose.h include copy /y src\yuk.h include +copy /y src\*.bin include echo Compilation complete unless there were errors. goto :end :direrror diff --git a/makeick.sh b/makeick.sh index 8b312d0..b2af5d1 100755 --- 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. -- 2.43.0