%n man_db %v 2.3.10 %c * %l * %b * %d * %f * %t man_db-2.3.10.tgz %w Misc %% %setup patch -u -p1 <<'ENDPATCH' diff -ru2N man_db-2.3.10/GNUmakefile.in man_db-MCC/GNUmakefile.in --- man_db-2.3.10/GNUmakefile.in Thu Jul 13 16:30:20 1995 +++ man_db-MCC/GNUmakefile.in Sun Aug 18 17:30:44 1996 @@ -29,10 +29,10 @@ INCLUDES := $(addprefix include/, config.h manconfig.h comp_src.h) EVERYTHING = gencat lib xcat libdb src zsoelim nls man -ALL = lib libdb src zsoelim nls man -INSTALL = src zsoelim nls man +ALL = lib libdb $(SHLIB) src zsoelim nls man +INSTALL = src zsoelim nls man gencat include include/Defines -.PHONY: $(DEFAULT_TARGETS) $(EVERYTHING) dist nls_defines ID \ +.PHONY: $(DEFAULT_TARGETS) $(EVERYTHING) dist nls_defines ID force \ $(addsuffix _root, $(DEFAULT_TARGETS)) update default RCS check @@ -66,5 +66,5 @@ ifeq ($(nls),off) - ALL = lib libdb src zsoelim man + ALL = lib libdb $(SHLIB) src zsoelim man INSTALL = src zsoelim man else # nls != off @@ -84,5 +84,5 @@ $(srcdir)/include/config.h.in: stamp-h.in $(srcdir)/stamp-h.in: configure.in acconfig.h aclocal.m4 - -cd $(srcdir) && autoheader && date > stamp-h.in + -cd $(srcdir) && date > stamp-h.in # Use CONFIG_FILES= CONFIG_HEADERS= to force config.status to only @@ -151,7 +151,19 @@ # If the make variable clean is set to yes, no dependencies are re-created -install: $(INCLUDES) nls_defines +install: $(INCLUDES) $(SHLIB) +$(SHLIB): lib/libman.a libdb/libmandb.a + rm -rf tmp + mkdir tmp + (cd tmp;ar x ../lib/libman.a;ar x ../libdb/libmandb.a) + $(CC) -shared -o $@ -Wl,-soname,$(SHLIB) tmp/*.o + ln -sf $(SHLIB) libman_db.so +lib/libman.a: force + $(MAKE) -C lib +libdb/libmandb.a: force + $(MAKE) -C libdb install uninstall: + install -m 555 $(SHLIB) /usr/lib + ldconfig for i in $(INSTALL); do $(MAKE) -C $$i $@; done @@ -159,4 +171,5 @@ for i in $(EVERYTHING); do $(MAKE) -C $$i $@ clean=yes; done $(MAKE) $@_root + rm -rf tmp $(SHLIB) libman_db.so check: testsuite testsuite/Makefile diff -ru2N man_db-2.3.10/configure man_db-MCC/configure --- man_db-2.3.10/configure Thu Jul 13 11:16:51 1995 +++ man_db-MCC/configure Sun Aug 18 17:40:16 1996 @@ -2,5 +2,5 @@ # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.3 +# Generated automatically using autoconf version 2.7 # Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. # @@ -20,5 +20,5 @@ --with-device=DEVICE use nroff with the output device DEVICE" ac_help="$ac_help - --with-db=LIBRARY use database library LIBRARY (db, gdbm, ndbm)" + --with-db=LIBRARY use database library LIBRARY (gdbm, db, ndbm)" # Initialize some variables set by options. @@ -43,7 +43,20 @@ x_includes=NONE x_libraries=NONE +bindir='${exec_prefix}/bin' +sbindir='${exec_prefix}/sbin' +libexecdir='${exec_prefix}/libexec' +datadir='${prefix}/share' +sysconfdir='${prefix}/etc' +sharedstatedir='${prefix}/com' +localstatedir='${prefix}/var' +libdir='${exec_prefix}/lib' +includedir='${prefix}/include' +oldincludedir='/usr/include' +infodir='${prefix}/info' +mandir='${prefix}/man' # Initialize some other variables. subdirs= +MFLAGS= MAKEFLAGS= ac_prev= @@ -67,7 +80,12 @@ case "$ac_option" in - -build | --build | --buil | --bui | --bu | --b) + -bindir | --bindir | --bindi | --bind | --bin | --bi) + ac_prev=bindir ;; + -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) + bindir="$ac_optarg" ;; + + -build | --build | --buil | --bui | --bu) ac_prev=build ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=* | --b=*) + -build=* | --build=* | --buil=* | --bui=* | --bu=*) build="$ac_optarg" ;; @@ -79,4 +97,10 @@ cache_file="$ac_optarg" ;; + -datadir | --datadir | --datadi | --datad | --data | --dat | --da) + ac_prev=datadir ;; + -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ + | --da=*) + datadir="$ac_optarg" ;; + -disable-* | --disable-*) ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` @@ -129,10 +153,27 @@ --prefix=PREFIX install architecture-independent files in PREFIX [$ac_default_prefix] - --exec-prefix=PREFIX install architecture-dependent files in PREFIX + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX [same as prefix] + --bindir=DIR user executables in DIR [EPREFIX/bin] + --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] + --libexecdir=DIR program executables in DIR [EPREFIX/libexec] + --datadir=DIR read-only architecture-independent data in DIR + [PREFIX/share] + --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data in DIR + [PREFIX/com] + --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] + --libdir=DIR object code libraries in DIR [EPREFIX/lib] + --includedir=DIR C header files in DIR [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] + --infodir=DIR info documentation in DIR [PREFIX/info] + --mandir=DIR man documentation in DIR [PREFIX/man] --srcdir=DIR find the sources in DIR [configure dir or ..] --program-prefix=PREFIX prepend PREFIX to installed program names --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM run sed PROGRAM on installed program names + --program-transform-name=PROGRAM + run sed PROGRAM on installed program names +EOF + cat << EOF Host type: --build=BUILD configure for building on BUILD [BUILD=HOST] @@ -146,6 +187,8 @@ --x-includes=DIR X include files are in DIR --x-libraries=DIR X library files are in DIR ---enable and --with options recognized:$ac_help EOF + if test -n "$ac_help"; then + echo "--enable and --with options recognized:$ac_help" + fi exit 0 ;; @@ -155,4 +198,42 @@ host="$ac_optarg" ;; + -includedir | --includedir | --includedi | --included | --include \ + | --includ | --inclu | --incl | --inc) + ac_prev=includedir ;; + -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ + | --includ=* | --inclu=* | --incl=* | --inc=*) + includedir="$ac_optarg" ;; + + -infodir | --infodir | --infodi | --infod | --info | --inf) + ac_prev=infodir ;; + -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) + infodir="$ac_optarg" ;; + + -libdir | --libdir | --libdi | --libd) + ac_prev=libdir ;; + -libdir=* | --libdir=* | --libdi=* | --libd=*) + libdir="$ac_optarg" ;; + + -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ + | --libexe | --libex | --libe) + ac_prev=libexecdir ;; + -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ + | --libexe=* | --libex=* | --libe=*) + libexecdir="$ac_optarg" ;; + + -localstatedir | --localstatedir | --localstatedi | --localstated \ + | --localstate | --localstat | --localsta | --localst \ + | --locals | --local | --loca | --loc | --lo) + ac_prev=localstatedir ;; + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ + | --localstate=* | --localstat=* | --localsta=* | --localst=* \ + | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) + localstatedir="$ac_optarg" ;; + + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) + ac_prev=mandir ;; + -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) + mandir="$ac_optarg" ;; + -nfp | --nfp | --nf) # Obsolete; use --without-fp. @@ -167,4 +248,13 @@ no_recursion=yes ;; + -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ + | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ + | --oldin | --oldi | --old | --ol | --o) + ac_prev=oldincludedir ;; + -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ + | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ + | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) + oldincludedir="$ac_optarg" ;; + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) ac_prev=prefix ;; @@ -207,4 +297,21 @@ silent=yes ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ + | --sbi=* | --sb=*) + sbindir="$ac_optarg" ;; + + -sharedstatedir | --sharedstatedir | --sharedstatedi \ + | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ + | --sharedst | --shareds | --shared | --share | --shar \ + | --sha | --sh) + ac_prev=sharedstatedir ;; + -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ + | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ + | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ + | --sha=* | --sh=*) + sharedstatedir="$ac_optarg" ;; + -site | --site | --sit) ac_prev=site ;; @@ -217,4 +324,11 @@ srcdir="$ac_optarg" ;; + -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ + | --syscon | --sysco | --sysc | --sys | --sy) + ac_prev=sysconfdir ;; + -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ + | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) + sysconfdir="$ac_optarg" ;; + -target | --target | --targe | --targ | --tar | --ta | --t) ac_prev=target ;; @@ -226,5 +340,5 @@ -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.3" + echo "configure generated by autoconf version 2.7" exit 0 ;; @@ -272,5 +386,5 @@ ;; - *) + *) if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then echo "configure: warning: $ac_option: invalid host type" 1>&2 @@ -391,7 +505,10 @@ ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_cpp='echo $CPP $CPPFLAGS 1>&5; +$CPP $CPPFLAGS' +ac_compile='echo ${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5; +${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' +ac_link='echo ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5; +${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then @@ -431,6 +548,8 @@ program_transform_name= else - # Double any \ or $. - echo 's,\\,\\\\,g; s,\$,$$,g' > conftestsed + # Double any \ or $. echo might interpret backslashes. + cat <<\EOF_SED > conftestsed +s,\\,\\\\,g; s,\$,$$,g +EOF_SED program_transform_name="`echo $program_transform_name|sed -f conftestsed`" rm -f conftestsed @@ -447,8 +566,8 @@ date="July 12th, 1995" version="2.3.10" -man_ac_version=2003000 +man_ac_version=2007000 # Check whether --enable-debug or --disable-debug was given. -enableval="$enable_debug" -if test -n "$enableval"; then +if test "${enable_debug+set}" = set; then + enableval="$enable_debug" : ${LDFLAGS=-g} echo "Enabling debugging Makefile" 1>&6 @@ -465,6 +584,6 @@ # Check whether --enable-setuid or --disable-setuid was given. -enableval="$enable_setuid" -if test -n "$enableval"; then +if test "${enable_setuid+set}" = set; then + enableval="$enable_setuid" if test "$enableval" = "yes" then @@ -495,6 +614,6 @@ # Check whether --with-device or --without-device was given. -withval="$with_device" -if test -n "$withval"; then +if test "${with_device+set}" = set; then + withval="$with_device" if test "$withval" = "yes" || test "$withval" = "no" then @@ -506,6 +625,6 @@ # Check whether --with-db or --without-db was given. -withval="$with_db" -if test -n "$withval"; then +if test "${with_db+set}" = set; then + withval="$with_db" if test "$withval" = "yes" || test "$withval" = "no" then @@ -562,4 +681,5 @@ fi fi + echo "$ac_t""$ac_cv_prog_gcc" 1>&6 if test $ac_cv_prog_gcc = yes; then @@ -579,5 +699,6 @@ fi - echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6 + +echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6 if test $ac_cv_prog_gcc_g = yes; then CFLAGS="-g -O" @@ -606,5 +727,5 @@ # not just through cpp. cat > conftest.$ac_ext < @@ -620,5 +741,5 @@ CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < @@ -639,6 +760,8 @@ ac_cv_prog_CPP="$CPP" fi + CPP="$ac_cv_prog_CPP" +else + ac_cv_prog_CPP="$CPP" fi -CPP="$ac_cv_prog_CPP" echo "$ac_t""$CPP" 1>&6 @@ -682,8 +805,15 @@ done IFS="$ac_save_ifs" - # As a last resort, use the slow shell script. - test -z "$ac_cv_path_install" && ac_cv_path_install="$ac_install_sh" + fi - INSTALL="$ac_cv_path_install" + if test "${ac_cv_path_install+set}" = set; then + INSTALL="$ac_cv_path_install" + else + # As a last resort, use the slow shell script. We don't cache a + # path for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the path is relative. + INSTALL="$ac_install_sh" + fi fi echo "$ac_t""$INSTALL" 1>&6 @@ -815,5 +945,5 @@ done -test "$pager" && pager="$pager -s" +test "$pager" && pager="exec $pager -s" macros="andoc an doc" for ac_prog in nroff gnroff groff @@ -1410,5 +1540,5 @@ echo $ac_n "checking for AIX""... $ac_c" 1>&6 cat > conftest.$ac_ext < conftest.$ac_ext < @@ -1531,5 +1661,6 @@ esac echo $ac_n "checking for -l$ac_lib""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib'+set}'`\" = set"; then +ac_lib_var=`echo $ac_lib | tr '.-/+' '___p'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1537,5 +1668,5 @@ LIBS="-l$ac_lib $LIBS" cat > conftest.$ac_ext <&6 LEXLIB="-l$ac_lib" @@ -1574,5 +1705,5 @@ else cat > conftest.$ac_ext <&6 +cross_compiling=$ac_cv_c_cross echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 @@ -1595,5 +1727,5 @@ else cat > conftest.$ac_ext < @@ -1617,5 +1749,5 @@ # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < @@ -1635,5 +1767,5 @@ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < @@ -1653,8 +1785,8 @@ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. if test "$cross_compiling" = yes; then - ac_cv_header_stdc=no + : else cat > conftest.$ac_ext < @@ -1677,4 +1809,5 @@ fi fi + echo "$ac_t""$ac_cv_header_stdc" 1>&6 if test $ac_cv_header_stdc = yes; then @@ -1690,5 +1823,5 @@ else cat > conftest.$ac_ext < @@ -1717,4 +1850,5 @@ fi + echo "$ac_t""$ac_cv_header_sys_wait_h" 1>&6 if test $ac_cv_header_sys_wait_h = yes; then @@ -1734,5 +1868,5 @@ else cat > conftest.$ac_ext < @@ -1755,5 +1889,5 @@ if eval "test \"`echo '$ac_cv_header_dirent_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./\055' '[A-Z]___'` + ac_tr_hdr=HAVE_`echo $ac_hdr | tr 'abcdedfghijklmnopqrstuvwxyz./\055' 'ABCDEDFGHIJKLMNOPQRSTUVWXYZ___'` cat >> confdefs.h <&6 -if eval "test \"`echo '$''{'ac_cv_lib_dir'+set}'`\" = set"; then +ac_lib_var=`echo dir | tr '.-/+' '___p'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1773,5 +1908,5 @@ LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&6 LIBS="$LIBS -ldir" @@ -1801,5 +1936,6 @@ else echo $ac_n "checking for -lx""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_lib_x'+set}'`\" = set"; then +ac_lib_var=`echo x | tr '.-/+' '___p'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1807,5 +1943,5 @@ LIBS="-lx $LIBS" cat > conftest.$ac_ext <&6 LIBS="$LIBS -lx" @@ -1843,5 +1979,5 @@ else cat > conftest.$ac_ext < @@ -1861,5 +1997,5 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./\055' '[A-Z]___'` + ac_tr_hdr=HAVE_`echo $ac_hdr | tr 'abcdefghijklmnopqrstuvwxyz./\055' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ___'` cat >> confdefs.h < conftest.$ac_ext < @@ -1897,5 +2033,5 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./\055' '[A-Z]___'` + ac_tr_hdr=HAVE_`echo $ac_hdr | tr 'abcdefghijklmnopqrstuvwxyz./\055' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ___'` cat >> confdefs.h < conftest.$ac_ext <&6 if test $ac_cv_c_const = no; then @@ -1987,5 +2124,5 @@ for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&6 case "$ac_cv_c_inline" in @@ -2022,5 +2160,5 @@ else cat > conftest.$ac_ext < @@ -2053,5 +2191,5 @@ else cat > conftest.$ac_ext < @@ -2084,5 +2222,5 @@ else cat > conftest.$ac_ext < @@ -2099,4 +2237,5 @@ fi + echo "$ac_t""$ac_cv_type_uid_t" 1>&6 if test $ac_cv_type_uid_t = no; then @@ -2116,5 +2255,5 @@ else cat > conftest.$ac_ext < @@ -2149,5 +2288,5 @@ else cat > conftest.$ac_ext < @@ -2167,4 +2306,5 @@ fi + echo "$ac_t""$ac_cv_header_alloca_h" 1>&6 if test $ac_cv_header_alloca_h = yes; then @@ -2180,5 +2320,5 @@ else cat > conftest.$ac_ext <&6 if test $ac_cv_func_alloca = yes; then @@ -2238,5 +2379,5 @@ else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then @@ -2266,5 +2408,5 @@ else cat > conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ -char $ac_func(); +char $ac_func(); int main() { return 0; } @@ -2320,5 +2462,5 @@ else cat > conftest.$ac_ext <&6 cat >> confdefs.h < conftest.$ac_ext <&6 test $ac_cv_func_memcmp = no && LIBOBJS="$LIBOBJS memcmp.o" @@ -2390,5 +2534,5 @@ else cat > conftest.$ac_ext < @@ -2398,7 +2542,9 @@ #endif #ifdef __cplusplus -extern "C" -#endif +extern "C" void (*signal (int, void (*)(int)))(int); +#else void (*signal ()) (); +#endif + int main() { return 0; } int t() { @@ -2416,4 +2562,5 @@ fi + echo "$ac_t""$ac_cv_type_signal" 1>&6 cat >> confdefs.h < conftest.$ac_ext < @@ -2449,4 +2596,5 @@ rm -fr conftest* fi + echo "$ac_t""$ac_cv_func_strcoll" 1>&6 if test $ac_cv_func_strcoll = yes; then @@ -2463,5 +2611,5 @@ else cat > conftest.$ac_ext < @@ -2494,8 +2642,51 @@ else if test "$cross_compiling" = yes; then - ac_cv_func_vfork=no + echo $ac_n "checking for vfork""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +char vfork(); + +int main() { return 0; } +int t() { + +/* 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_vfork) || defined (__stub___vfork) +choke me +#else +vfork(); +#endif + +; return 0; } +EOF +if eval $ac_link; then + rm -rf conftest* + eval "ac_cv_func_vfork=yes" +else + rm -rf conftest* + eval "ac_cv_func_vfork=no" +fi +rm -f conftest* + +fi +if eval "test \"`echo '$ac_cv_func_'vfork`\" = yes"; then + echo "$ac_t""yes" 1>&6 + : +else + echo "$ac_t""no" 1>&6 +fi + else cat > conftest.$ac_ext <&6 if test $ac_cv_func_vfork = no; then @@ -2612,5 +2804,5 @@ else cat > conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ -char vprintf(); +char vprintf(); int main() { return 0; } @@ -2660,5 +2852,5 @@ else cat > conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ -char _doprnt(); +char _doprnt(); int main() { return 0; } @@ -2713,5 +2905,5 @@ else cat > conftest.$ac_ext < conftest.$ac_ext < @@ -2810,5 +3002,5 @@ else cat > conftest.$ac_ext < @@ -2832,5 +3024,6 @@ do echo $ac_n "checking for -l$lib""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_lib_$lib'+set}'`\" = set"; then +ac_lib_var=`echo $lib | tr '.-/+' '___p'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2838,5 +3031,5 @@ LIBS="-l$lib $LIBS" cat > conftest.$ac_ext <&6 test "$lib" = "c" || LIBS="$LIBS -l$lib" @@ -2886,5 +3079,5 @@ else cat > conftest.$ac_ext < @@ -2908,5 +3101,6 @@ do echo $ac_n "checking for -l$lib""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_lib_$lib'+set}'`\" = set"; then +ac_lib_var=`echo $lib | tr '.-/+' '___p'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2914,5 +3108,5 @@ LIBS="-l$lib $LIBS" cat > conftest.$ac_ext <&6 test "$lib" = "c" || LIBS="$LIBS -l$lib" @@ -2955,5 +3149,5 @@ else cat > conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ -char $ac_func(); +char $ac_func(); int main() { return 0; } @@ -2989,5 +3183,5 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'` + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` cat >> confdefs.h < conftest.$ac_ext < @@ -3038,5 +3232,6 @@ do echo $ac_n "checking for -l$lib""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_lib_$lib'+set}'`\" = set"; then +ac_lib_var=`echo $lib | tr '.-/+' '___p'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3044,5 +3239,5 @@ LIBS="-l$lib $LIBS" cat > conftest.$ac_ext <&6 test "$lib" = "c" || LIBS="$LIBS -l$lib" @@ -3096,5 +3291,6 @@ then echo $ac_n "checking for -lefence""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_lib_efence'+set}'`\" = set"; then +ac_lib_var=`echo efence | tr '.-/+' '___p'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3102,5 +3298,5 @@ LIBS="-lefence $LIBS" cat > conftest.$ac_ext <&6 - ac_tr_lib=HAVE_LIB`echo efence | tr '[a-z]' '[A-Z]'` + ac_tr_lib=HAVE_LIB`echo efence | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` cat >> confdefs.h < conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ -char $ac_func(); +char $ac_func(); int main() { return 0; } @@ -3176,5 +3372,5 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'` + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` cat >> confdefs.h < conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ -char $ac_func(); +char $ac_func(); int main() { return 0; } @@ -3227,5 +3423,5 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'` + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` cat >> confdefs.h < conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ -char $ac_func(); +char $ac_func(); int main() { return 0; } @@ -3278,5 +3474,5 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'` + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` cat >> confdefs.h < conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ -char setlocale(); +char setlocale(); int main() { return 0; } @@ -3336,5 +3532,5 @@ else cat > conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ -char catopen(); +char catopen(); int main() { return 0; } @@ -3374,5 +3570,6 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for -li""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_lib_i'+set}'`\" = set"; then +ac_lib_var=`echo i | tr '.-/+' '___p'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3380,5 +3577,5 @@ LIBS="-li $LIBS" cat > conftest.$ac_ext <&6 LIBS="$LIBS -li" @@ -3420,5 +3617,5 @@ else cat > conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ -char regcomp(); +char regcomp(); int main() { return 0; } @@ -3465,5 +3662,5 @@ else cat > conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ -char re_comp(); +char re_comp(); int main() { return 0; } @@ -3515,5 +3712,5 @@ else cat > conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ -char fnmatch(); +char fnmatch(); int main() { return 0; } @@ -3563,5 +3760,5 @@ else cat > conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ -char globfree(); +char globfree(); int main() { return 0; } @@ -3611,5 +3808,5 @@ else cat > conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ -char getopt_long(); +char getopt_long(); int main() { return 0; } @@ -3661,5 +3858,5 @@ else cat > conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ -char $ac_func(); +char $ac_func(); int main() { return 0; } @@ -3784,5 +3981,5 @@ exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.3" + echo "$CONFIG_STATUS generated by autoconf version 2.7" exit 0 ;; -help | --help | --hel | --he | --h) @@ -3807,8 +4004,10 @@ include/comp_src.h \ include/manconfig.h include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +EOF +cat >> $CONFIG_STATUS < conftest.subs <<\CEOF +# Protect against being on the right side of a sed subst in config.status. +sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g; + s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF $ac_vpsub $extrasub @@ -3822,4 +4021,16 @@ s%@prefix@%$prefix%g s%@program_transform_name@%$program_transform_name%g +s%@bindir@%$bindir%g +s%@sbindir@%$sbindir%g +s%@libexecdir@%$libexecdir%g +s%@datadir@%$datadir%g +s%@sysconfdir@%$sysconfdir%g +s%@sharedstatedir@%$sharedstatedir%g +s%@localstatedir@%$localstatedir%g +s%@libdir@%$libdir%g +s%@includedir@%$includedir%g +s%@oldincludedir@%$oldincludedir%g +s%@infodir@%$infodir%g +s%@mandir@%$mandir%g s%@date@%$date%g s%@version@%$version%g @@ -3834,5 +4045,5 @@ s%@cat@%$cat%g s%@tr@%$tr%g -s%@pager@%$pager%g +s%@pager@%less -sC%g s%@nroff@%$nroff%g s%@troff@%$troff%g diff -ru2N man_db-2.3.10/configure.in man_db-MCC/configure.in --- man_db-2.3.10/configure.in Thu Jul 13 11:16:40 1995 +++ man_db-MCC/configure.in Sun Aug 18 17:41:06 1996 @@ -71,5 +71,5 @@ fi]) AC_ARG_WITH(db, -[ --with-db=LIBRARY use database library LIBRARY (db, gdbm, ndbm)], +[ --with-db=LIBRARY use database library LIBRARY (gdbm, db, ndbm)], [if test "$withval" = "yes" || test "$withval" = "no" then @@ -94,5 +94,5 @@ AC_PATH_PROG(tr, tr) AC_CHECK_PROGS(pager, less more) -test "$pager" && pager="$pager -s" +test "$pager" && pager="exec $pager -s" dnl dnl define below (in list of preference) *roff macros to check for. diff -ru2N man_db-2.3.10/gencat/Makefile.in man_db-MCC/gencat/Makefile.in --- man_db-2.3.10/gencat/Makefile.in Fri Mar 31 17:35:31 1995 +++ man_db-MCC/gencat/Makefile.in Sun Aug 18 17:30:45 1996 @@ -26,4 +26,5 @@ $(MKINSTALLDIRS) $(MANDIR) $(INSTALL_DATA) gencat.1 $(MANDIR)/gencat$(man1ext) + gzip -9f $(MANDIR)/gencat$(man1ext) uninstall: diff -ru2N man_db-2.3.10/gencat/genlib.c man_db-MCC/gencat/genlib.c --- man_db-2.3.10/gencat/genlib.c Mon Mar 27 22:41:01 1995 +++ man_db-MCC/gencat/genlib.c Sun Aug 18 17:30:45 1996 @@ -611,4 +611,7 @@ } + if ( !cat ) + return; + for (set = cat->first; set; set = set->next) { if (set->hconst) genconst(fd, type, set->hconst, NULL, set->setId); diff -ru2N man_db-2.3.10/include/Defines.in man_db-MCC/include/Defines.in --- man_db-2.3.10/include/Defines.in Mon Jun 5 17:13:49 1995 +++ man_db-MCC/include/Defines.in Sun Aug 18 17:42:13 1996 @@ -18,4 +18,5 @@ #---------------------------------------------------------------------# +SHLIB = libman_db.so.2.3.10 # Programs SHELL = /bin/sh @@ -23,6 +24,6 @@ LEX = @LEX@ RANLIB = @RANLIB@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_DATA = install -m 444 +INSTALL_PROGRAM = install -s -m 555 MKINSTALLDIRS = $(top_srcdir)/tools/mkinstalldirs MKTAGS = ctags -stv @@ -31,5 +32,5 @@ DEFS = @DEFS@ CPPFLAGS = @CPPFLAGS@ -CFLAGS = @CFLAGS@ +CFLAGS = -O6 LDFLAGS = @LDFLAGS@ LDLIBS = @LIBS@ #@LEXLIB@ @@ -42,5 +43,5 @@ # GNU installation variables bindir = $(exec_prefix)/bin -localedir = $(exec_prefix)/lib/locale +localedir = $(exec_prefix)/share/locale manroot = $(prefix)/man man1dir = man1 @@ -70,5 +71,5 @@ zsoelim = $(shell echo zsoelim |sed '$(transform)') -config_file = $(sysconfdir)/man_db.config +config_file = $(sysconfdir)/manpath.config message_catalogue = man_db.cat @@ -79,8 +80,8 @@ # Some misc stuff... debug = @debug@ -nls = @nls@ +nls = en_GB date = @date@ version = @version@ -man_install_flags = @man_install_flags@ +man_install_flags = -m 4555 -o man -s gencat = $(local_gencat) diff -ru2N man_db-2.3.10/include/manconfig.h.in man_db-MCC/include/manconfig.h.in --- man_db-2.3.10/include/manconfig.h.in Thu Jul 13 11:37:58 1995 +++ man_db-MCC/include/manconfig.h.in Sun Aug 18 17:30:46 1996 @@ -17,5 +17,5 @@ #define STD_SECTIONS { \ - "1", "n", "l", "8", "1m", "3", "2", \ + "1", "8", "2", "3", \ "5", "4", "9", "6", "7", NULL \ } @@ -43,5 +43,5 @@ MAN_CATS - to allow man to create/update cat files */ -/* #define MAN_DB_CREATES */ +#define MAN_DB_CREATES #define MAN_DB_UPDATES #define MAN_CATS @@ -325,5 +325,5 @@ /* FSSTND directories */ -#define CAT_ROOT "/var/catman" /* required by fsstnd() */ +#define CAT_ROOT "/var/cache/man" /* required by fsstnd() */ #define MAN_ROOT "/usr" /* required by fsstnd() */ diff -ru2N man_db-2.3.10/lib/Makefile.in man_db-MCC/lib/Makefile.in --- man_db-2.3.10/lib/Makefile.in Thu Jul 13 16:39:47 1995 +++ man_db-MCC/lib/Makefile.in Sun Aug 18 17:30:46 1996 @@ -10,4 +10,5 @@ library = libman.a +override CFLAGS := $(CFLAGS) -fPIC srcdir = @srcdir@ @@ -38,5 +39,8 @@ -$(RANLIB) $(library) -$(library): $(library)($(ALL)) +$(library): $(ALL) + rm -f $@ + ar cr $@ $^ + $(RANLIB) $@ -$(RANLIB) $@ diff -ru2N man_db-2.3.10/libdb/Makefile.in man_db-MCC/libdb/Makefile.in --- man_db-2.3.10/libdb/Makefile.in Mon May 29 18:36:15 1995 +++ man_db-MCC/libdb/Makefile.in Sun Aug 18 17:30:46 1996 @@ -10,4 +10,5 @@ library = libmandb.a +override CFLAGS := $(CFLAGS) -fPIC srcdir = @srcdir@ @@ -60,6 +61,8 @@ -$(library): $(library)($(ALL)) - -$(RANLIB) $@ +$(library): $(ALL) + rm -f $@ + ar cr $@ $^ + $(RANLIB) $@ # The standard targets diff -ru2N man_db-2.3.10/libdb/db_lookup.c man_db-MCC/libdb/db_lookup.c --- man_db-2.3.10/libdb/db_lookup.c Sun Jun 4 13:07:42 1995 +++ man_db-MCC/libdb/db_lookup.c Sun Aug 18 17:30:46 1996 @@ -49,4 +49,9 @@ #include "db_storage.h" +int debug = 0; +char *database; +MYDBM_FILE dbf; +nl_catd catfd; + /* If using ndbm or BTREE, copy the static storage before doing anything interesting with it */ diff -ru2N man_db-2.3.10/man/Makefile.in man_db-MCC/man/Makefile.in --- man_db-2.3.10/man/Makefile.in Mon Jun 5 17:20:38 1995 +++ man_db-MCC/man/Makefile.in Sun Aug 18 17:30:46 1996 @@ -110,4 +110,6 @@ $(INSTALL_DATA) $(nlspath)/man8/mandb.8 $(mandb.8) $(INSTALL_DATA) $(nlspath)/man8/catman.8 $(catman.8) + gzip -9f $(man.1) $(manpath.1) $(apropos.1) $(whatis.1) $(zsoelim.1) \ + $(manpath.5) $(mandb.8) $(catman.8) nlsuninstall: diff -ru2N man_db-2.3.10/src/Makefile.in man_db-MCC/src/Makefile.in --- man_db-2.3.10/src/Makefile.in Thu Jul 13 13:28:40 1995 +++ man_db-MCC/src/Makefile.in Sun Aug 18 17:30:46 1996 @@ -47,5 +47,5 @@ # The default programs to build -all: manpath mandb apropos whatis catman man +all: ../$(SHLIB) manpath mandb apropos whatis catman man #-----------------------------------------------------------------------# @@ -103,6 +103,6 @@ compression.o fake_security.o lexgrog.o -catman manpath whatis apropos: manp.o util.o -accessdb: ../lib/libman.a +catman manpath whatis apropos: manp.o util.o ../$(SHLIB) +accessdb: ../$(SHLIB) whatis.o: whatis.c @@ -112,5 +112,5 @@ $(CC) $(CFLAGS) $(CPPFLAGS) -DAPROPOS -c $< -o $@ -lexgrog: lexgrog.c ../lib/libman.a +lexgrog: lexgrog.c ../$(SHLIB) $(CC) $(CFLAGS) $(CPPFLAGS) -DTEST $(LDFLAGS) $^ -o $@ @@ -121,12 +121,12 @@ $(CC) $(CFLAGS) $(CPPFLAGS) $(CATMANCPPFLAGS) -c $< -o $@ -globbing: globbing.c ../lib/libman.a +globbing: globbing.c ../$(SHLIB) $(CC) $(CFLAGS) $(CPPFLAGS) -DTEST $(LDFLAGS) $^ -o $@ # programs that depend on db routines... -man mandb catman whatis apropos accessdb: ../libdb/libmandb.a +man mandb catman whatis apropos accessdb: ../$(SHLIB) # All programs depend on these... -$(PROGS): version.o ../lib/libman.a +$(PROGS): version.o # The standard targets diff -ru2N man_db-2.3.10/src/catman.c man_db-MCC/src/catman.c --- man_db-2.3.10/src/catman.c Sun Jun 4 13:08:42 1995 +++ man_db-MCC/src/catman.c Sun Aug 18 17:30:46 1996 @@ -93,11 +93,11 @@ /* globals */ #ifndef debug -int debug = 0; +extern int debug; #endif char *program_name; int quiet = 1; -MYDBM_FILE dbf; +extern MYDBM_FILE dbf; char *manp; -char *database; +extern char *database; static const struct option long_options[] = @@ -388,4 +388,5 @@ #ifdef HAVE_SETLOCALE locale = NLS_INIT; + locale = xstrdup(locale); #endif /* HAVE_SETLOCALE */ diff -ru2N man_db-2.3.10/src/man.c man_db-MCC/src/man.c --- man_db-2.3.10/src/man.c Thu Jul 13 10:22:07 1995 +++ man_db-MCC/src/man.c Sun Aug 18 17:30:46 1996 @@ -346,11 +346,11 @@ /* globals */ #ifndef debug -int debug; +extern int debug; #endif int quiet = 1; char *program_name; -char *database; -MYDBM_FILE dbf; +extern char *database; +extern MYDBM_FILE dbf; char *extension; /* global for globbing.c */ @@ -676,4 +676,5 @@ #ifdef HAVE_SETLOCALE internal_locale = NLS_INIT; + internal_locale = xstrdup(internal_locale); #endif /* HAVE_SETLOCALE */ diff -ru2N man_db-2.3.10/src/man_db.config man_db-MCC/src/man_db.config --- man_db-2.3.10/src/man_db.config Wed Dec 14 13:55:05 1994 +++ man_db-MCC/src/man_db.config Sun Aug 18 17:30:47 1996 @@ -19,4 +19,7 @@ # MANDATORY_MANPATH /usr/man +MANDATORY_MANPATH /usr/X11R6/man +MANDATORY_MANPATH /usr/X11/man +MANDATORY_MANPATH /usr/local/man #--------------------------------------------------------- # set up PATH to MANPATH mapping @@ -28,13 +31,9 @@ MANPATH_MAP /usr/bin /usr/man MANPATH_MAP /usr/local/bin /usr/local/man -MANPATH_MAP /usr/TeX/bin /usr/TeX/man MANPATH_MAP /sbin /usr/man MANPATH_MAP /usr/sbin /usr/man MANPATH_MAP /usr/bin/X11 /usr/X11R6/man MANPATH_MAP /usr/X11R6/bin /usr/X11R6/man -MANPATH_MAP /usr/X386/bin /usr/X386/man -MANPATH_MAP /usr/openwin/bin /usr/openwin/man MANPATH_MAP /usr/games /usr/man -MANPATH_MAP /usr/src/pvm3/lib /usr/src/pvm3/man #--------------------------------------------------------- # For a manpath element to be considered `global' it must be mentioned @@ -62,9 +61,4 @@ MANDB_MAP /usr/man FSSTND MANDB_MAP /usr/local/man FSSTND -MANDB_MAP /usr/TeX/man FSSTND -MANDB_MAP /usr/X386/man FSSTND MANDB_MAP /usr/X11R6/man FSSTND -MANDB_MAP /usr/openwin/man FSSTND -MANDB_MAP /usr/src/X11/man -MANDB_MAP /usr/src/pvm3/man /usr/src/catman/pvm3 #--------------------------------------------------------- diff -ru2N man_db-2.3.10/src/manp.c man_db-MCC/src/manp.c --- man_db-2.3.10/src/manp.c Thu Jul 13 10:22:07 1995 +++ man_db-MCC/src/manp.c Sun Aug 18 17:30:47 1996 @@ -498,6 +498,6 @@ (void) strcat(manpathlist, dlp->mandir); (void) strcat(manpathlist, ":"); - dlp++; } + dlp++; } return manpathlist; diff -ru2N man_db-2.3.10/src/manpath.c man_db-MCC/src/manpath.c --- man_db-2.3.10/src/manpath.c Mon May 8 12:08:14 1995 +++ man_db-MCC/src/manpath.c Sun Aug 18 17:30:47 1996 @@ -38,5 +38,5 @@ #ifndef debug -int debug; +extern int debug; #endif char *program_name; diff -ru2N man_db-2.3.10/src/ult_src.c man_db-MCC/src/ult_src.c --- man_db-2.3.10/src/ult_src.c Sun Jun 4 13:13:11 1995 +++ man_db-MCC/src/ult_src.c Sun Aug 18 17:30:47 1996 @@ -276,5 +276,5 @@ if (flags & SO_LINK) { - char buffer[1024]; + char buffer[1024], *bptr; int val; FILE *fp; @@ -321,7 +321,7 @@ /* make sure that we skip over any comments */ do { - (void) fgets(buffer, 1024, fp); + bptr = fgets(buffer, 1024, fp); } - while (buffer && strncmp(buffer, ".\\\"", 3) == 0); + while (bptr && strncmp(buffer, ".\\\"", 3) == 0); fclose(fp); diff -ru2N man_db-2.3.10/src/util.c man_db-MCC/src/util.c --- man_db-2.3.10/src/util.c Thu Jul 13 10:22:07 1995 +++ man_db-MCC/src/util.c Sun Aug 18 17:30:47 1996 @@ -49,4 +49,6 @@ #include "libdb/mydbm.h" /* for full definition of MAN_DB */ +#define MAX(a,b) ((a)>(b)?a:b) + /* take path, add db name and return */ char *mkdbname(const char *path) @@ -110,7 +112,8 @@ if (fb_sb.st_size == 0) status |= 4; + status |= (MAX(fa_sb.st_mtime, fa_sb.st_ctime) > fb_sb.st_mtime); if (debug) - fprintf(stderr, " (%d)\n", status | (fa_sb.st_mtime > fb_sb.st_mtime)); - return (status | (fa_sb.st_mtime > fb_sb.st_mtime)); + fprintf(stderr, " (%d)\n", status); + return status; } @@ -128,5 +131,5 @@ return status; - return (sb.st_mode&S_IFDIR!=0); + return ((sb.st_mode & S_IFDIR) != 0); } diff -ru2N man_db-2.3.10/src/whatis.c man_db-MCC/src/whatis.c --- man_db-2.3.10/src/whatis.c Thu Jul 13 11:29:18 1995 +++ man_db-MCC/src/whatis.c Sun Aug 18 17:30:47 1996 @@ -77,9 +77,9 @@ #ifndef debug -int debug; +extern int debug; #endif char *program_name; -char *database; -MYDBM_FILE dbf; +extern char *database; +extern MYDBM_FILE dbf; int quiet = 1; @@ -498,4 +498,5 @@ #ifdef HAVE_SETLOCALE locale = NLS_INIT; + locale = xstrdup(locale); #endif /* HAVE_SETLOCALE */ diff -ru2N man_db-2.3.10/zsoelim/Makefile.in man_db-MCC/zsoelim/Makefile.in --- man_db-2.3.10/zsoelim/Makefile.in Sat Apr 1 12:42:55 1995 +++ man_db-MCC/zsoelim/Makefile.in Sun Aug 18 17:30:47 1996 @@ -27,5 +27,5 @@ all: zsoelim -zsoelim: ../lib/libman.a +zsoelim: ../$(SHLIB) ../lib/libman.a: ENDPATCH ./configure --prefix=/usr --with-db=gdbm make * make install * chmod 644 /etc/manpath.config %%