(Illustration by Gaich Muramatsu)
This patch to be applied against the pre2 tarball should incorporate all the stuff Jan and I changed to get Debian to compile cleanly. Jan did you use egcs, or gcc? I'll upload this file too to ftp://ftp.coda.cs.cmu.edu/pub/coda/src - Peter - --- /home/braam/motet/coda/configure.in Tue Apr 7 10:52:57 1998 +++ configure.in Fri May 15 12:02:36 1998 @@ -19,6 +19,8 @@ AC_PATH_PROG(PERL, perl, "") AC_PATH_PROGS(TIXWISH, [tixwish tixwish-tk4.1], "") +AC_CHECK_LIB(termcap, main) + dnl Substitute the top of the object directory TOPOBJ=`pwd` AC_SUBST(TOPOBJ) @@ -26,14 +28,6 @@ dnl Enable second shadow source area AC_SUBST(SECSRC) AC_ARG_ENABLE(srcdir, [Second shadow directory (srcdir)], SECSRC=$enable_srcdir) - -dnl Enable RCS directory -AC_SUBST(RCSDIR) -AC_ARG_ENABLE(rcsdir, [RCS directory (rcsdir)], RCSDIR=$enable_rcsdir) - -dnl Enable Shared objects -AC_SUBST(SHOB) -AC_ARG_ENABLE(shareobjs, [Shared library dirs (shareobjs)], SHOB=$enable_shareobjs) sinclude(configs/codaconf.m4) --- /home/braam/motet/coda/configure Tue Apr 7 10:53:18 1998 +++ configure Fri May 15 12:02:42 1998 @@ -13,10 +13,6 @@ # Any additions from configure.in: ac_help="$ac_help Second shadow directory (srcdir)" -ac_help="$ac_help -RCS directory (rcsdir)" -ac_help="$ac_help -Shared library dirs (shareobjs)" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -530,7 +526,7 @@ # 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:534: checking for $ac_word" >&5 +echo "configure:530: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -561,7 +557,7 @@ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:565: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:561: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -571,11 +567,11 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 575 "configure" +#line 571 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -601,12 +597,12 @@ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:605: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:601: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:610: checking whether we are using GNU C++" >&5 +echo "configure:606: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -615,7 +611,7 @@ yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:619: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:615: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -630,7 +626,7 @@ ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:634: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:630: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -662,7 +658,7 @@ # 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:666: checking for $ac_word" >&5 +echo "configure:662: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -693,7 +689,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:697: checking for $ac_word" >&5 +echo "configure:693: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -722,7 +718,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:726: checking for $ac_word" >&5 +echo "configure:722: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -770,7 +766,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:774: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:770: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -780,11 +776,11 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 784 "configure" +#line 780 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -804,12 +800,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:808: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:804: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:813: checking whether we are using GNU C" >&5 +echo "configure:809: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -818,7 +814,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:822: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:818: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -833,7 +829,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:837: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:833: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -861,7 +857,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:865: checking how to run the C preprocessor" >&5 +echo "configure:861: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -876,13 +872,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 880 "configure" +#line 876 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:886: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:882: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -893,13 +889,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 897 "configure" +#line 893 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:903: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:899: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -924,7 +920,7 @@ # 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:928: checking for $ac_word" >&5 +echo "configure:924: 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 @@ -957,7 +953,7 @@ *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:961: checking for yywrap in -l$ac_lib" >&5 +echo "configure:957: 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 @@ -965,7 +961,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$ac_lib $LIBS" cat > conftest.$ac_ext <<EOF -#line 969 "configure" +#line 965 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -976,7 +972,7 @@ yywrap() ; return 0; } EOF -if { (eval echo configure:980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -999,7 +995,7 @@ fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1003: checking whether ln -s works" >&5 +echo "configure:999: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1020,7 +1016,7 @@ fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1024: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1020: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1049,7 +1045,7 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1053: checking for $ac_word" >&5 +echo "configure:1049: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1080,7 +1076,7 @@ # 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:1084: checking for $ac_word" >&5 +echo "configure:1080: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1113,7 +1109,7 @@ # Extract the first word of "cp", so it can be a program name with args. set dummy cp; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1117: checking for $ac_word" >&5 +echo "configure:1113: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1145,7 +1141,7 @@ # Extract the first word of "df", so it can be a program name with args. set dummy df; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1149: checking for $ac_word" >&5 +echo "configure:1145: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_DF'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1177,7 +1173,7 @@ # Extract the first word of "grep", so it can be a program name with args. set dummy grep; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1181: checking for $ac_word" >&5 +echo "configure:1177: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GREP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1209,7 +1205,7 @@ # Extract the first word of "hostname", so it can be a program name with args. set dummy hostname; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1213: checking for $ac_word" >&5 +echo "configure:1209: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_HOSTNAME'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1241,7 +1237,7 @@ # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1245: checking for $ac_word" >&5 +echo "configure:1241: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1275,7 +1271,7 @@ # 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:1279: checking for $ac_word" >&5 +echo "configure:1275: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TIXWISH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1308,30 +1304,58 @@ test -n "$TIXWISH" || TIXWISH="""" -TOPOBJ=`pwd` - - +echo $ac_n "checking for main in -ltermcap""... $ac_c" 1>&6 +echo "configure:1309: checking for main in -ltermcap" >&5 +ac_lib_var=`echo termcap'_'main | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-ltermcap $LIBS" +cat > conftest.$ac_ext <<EOF +#line 1317 "configure" +#include "confdefs.h" -# Check whether --enable-srcdir or --disable-srcdir was given. -if test "${enable_srcdir+set}" = set; then - enableval="$enable_srcdir" - SECSRC=$enable_srcdir +int main() { +main() +; return 0; } +EOF +if { (eval echo configure:1324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi +rm -f conftest* +LIBS="$ac_save_LIBS" +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo termcap | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <<EOF +#define $ac_tr_lib 1 +EOF + LIBS="-ltermcap $LIBS" -# Check whether --enable-rcsdir or --disable-rcsdir was given. -if test "${enable_rcsdir+set}" = set; then - enableval="$enable_rcsdir" - RCSDIR=$enable_rcsdir +else + echo "$ac_t""no" 1>&6 fi +TOPOBJ=`pwd` + + -# Check whether --enable-shareobjs or --disable-shareobjs was given. -if test "${enable_shareobjs+set}" = set; then - enableval="$enable_shareobjs" - SHOB=$enable_shareobjs +# Check whether --enable-srcdir or --disable-srcdir was given. +if test "${enable_srcdir+set}" = set; then + enableval="$enable_srcdir" + SECSRC=$enable_srcdir fi @@ -1382,7 +1406,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:1386: checking host system type" >&5 +echo "configure:1410: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -1403,7 +1427,7 @@ echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:1407: checking target system type" >&5 +echo "configure:1431: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -1421,7 +1445,7 @@ echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1425: checking build system type" >&5 +echo "configure:1449: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1756,8 +1780,6 @@ s%_at_TIXWISH@%$TIXWISH%g s%_at_TOPOBJ@%$TOPOBJ%g s%_at_SECSRC@%$SECSRC%g -s%_at_RCSDIR@%$RCSDIR%g -s%_at_SHOB@%$SHOB%g s%_at_host@%$host%g s%_at_host_alias@%$host_alias%g s%_at_host_cpu@%$host_cpu%g --- /home/braam/motet/coda/Makeconf.setup.in Fri Feb 20 11:50:41 1998 +++ Makeconf.setup.in Fri May 15 11:59:26 1998 @@ -25,7 +25,7 @@ host = @host@ host_alias = @host_alias@ - +LIBS= @LIBS@ # # Platform, uncomment your choice; --- /home/braam/motet/coda/configs/Makeconf.linux Sat Apr 11 00:55:42 1998 +++ configs/Makeconf.linux Fri May 15 11:59:06 1998 @@ -16,7 +16,7 @@ GFLAG = CPP = gcc -E -x c-header LIBCURSES = -lncurses -LIBTERMCAP = -ltermcap +LIBTERMCAP = $(LIBS) LIBCOMPAT = LIBREADLINE = -lreadline INCREADLINE = -I/usr/include/readline --- /home/braam/motet/coda/configs/Makerules Thu May 14 21:51:27 1998 +++ configs/Makerules Fri May 15 11:59:51 1998 @@ -256,6 +256,7 @@ @echo INCLFLAGS: $(INCLFLAGS) @echo TOPDIR: $(TOPDIR) @echo LIBDIR: $(LIBDIR) + @echo LIBS: $(LIBS) @echo LIBEXECDIR: $(LIBEXECDIR) @echo BINDIR: $(BINDIR) @echo SBINDIR: $(SBINDIR) --- /home/braam/motet/coda/coda-src/fail/Makefile.in Tue Apr 14 15:57:04 1998 +++ coda-src/fail/Makefile.in Fri May 15 12:06:42 1998 @@ -50,7 +50,7 @@ RP2HEADERS = $(notdir ${RP2FILES:.rpc2=.h}) -LIBS = ${LIBRPC2} ${LIBSE} ${LIBOLDLWP} ${LIBUTIL} ${LIBCOMPAT} \ +FLIBS = ${LIBRPC2} ${LIBSE} ${LIBOLDLWP} ${LIBUTIL} ${LIBCOMPAT} \ ${LIBREADLINE} ${LIBTERMCAP} # No longer of interest: tvclient tvserver ftclient ftserver @@ -58,8 +58,8 @@ libfail.a: ${OBJS} -filcon: filcon.o libfail.a ${LIBS} - ${CC} ${LIBFLAGS} filcon.o libfail.a ${LIBS} -o filcon +filcon: filcon.o libfail.a ${FLIBS} + ${CC} ${LIBFLAGS} filcon.o libfail.a ${FLIBS} -o filcon fcon.client.o: fcon.client.c fcon.server.o: fcon.server.c --- /home/braam/motet/coda/coda-src/repair/Makefile.in Fri Feb 20 11:51:14 1998 +++ coda-src/repair/Makefile.in Fri May 15 12:11:45 1998 @@ -41,16 +41,16 @@ CBINS = repair # TESTS = reptest -LIBS = ${LIBRESOLVE} ${LIBVV} ${LIBAUTH2} ${LIBKERNDEP} ${LIBUTIL} \ +RLIBS = ${LIBRESOLVE} ${LIBVV} ${LIBAUTH2} ${LIBKERNDEP} ${LIBUTIL} \ $(LIBREADLINE) $(LIBTERMCAP) OFILES = rvol.o path.o -reptest: reptest.o (OFILES) $(LIBS) - $(CXX) $(LIBFLAGS) reptest.o $(OFILES) $(LIBS) -o reptest +reptest: reptest.o (OFILES) $(RLIBS) + $(CXX) $(LIBFLAGS) reptest.o $(OFILES) $(RLIBS) -o reptest -repair: repair.o $(OFILES) $(LIBS) - $(CXX) $(LIBFLAGS) repair.o $(OFILES) $(LIBS) -o repair +repair: repair.o $(OFILES) $(RLIBS) + $(CXX) $(LIBFLAGS) repair.o $(OFILES) $(RLIBS) -o repair include $(MAKDIR)/configs/Makerules --- /home/braam/motet/coda/coda-src/vtools/Makefile.in Tue Apr 14 15:59:56 1998 +++ coda-src/vtools/Makefile.in Fri May 15 11:15:08 1998 @@ -53,7 +53,7 @@ CXXFLAGS := $(CXXFLAGS) -UVENUS cmon: cmon.o $(CMON_LIBS) - $(CXX) $(LIBFLAGS) cmon.o $(CMON_LIBS) -ltermcap -o cmon + $(CXX) $(LIBFLAGS) cmon.o $(CMON_LIBS) $(LIBTERMCAP) -o cmon codacon: codacon.o $(CXX) $(LIBFLAGS) -o codacon codacon.o --- /home/braam/motet/coda/coda-src/asr/Makefile.in Fri Feb 20 11:50:45 1998 +++ coda-src/asr/Makefile.in Fri May 15 11:14:34 1998 @@ -65,7 +65,7 @@ # YYuck! I don't know how to tell yyac to deliver a .cc extension GRRR..(pjb) y.tab.o: y.tab.c - $(CXX) -x c++ $(CFLAGS) -c $< + $(CC) -x c++ $(CFLAGS) -c $< include $(MAKDIR)/configs/Makerules --- /home/braam/motet/coda/coda-src/volutil/Makefile.in Fri Feb 20 11:52:07 1998 +++ coda-src/volutil/Makefile.in Fri May 15 12:14:09 1998 @@ -66,7 +66,7 @@ RP2FILES = $(VOLUTIL_RPC2) $(VOLDUMP_RPC2) RP2HEADERS = $(notdir ${RP2FILES:.rpc2=.h}) -LIBS = ${LIBVOL} \ +VLIBS = ${LIBVOL} \ ${LIBVV} \ $(LIBVICEDEP)\ ${LIBRPC2} \ @@ -143,20 +143,20 @@ # ${OBJS} ${LOCALOBJS}: ${HFILES} -volutil: ${VOLCLIENTOBJS} ${LIBS} - ${CXX} $(LIBFLAGS) ${VOLCLIENTOBJS} ${LIBS} -o volutil +volutil: ${VOLCLIENTOBJS} ${VLIBS} + ${CXX} $(LIBFLAGS) ${VOLCLIENTOBJS} ${VLIBS} -o volutil -merge: merge.o dumpstream.o dumpstuff.o ${LIBS} - $(CXX) $(LIBFLAGS) merge.o dumpstream.o dumpstuff.o ${LIBS} -o merge +merge: merge.o dumpstream.o dumpstuff.o ${VLIBS} + $(CXX) $(LIBFLAGS) merge.o dumpstream.o dumpstuff.o ${VLIBS} -o merge -backup: backup.o ${LIBS} - $(CXX) $(LIBFLAGS) backup.o ${LIBS} -lm -o backup +backup: backup.o ${VLIBS} + $(CXX) $(LIBFLAGS) backup.o ${VLIBS} -lm -o backup -readdump: readdump.o dumpstream.o dumpstuff.o ${LIBS} - $(CXX) $(LIBFLAGS) readdump.o dumpstream.o dumpstuff.o ${LIBS} -o readdump +readdump: readdump.o dumpstream.o dumpstuff.o ${VLIBS} + $(CXX) $(LIBFLAGS) readdump.o dumpstream.o dumpstuff.o ${VLIBS} -o readdump -parserecdump: parserecdump.o ${LIBS} - $(CXX) $(LIBFLAGS) parserecdump.o ${LIBS} -o parserecdump +parserecdump: parserecdump.o ${VLIBS} + $(CXX) $(LIBFLAGS) parserecdump.o ${VLIBS} -o parserecdump include $(MAKDIR)/configs/Makerules --- /home/braam/motet/coda/coda-src/norton/Makefile.in Fri Feb 20 11:51:06 1998 +++ coda-src/norton/Makefile.in Fri May 15 12:26:33 1998 @@ -27,7 +27,7 @@ SCRIPTS = reinit SBINS = $(EXECUTABLES) $(SCRIPTS) -LIBS = $(LIBIBERTY) \ +NLIBS = $(LIBIBERTY) \ $(LIBAUTH2) \ $(SALVAGE_O) \ $(LIBVOL) \ @@ -57,10 +57,10 @@ norton_objs = norton.o ${common_objects} reinit_objs = norton-reinit.o ${common_objects} -norton: ${norton_objs} ${LIBS} - $(CXX) $(LIBFLAGS) ${norton_objs} ${LIBS} -o norton +norton: ${norton_objs} ${NLIBS} + $(CXX) $(LIBFLAGS) ${norton_objs} ${NLIBS} -o norton -norton-reinit: ${reinit_objs} ${LIBS} - $(CXX) $(LIBFLAGS) ${reinit_objs} ${LIBS} -o norton-reinit +norton-reinit: ${reinit_objs} ${NLIBS} + $(CXX) $(LIBFLAGS) ${reinit_objs} ${NLIBS} -o norton-reinit include $(MAKDIR)/configs/Makerules --- /home/braam/motet/coda/coda-src/libal/parsepdb.h Fri Feb 20 11:51:02 1998 +++ coda-src/libal/parsepdb.h Fri May 15 11:55:15 1998 @@ -56,7 +56,7 @@ */ - +#define YYDEBUG 0 #define MAXSTRLEN 100 --- /home/braam/motet/coda/coda-src/guitools/Makefile.in Fri Feb 20 11:51:00 1998 +++ coda-src/guitools/Makefile.in Fri May 15 12:28:22 1998 @@ -86,11 +86,5 @@ echo "s%+HOSTNAME+%_at_HOSTNAME@%g" >> $@ echo "s%+TIXWISH+%_at_TIXWISH@%g" >> $@ echo "s%+GUIDIR+%${GUIDIR}%g" >> $@ - echo "s%+CFS+%${BINDIR}/cfs%g" >> $@ - echo "s%+CLOG+%${BINDIR}/clog%g" >> $@ - echo "s%+CTOKENS+%${BINDIR}/ctokens%g" >> $@ - echo "s%+CUNLOG+%${BINDIR}/cunlog%g" >> $@ - echo "s%+HOARD+%${BINDIR}/hoard%g" >> $@ - echo "s%+VUTIL+%${BINDIR}/vutil%g" >> $@ include $(MAKDIR)/configs/Makerules --- /home/braam/motet/coda/coda-src/libal/parsepdb.lex Fri Feb 20 11:51:02 1998 +++ coda-src/libal/parsepdb.lex Fri May 15 11:55:15 1998 @@ -74,7 +74,11 @@ int yylook(); /* forward refs; lex doesn't emit defs for C++ */ int yyback(int *p, int m); /* ditto */ -#define RETURN(Arg) if (yydebug != 0) printf("Lex: token:%d\tvalue:'%s'\n",Arg,yylval);return(Arg); +#if YYDEBUG != 0 +# define RETURN(Arg) if (yydebug != 0) printf("Lex: token:%d\tvalue:'%s'\n",Arg,yylval);return(Arg); +#else +# define RETURN(Arg) return(Arg); +#endif #define YYLVAL 1000 /* length of yytext */ %} --- /home/braam/motet/coda/coda-src/libal/parsepdb.yacc Thu May 14 21:51:19 1998 +++ coda-src/libal/parsepdb.yacc Fri May 15 11:55:15 1998 @@ -82,7 +82,6 @@ #include "pcf.h" #include "parsepdb.h" -#define YYDEBUG 0 #define DIE(x) {perror(x); fflush(stderr); abort();} int temp_Bound; @@ -108,15 +107,21 @@ %% /* YACC rules section */ OneDef : EmptyDef { +#if YYDEBUG != 0 if (yydebug) PrintEntry(); +#endif } | UserDef { +#if YYDEBUG != 0 if (yydebug) PrintEntry(); +#endif } | GroupDef { +#if YYDEBUG != 0 if (yydebug) PrintEntry(); +#endif } ; --- /home/braam/motet/coda/coda-src/libal/pcfgen.c Tue Apr 14 15:50:33 1998 +++ coda-src/libal/pcfgen.c Fri May 15 11:55:15 1998 @@ -105,7 +105,11 @@ #define ABORT {flock(fileno(yyin), LOCK_UN); fclose(yyin); exit(-1);} - AvoidCheckSum = MyDebugFlag = yydebug = 0; + AvoidCheckSum = MyDebugFlag = 0; +#if YYDEBUG != 0 + yydebug = 0; +#endif + FileRoot[0] = '\0'; for (i = 1; i < argc; i++) {Received on 1998-05-15 12:37:06