Rename libcom_err to libafscom_err

We no longer provide a compatible libcom_err, and in fact
we renamed the symbols in our libcom_err several years ago
to reflect this fact.
When we build on a system where KRB5_LIBS includes
-lkrb5 -lcom_err , the new Unix build system will pick up
our libcom_err (as $(AFS_LDFLAGS) is the first argument in
AFS_LDRULE and pulls in a linker search path for our libcom_err)
which does not provide all the needed symbols for libkrb5.

Fully rename our libcom_err away to avoid these conflicts.

FIXES 128640

Change-Id: Ifdd677609f432d42252b1716fc5e8755f3a44640
Reviewed-on: http://gerrit.openafs.org/3547
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/afsweb/Makefile.in b/src/afsweb/Makefile.in
index 5b6d1dd..205b320 100644 (file)
--- a/src/afsweb/Makefile.in
+++ b/src/afsweb/Makefile.in
@@ -178,7 +178,7 @@ LIBS=${kauthlib} ${TOP_LIBDIR}/libubik.a ${TOP_LIBDIR}/libprot.a \
        ${authlib} ${rxkadlib} ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/librx.a \
        ${TOP_LIBDIR}/libsys.a  \
        ${TOP_LIBDIR}/liblwp.a ${deslib} ${cmdlib} \
-       ${TOP_LIBDIR}/libcom_err.a ${utilib} \
+       ${TOP_LIBDIR}/libafscom_err.a ${utilib} \
        $(DBM) $(XLIBS)
 
 AR=ar

diff --git a/src/bozo/Makefile.in b/src/bozo/Makefile.in
index 2a91864..1d5356f 100644 (file)
--- a/src/bozo/Makefile.in
+++ b/src/bozo/Makefile.in
@@ -37,7 +37,7 @@ LIBS=   ${TOP_LIBDIR}/librx.a \
        ${TOP_LIBDIR}/libubik.a \
        ${TOP_LIBDIR}/librx.a \
        ${TOP_LIBDIR}/liblwp.a \
-       ${TOP_LIBDIR}/libcom_err.a \
+       ${TOP_LIBDIR}/libafscom_err.a \
        ${TOP_LIBDIR}/util.a \
        ${TOP_LIBDIR}/libsys.a \
        ${TOP_LIBDIR}/libprocmgmt.a \

diff --git a/src/bucoord/Makefile.in b/src/bucoord/Makefile.in
index 029335d..6c481b3 100644 (file)
--- a/src/bucoord/Makefile.in
+++ b/src/bucoord/Makefile.in
@@ -22,7 +22,7 @@ LIBS=${TOP_LIBDIR}/libbudb.a ${TOP_LIBDIR}/libbubasics.a \
         ${TOP_LIBDIR}/libsys.a \
         ${TOP_LIBDIR}/librx.a  ${TOP_LIBDIR}/libsys.a \
         ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libcmd.a \
-        ${TOP_LIBDIR}/libcom_err.a \
+        ${TOP_LIBDIR}/libafscom_err.a \
        ${TOP_LIBDIR}/libafshcrypto_lwp.a \
        ${TOP_LIBDIR}/util.a
 

diff --git a/src/budb/Makefile.in b/src/budb/Makefile.in
index 3eb4d39..26cd7de 100644 (file)
--- a/src/budb/Makefile.in
+++ b/src/budb/Makefile.in
@@ -43,7 +43,7 @@ LIBS=${TOP_LIBDIR}/libbubasics.a \
        ${TOP_LIBDIR}/libsys.a \
        ${TOP_LIBDIR}/liblwp.a \
        ${TOP_LIBDIR}/libcmd.a \
-       ${TOP_LIBDIR}/libcom_err.a \
+       ${TOP_LIBDIR}/libafscom_err.a \
        ${TOP_LIBDIR}/libafshcrypto_lwp.a \
        ${TOP_LIBDIR}/util.a
 

diff --git a/src/butc/Makefile.in b/src/butc/Makefile.in
index 574f3a8..5c93ed5 100644 (file)
--- a/src/butc/Makefile.in
+++ b/src/butc/Makefile.in
@@ -44,7 +44,7 @@ LIBS=${TOP_LIBDIR}/libbudb.a \
         ${TOP_LIBDIR}/libsys.a  \
        ${TOP_LIBDIR}/liblwp.a \
         ${TOP_LIBDIR}/libcmd.a \
-       ${TOP_LIBDIR}/libcom_err.a \
+       ${TOP_LIBDIR}/libafscom_err.a \
        ${TOP_LIBDIR}/libafshcrypto_lwp.a \
        ${TOP_LIBDIR}/libusd.a \
        ${TOP_LIBDIR}/util.a \

diff --git a/src/butm/Makefile.in b/src/butm/Makefile.in
index 540fa8b..ace39e2 100644 (file)
--- a/src/butm/Makefile.in
+++ b/src/butm/Makefile.in
@@ -19,9 +19,9 @@ INCLS=${TOP_INCDIR}/afs/com_err.h ${TOP_INCDIR}/afs/butm.h
 LIBS=${TOP_LIBDIR}/libbubasics.a \
        ${TOP_LIBDIR}/liblwp.a \
        ${TOP_LIBDIR}/libusd.a \
-       ${TOP_LIBDIR}/libcom_err.a \
+       ${TOP_LIBDIR}/libafscom_err.a \
        ${TOP_LIBDIR}/libbutm.a \
-       ${TOP_LIBDIR}/libcom_err.a \
+       ${TOP_LIBDIR}/libafscom_err.a \
        ${TOP_LIBDIR}/util.a \
        ${XLIBS}
 

diff --git a/src/cmd/test/Makefile.in b/src/cmd/test/Makefile.in
index 934ec64..dc96f36 100644 (file)
--- a/src/cmd/test/Makefile.in
+++ b/src/cmd/test/Makefile.in
@@ -14,7 +14,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
-LIBS=-lcmd $(TOP_LIBDIR)/libcom_err.a -lafsutil $(LIB_roken) $(XLIBS)
+LIBS=-lcmd $(TOP_LIBDIR)/libafscom_err.a -lafsutil $(LIB_roken) $(XLIBS)
 
 all: test
 test tests: ctest dtest itest

diff --git a/src/comerr/Makefile.in b/src/comerr/Makefile.in
index 4b0c6c1..ed868ba 100644 (file)
--- a/src/comerr/Makefile.in
+++ b/src/comerr/Makefile.in
@@ -13,7 +13,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
-all: compile_et ${TOP_INCDIR}/afs/com_err.h ${TOP_INCDIR}/afs/error_table.h ${TOP_INCDIR}/afs/mit-sipb-cr.h ${TOP_LIBDIR}/libcom_err.a
+all: compile_et ${TOP_INCDIR}/afs/com_err.h ${TOP_INCDIR}/afs/error_table.h ${TOP_INCDIR}/afs/mit-sipb-cr.h ${TOP_LIBDIR}/libafscom_err.a
 
 buildtools: compile_et
 
@@ -26,7 +26,7 @@ ${TOP_INCDIR}/afs/error_table.h: error_table.h
 ${TOP_INCDIR}/afs/mit-sipb-cr.h: mit-sipb-cr.h
        ${INSTALL_DATA} $? $@
 
-${TOP_LIBDIR}/libcom_err.a: libcom_err.a
+${TOP_LIBDIR}/libafscom_err.a: libafscom_err.a
        ${INSTALL_DATA} $? $@
 
 et_lex.lex.c: et_lex.lex.l
@@ -41,7 +41,7 @@ compile_et:   compile_et.o error_table.o
        $(AFS_LDRULE) compile_et.o error_table.o -L${TOP_LIBDIR} -lafsutil -ll;; \
        esac
 
-libcom_err.a: error_msg.o et_name.o com_err.o AFS_component_version_number.o
+libafscom_err.a: error_msg.o et_name.o com_err.o AFS_component_version_number.o
        $(RM) -f $@
        $(AR) crv $@ error_msg.o et_name.o com_err.o AFS_component_version_number.o
        $(RANLIB) $@
@@ -55,7 +55,7 @@ CFLAGS_error_table.o= -I${srcdir} @CFLAGS_NOUNUSED@ @CFLAGS_NOOLDSTYLE@
 #
 # Installation targets
 #
-install: compile_et com_err.h error_table.h mit-sipb-cr.h libcom_err.a
+install: compile_et com_err.h error_table.h mit-sipb-cr.h libafscom_err.a
        ${INSTALL} -d ${DESTDIR}${bindir}
        ${INSTALL} -d ${DESTDIR}${includedir}/afs
        ${INSTALL} -d ${DESTDIR}${libdir}/afs
@@ -63,9 +63,9 @@ install: compile_et com_err.h error_table.h mit-sipb-cr.h libcom_err.a
        ${INSTALL_DATA} ${srcdir}/com_err.h ${DESTDIR}${includedir}/afs/com_err.h
        ${INSTALL_DATA} ${srcdir}/error_table.h ${DESTDIR}${includedir}/afs/error_table.h
        ${INSTALL_DATA} ${srcdir}/mit-sipb-cr.h ${DESTDIR}${includedir}/afs/mit-sipb-cr.h
-       ${INSTALL_DATA} libcom_err.a ${DESTDIR}${libdir}/afs/libcom_err.a
+       ${INSTALL_DATA} libafscom_err.a ${DESTDIR}${libdir}/afs/libafscom_err.a
 
-dest: compile_et com_err.h error_table.h mit-sipb-cr.h libcom_err.a
+dest: compile_et com_err.h error_table.h mit-sipb-cr.h libafscom_err.a
        ${INSTALL} -d ${DEST}/bin
        ${INSTALL} -d ${DEST}/include/afs
        ${INSTALL} -d ${DEST}/lib/afs
@@ -73,11 +73,11 @@ dest: compile_et com_err.h error_table.h mit-sipb-cr.h libcom_err.a
        ${INSTALL_DATA} ${srcdir}/com_err.h ${DEST}/include/afs/com_err.h
        ${INSTALL_DATA} ${srcdir}/error_table.h ${DEST}/include/afs/error_table.h
        ${INSTALL_DATA} ${srcdir}/mit-sipb-cr.h ${DEST}/include/afs/mit-sipb-cr.h
-       ${INSTALL_DATA} libcom_err.a ${DEST}/lib/afs/libcom_err.a
+       ${INSTALL_DATA} libafscom_err.a ${DEST}/lib/afs/libafscom_err.a
 
 clean:
        $(RM) -f *~ \#* *.bak *.otl *.aux *.toc *.PS *.dvi *.x9700 *.ps \
-               *.cp *.fn *.ky *.log *.pg *.tp *.vr *.o libcom_err.a \
+               *.cp *.fn *.ky *.log *.pg *.tp *.vr *.o libafscom_err.a \
                com_err.o compile_et et.ar TAGS y.tab.c lex.yy.c error_table.c \
                et_lex.lex.c test1.h test1.c test2.h test2.c \
                eddep makedep core AFS_component_version_number.c

diff --git a/src/comerr/test/Makefile.in b/src/comerr/test/Makefile.in
index 9b4542d..a080838 100644 (file)
--- a/src/comerr/test/Makefile.in
+++ b/src/comerr/test/Makefile.in
@@ -15,7 +15,7 @@ install:
 # Build targets
 #
 test:  test.o test1.o test2.o 
-       $(AFS_LDRULE) ${LDIRS} -lcom_err test.o test1.o test2.o 
+       $(AFS_LDRULE) ${LDIRS} -lafscom_err test.o test1.o test2.o
 
 test.o:        test1.h test2.h
 test1.o : test1.c
@@ -30,7 +30,7 @@ clean:
        $(RM) -f *~ \#* *.bak \
                *.otl *.aux *.toc *.PS *.dvi *.x9700 *.ps \
                *.cp *.fn *.ky *.log *.pg *.tp *.vr \
-               *.o *.a libcom_err.a \
+               *.o *.a libafscom_err.a \
                com_err.o compile_et \
                et.ar TAGS y.tab.c lex.yy.c error_table.c \
                et_lex.lex.c \

diff --git a/src/finale/Makefile.in b/src/finale/Makefile.in
index b6fc9f2..4925b9b 100644 (file)
--- a/src/finale/Makefile.in
+++ b/src/finale/Makefile.in
@@ -38,7 +38,7 @@ LIBS=${TOP_LIBDIR}/libubik.a \
        ${TOP_LIBDIR}/libcmd.a \
        ${TOP_LIBDIR}/libvldb.a \
        ${TOP_LIBDIR}/libbos.a \
-       ${TOP_LIBDIR}/libcom_err.a \
+       ${TOP_LIBDIR}/libafscom_err.a \
        ${TOP_LIBDIR}/libvolser.a \
        ${TOP_LIBDIR}/util.a \
        ${TOP_LIBDIR}/libkauth.a \

diff --git a/src/fsprobe/Makefile.in b/src/fsprobe/Makefile.in
index 7520167..796ee08 100644 (file)
--- a/src/fsprobe/Makefile.in
+++ b/src/fsprobe/Makefile.in
@@ -23,7 +23,7 @@ LIBS=${TOP_LIBDIR}/libvolser.a ${TOP_LIBDIR}/vlib.a ${TOP_LIBDIR}/libacl.a \
         ${TOP_LIBDIR}/libubik.a \
         ${TOP_LIBDIR}/libauth.a ${TOP_LIBDIR}/libsys.a \
         ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/librxkad.a \
-        ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/libkauth.a \
+        ${TOP_LIBDIR}/libafscom_err.a ${TOP_LIBDIR}/libkauth.a \
        ${TOP_LIBDIR}/libaudit.a \
        ${TOP_LIBDIR}/libafsint.a \
        ${TOP_LIBDIR}/librx.a \

diff --git a/src/gtx/Makefile.in b/src/gtx/Makefile.in
index 4b5a97a..eea4fd7 100644 (file)
--- a/src/gtx/Makefile.in
+++ b/src/gtx/Makefile.in
@@ -40,7 +40,7 @@ LIBS=\
        ${TOP_LIBDIR}/libkauth.a \
        ${TOP_LIBDIR}/libauth.a \
        ${TOP_LIBDIR}/librxkad.a \
-       ${TOP_LIBDIR}/libcom_err.a \
+       ${TOP_LIBDIR}/libafscom_err.a \
        ${TOP_LIBDIR}/util.a
 
 EXTRA_LIBS=${LIB_curses} ${XLIBS}

diff --git a/src/kauth/Makefile.in b/src/kauth/Makefile.in
index 59b2b84..955e5c8 100644 (file)
--- a/src/kauth/Makefile.in
+++ b/src/kauth/Makefile.in
@@ -33,7 +33,7 @@ LIBS=${TOP_LIBDIR}/libubik.a \
        ${TOP_LIBDIR}/libsys.a  \
        ${TOP_LIBDIR}/liblwp.a \
        ${TOP_LIBDIR}/libcmd.a \
-       ${TOP_LIBDIR}/libcom_err.a \
+       ${TOP_LIBDIR}/libafscom_err.a \
        ${TOP_LIBDIR}/libafsutil.a \
        $(DBM) \
        ${TOP_LIBDIR}/libafshcrypto_lwp.a
@@ -50,7 +50,7 @@ KLIBS=${TOP_LIBDIR}/libubik.a \
        ${TOP_LIBDIR}/libsys.a  \
        ${TOP_LIBDIR}/liblwp.a \
        ${TOP_LIBDIR}/libcmd.a \
-       ${TOP_LIBDIR}/libcom_err.a \
+       ${TOP_LIBDIR}/libafscom_err.a \
        ${TOP_LIBDIR}/libafsutil.a \
        ${TOP_LIBDIR}/libafshcrypto_lwp.a
 

diff --git a/src/kauth/test/Makefile.in b/src/kauth/test/Makefile.in
index c9a397a..3aa2acc 100644 (file)
--- a/src/kauth/test/Makefile.in
+++ b/src/kauth/test/Makefile.in
@@ -14,7 +14,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
 INCDIRS= -I${DESTDIR}/include -I..
 LDIRS= -L${DESTDIR}/lib -L${DESTDIR}/lib/afs -L..
-LIBS= -llwp -ldes -lrxkad -lauth -lcmd -lubik -lprot -lsys -lrx -lcom_err -lkauth
+LIBS= -llwp -ldes -lrxkad -lauth -lcmd -lubik -lprot -lsys -lrx -lafscom_err -lkauth
 
 # the only tests _known_ to work are multiklog and the tcl scripts.
 

diff --git a/src/packaging/FreeBSD/pkg-plist b/src/packaging/FreeBSD/pkg-plist
index 147578a..afdce82 100644 (file)
--- a/src/packaging/FreeBSD/pkg-plist
+++ b/src/packaging/FreeBSD/pkg-plist
@@ -169,6 +169,7 @@ include/openafs/timer.h
 include/openafs/ubik.h
 include/openafs/ubik_int.h
 lib/afs/libacl.a
+lib/afs/libafscom_err.a
 lib/afs/libafsint.a
 lib/afs/libafsutil.a
 lib/afs/libaudit.a
@@ -180,7 +181,6 @@ lib/afs/libbudb.a
 lib/afs/libbutm.a
 lib/afs/libbxdb.a
 lib/afs/libcmd.a
-lib/afs/libcom_err.a
 lib/afs/libdir.a
 lib/afs/libfsprobe.a
 lib/afs/libgtx.a

diff --git a/src/ptserver/Makefile.in b/src/ptserver/Makefile.in
index c646eda..57257bc 100644 (file)
--- a/src/ptserver/Makefile.in
+++ b/src/ptserver/Makefile.in
@@ -39,7 +39,7 @@ LIBS=   ${TOP_LIBDIR}/libubik.a \
        ${TOP_LIBDIR}/librx.a \
        ${TOP_LIBDIR}/liblwp.a \
        ${TOP_LIBDIR}/libcmd.a \
-       ${TOP_LIBDIR}/libcom_err.a \
+       ${TOP_LIBDIR}/libafscom_err.a \
        ${TOP_LIBDIR}/libsys.a \
        ${TOP_LIBDIR}/libafsutil.a \
        ${TOP_LIBDIR}/libafshcrypto_lwp.a

diff --git a/src/rxkad/test/Makefile.in b/src/rxkad/test/Makefile.in
index e3fdd3d..6002b07 100644 (file)
--- a/src/rxkad/test/Makefile.in
+++ b/src/rxkad/test/Makefile.in
@@ -27,10 +27,10 @@ LIBS=${TOP_LIBDIR}/libauth.a \
        ${TOP_LIBDIR}/librxkad.a \
        ${TOP_LIBDIR}/libafshcrypto_lwp.a \
        ${TOP_LIBDIR}/librx.a \
-       ${TOP_LIBDIR}/libcom_err.a \
+       ${TOP_LIBDIR}/libafscom_err.a \
        ${TOP_LIBDIR}/util.a
 
-THLIBS= ${TOP_LIBDIR}/libcmd.a  ${TOP_LIBDIR}/libcom_err.a \
+THLIBS= ${TOP_LIBDIR}/libcmd.a  ${TOP_LIBDIR}/libafscom_err.a \
        ${TOP_LIBDIR}/libafsauthent.a ${TOP_LIBDIR}/libafsrpc.a \
        ${MT_LIBS} ${ULIBS} ${XLIBS} ${LIBRPC} -lpthread
 

diff --git a/src/scout/Makefile.in b/src/scout/Makefile.in
index 341599f..b737cb0 100644 (file)
--- a/src/scout/Makefile.in
+++ b/src/scout/Makefile.in
@@ -43,7 +43,7 @@ LIBS=${TOP_LIBDIR}/libgtx.a \
        ${TOP_LIBDIR}/librx.a \
        ${TOP_LIBDIR}/libsys.a \
        ${TOP_LIBDIR}/libaudit.a \
-       ${TOP_LIBDIR}/libcom_err.a \
+       ${TOP_LIBDIR}/libafscom_err.a \
        ${TOP_LIBDIR}/liblwp.a \
        ${TOP_LIBDIR}/libafshcrypto_lwp.a \
        ${TOP_LIBDIR}/util.a

diff --git a/src/sgistuff/Makefile.in b/src/sgistuff/Makefile.in
index d5fd951..bc578fc 100644 (file)
--- a/src/sgistuff/Makefile.in
+++ b/src/sgistuff/Makefile.in
@@ -32,7 +32,7 @@ AFSLIBS=${TOP_LIBDIR}/libkauth.a \
        ${TOP_LIBDIR}/libafshcrypto_lwp.a \
        ${LIBDIR}/liblwp.a \
         ${TOP_LIBDIR}/libcmd.a \
-       ${TOP_LIBDIR}/libcom_err.a \
+       ${TOP_LIBDIR}/libafscom_err.a \
        ${TOP_LIBDIR}/util.a
 
 KAFSLIBS=${TOP_LIBDIR}/libkauth.krb.a \
@@ -45,7 +45,7 @@ KAFSLIBS=${TOP_LIBDIR}/libkauth.krb.a \
        ${TOP_LIBDIR}/libafshcrypto_lwp.a \
        ${LIBDIR}/liblwp.a \
         ${TOP_LIBDIR}/libcmd.a \
-       ${TOP_LIBDIR}/libcom_err.a \
+       ${TOP_LIBDIR}/libafscom_err.a \
        ${TOP_LIBDIR}/util.a
 
 AUTHFILES=ta-rauth.o rcmd.o herror.o

diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in
index 220087c..18df6d2 100644 (file)
--- a/src/tests/Makefile.in
+++ b/src/tests/Makefile.in
@@ -25,7 +25,7 @@ LIBS=\
        ${TOP_LIBDIR}/librx.a \
        ${TOP_LIBDIR}/liblwp.a \
        ${TOP_LIBDIR}/util.a \
-       ${TOP_LIBDIR}/libcom_err.a \
+       ${TOP_LIBDIR}/libafscom_err.a \
        ${XLIBS}
 
 OBJS_afsdump_scan    = afsdump_scan.o repair.o
@@ -100,7 +100,7 @@ SYS_LIBS    = ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a $
 
 AUTH_LIBS      = ${TOP_LIBDIR}/libauth.a ${SYS_LIBS}
 
-INT_LIBS       = ${TOP_LIBDIR}/libafsint.a ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/util.a 
+INT_LIBS       = ${TOP_LIBDIR}/libafsint.a ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libafscom_err.a ${TOP_LIBDIR}/util.a
 
 TEST_PROGRAMS = write-ro-file hello-world read-vs-mmap read-vs-mmap2    \
                mmap-and-read large-dir large-dir2 large-dir3 mountpoint \

diff --git a/src/tsm41/Makefile.in b/src/tsm41/Makefile.in
index 45dd6e4..749d4dc 100644 (file)
--- a/src/tsm41/Makefile.in
+++ b/src/tsm41/Makefile.in
@@ -26,7 +26,7 @@ AFSLIBS = \
                ${TOP_LIBDIR}/librx.a \
                ${TOP_LIBDIR}/liblwp.a \
                ${TOP_LIBDIR}/libcmd.a \
-               ${TOP_LIBDIR}/libcom_err.a \
+               ${TOP_LIBDIR}/libafscom_err.a \
                ${TOP_LIBDIR}/util.a \
                ${TOP_LIBDIR}/libaudit.a
 
@@ -41,7 +41,7 @@ KAFSLIBS = \
                ${TOP_LIBDIR}/librx.a \
                ${TOP_LIBDIR}/liblwp.a \
                ${TOP_LIBDIR}/libcmd.a \
-               ${TOP_LIBDIR}/libcom_err.a \
+               ${TOP_LIBDIR}/libafscom_err.a \
                ${TOP_LIBDIR}/util.a \
                ${TOP_LIBDIR}/libaudit.a
 

diff --git a/src/tubik/Makefile.in b/src/tubik/Makefile.in
index 462a4e5..6967796 100644 (file)
--- a/src/tubik/Makefile.in
+++ b/src/tubik/Makefile.in
@@ -33,7 +33,7 @@ UTILOBJS=assert.o uuid.o serverLog.o fileutil.o netutils.o dirpath.o \
        volparse.o flipbase64.o softsig.o hostparse.o pthread_glock.o
 
 LIBS=${RXOBJS} ${UTILOBJS} ${TOP_LIBDIR}/libafsauthent.a ${TOP_LIBDIR}/libafsrpc.a \
-     ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/libcmd.a \
+     ${TOP_LIBDIR}/libafscom_err.a ${TOP_LIBDIR}/libcmd.a \
      ${TOP_LIBDIR}/libsys.a ${XLIBS} ${MT_LIBS}
 
 all: depinstall ${TOP_LIBDIR}/libubik_pthread.a udebug utst_server utst_client

diff --git a/src/ubik/Makefile.in b/src/ubik/Makefile.in
index 6b8fe74..f6c1e1c 100644 (file)
--- a/src/ubik/Makefile.in
+++ b/src/ubik/Makefile.in
@@ -23,7 +23,7 @@ INCLS=${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/lock.h \
        ${TOP_INCDIR}/lock.h ubik.h ubik_int.h
 
 LIBS=${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a \
-     ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/libcmd.a \
+     ${TOP_LIBDIR}/libafscom_err.a ${TOP_LIBDIR}/libcmd.a \
      ${TOP_LIBDIR}/util.a ${TOP_LIBDIR}/libsys.a ${XLIBS}
 
 all: depinstall ${TOP_LIBDIR}/libubik.a udebug utst_server utst_client

diff --git a/src/update/Makefile.in b/src/update/Makefile.in
index eb2cd94..3fcd798 100644 (file)
--- a/src/update/Makefile.in
+++ b/src/update/Makefile.in
@@ -20,7 +20,7 @@ LIBS=${TOP_LIBDIR}/libauth.a \
        ${TOP_LIBDIR}/libsys.a \
        ${TOP_LIBDIR}/librx.a \
        ${TOP_LIBDIR}/liblwp.a \
-       ${TOP_LIBDIR}/libcom_err.a \
+       ${TOP_LIBDIR}/libafscom_err.a \
        ${TOP_LIBDIR}/libafshcrypto_lwp.a \
        ${TOP_LIBDIR}/util.a
 

diff --git a/src/uss/Makefile.in b/src/uss/Makefile.in
index 99d092a..dc037f2 100644 (file)
--- a/src/uss/Makefile.in
+++ b/src/uss/Makefile.in
@@ -31,7 +31,7 @@ LIBS=${TOP_LIBDIR}/libvolser.a \
        ${TOP_LIBDIR}/libsys.a \
        ${TOP_LIBDIR}/liblwp.a \
        ${TOP_LIBDIR}/libcmd.a \
-       ${TOP_LIBDIR}/libcom_err.a \
+       ${TOP_LIBDIR}/libafscom_err.a \
        ${TOP_LIBDIR}/util.a \
        ${TOP_LIBDIR}/libafshcrypto_lwp.a
 

diff --git a/src/venus/Makefile.in b/src/venus/Makefile.in
index 9199ef9..124ea48 100644 (file)
--- a/src/venus/Makefile.in
+++ b/src/venus/Makefile.in
@@ -41,7 +41,7 @@ FSLIBS=${TOP_LIBDIR}/libsys.a \
         ${TOP_LIBDIR}/vlib.a \
         ${TOP_LIBDIR}/libauth.a \
         ${TOP_LIBDIR}/librxkad.a \
-        ${TOP_LIBDIR}/libcom_err.a \
+        ${TOP_LIBDIR}/libafscom_err.a \
         ${TOP_LIBDIR}/libcmd.a \
         ${TOP_LIBDIR}/libkauth.a \
         ${TOP_LIBDIR}/librx.a \
@@ -55,7 +55,7 @@ CMLIBS=${TOP_LIBDIR}/libsys.a \
         ${TOP_LIBDIR}/libafsint.a \
         ${TOP_LIBDIR}/librxkad.a \
         ${TOP_LIBDIR}/libauth.a \
-        ${TOP_LIBDIR}/libcom_err.a \
+        ${TOP_LIBDIR}/libafscom_err.a \
         ${TOP_LIBDIR}/libcmd.a \
         ${TOP_LIBDIR}/librx.a \
         ${TOP_LIBDIR}/libsys.a \

diff --git a/src/venus/test/Makefile.in b/src/venus/test/Makefile.in
index ce3f151..78d6192 100644 (file)
--- a/src/venus/test/Makefile.in
+++ b/src/venus/test/Makefile.in
@@ -18,7 +18,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INCDIRS= -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -I..
 LDIRS= -L${TOP_LIBDIR} -L..
 LIBS= -lsys -lubik -lvldb -lauth -lrxkad -lafshcrypto_lwp \
-      -lcom_err -lcmd -lrx -llwp -lafsutil
+      -lafscom_err -lcmd -lrx -llwp -lafsutil
 
 all test:  fulltest owntest idtest getinitparams
 

diff --git a/src/viced/Makefile.in b/src/viced/Makefile.in
index a73cb62..4caca0c 100644 (file)
--- a/src/viced/Makefile.in
+++ b/src/viced/Makefile.in
@@ -30,7 +30,7 @@ LIBS=${TOP_LIBDIR}/libacl.a   \
        ${TOP_LIBDIR}/librxstat.a       \
        ${TOP_LIBDIR}/librx.a           \
        ${TOP_LIBDIR}/libsys.a  \
-       ${TOP_LIBDIR}/libcom_err.a      \
+       ${TOP_LIBDIR}/libafscom_err.a   \
        ${TOP_LIBDIR}/liblwp.a \
        ${TOP_LIBDIR}/libafsutil.a \
        ${TOP_LIBDIR}/libafshcrypto_lwp.a

diff --git a/src/vlserver/Makefile.in b/src/vlserver/Makefile.in
index bd47fec..68c9f44 100644 (file)
--- a/src/vlserver/Makefile.in
+++ b/src/vlserver/Makefile.in
@@ -31,7 +31,7 @@ LIBS=\
        ${TOP_LIBDIR}/librxstat.a \
        ${TOP_LIBDIR}/librx.a \
        ${TOP_LIBDIR}/liblwp.a \
-       ${TOP_LIBDIR}/libcom_err.a \
+       ${TOP_LIBDIR}/libafscom_err.a \
        ${TOP_LIBDIR}/libcmd.a \
        ${TOP_LIBDIR}/libsys.a \
        ${TOP_LIBDIR}/libafsutil.a \

diff --git a/src/volser/Makefile.in b/src/volser/Makefile.in
index a52501a..6992768 100644 (file)
--- a/src/volser/Makefile.in
+++ b/src/volser/Makefile.in
@@ -40,7 +40,7 @@ LIBS=\
        ${TOP_LIBDIR}/librx.a \
        ${TOP_LIBDIR}/liblwp.a \
        ${TOP_LIBDIR}/libsys.a \
-       ${TOP_LIBDIR}/libcom_err.a \
+       ${TOP_LIBDIR}/libafscom_err.a \
        ${TOP_LIBDIR}/libkauth.a \
        ${TOP_LIBDIR}/libusd.a \
        ${TOP_LIBDIR}/libafshcrypto_lwp.a \
@@ -52,7 +52,7 @@ VOLDUMP_LIBS = \
        ../vol/vlib.a \
        ${TOP_LIBDIR}/libcmd.a \
        ${TOP_LIBDIR}/util.a \
-       ${TOP_LIBDIR}/libcom_err.a \
+       ${TOP_LIBDIR}/libafscom_err.a \
        ${TOP_LIBDIR}/libdir.a \
        ${TOP_LIBDIR}/librx.a  \
        ${TOP_LIBDIR}/liblwp.a  \