From 3fb6166b7fdd6d387cef56076f7aee127cdd6b72 Mon Sep 17 00:00:00 2001 From: danw Date: Thu, 27 Aug 1998 17:13:13 +0000 Subject: [PATCH] make things depend on libmoira.a, libgdss.a, and rsaref.a as appropriate --- Makefile.in | 5 +- afssync/Makefile.in | 5 +- backup/Makefile.in | 5 +- clients/addusr/Makefile.in | 3 +- clients/blanche/Makefile.in | 3 +- clients/mailmaint/Makefile.in | 3 +- clients/moira/Makefile.in | 6 +- clients/mrcheck/Makefile.in | 3 +- clients/mrtest/Makefile.in | 3 +- clients/passwd/Makefile.in | 7 ++- configure | 109 ++++++++++++++++++++-------------- configure.in | 7 +++ dbck/Makefile.in | 3 +- dcm/Makefile.in | 3 +- gen/Makefile.in | 20 ++++--- incremental/Makefile.in | 3 +- reg_svr/Makefile.in | 4 +- regtape/Makefile.in | 12 ++-- server/Makefile.in | 5 +- update/Makefile.in | 5 +- 20 files changed, 133 insertions(+), 81 deletions(-) diff --git a/Makefile.in b/Makefile.in index 179f149e..7e303717 100644 --- a/Makefile.in +++ b/Makefile.in @@ -19,8 +19,6 @@ DEPDIRS=@COM_ERR_SUBDIR@ SUBDIRS=$(CLIENTDIRS) @SVRSUBDIRS@ -world: depend all - all: @for d in $(SUBDIRS); do (echo "### Making $@ in $$d"; cd $$d; $(MAKE) $@) || exit 1; done @@ -36,3 +34,6 @@ depend: install: $(srcdir)/mkinstalldirs $(bindir) $(sbindir) $(mrbindir) $(mandir) @for d in $(SUBDIRS); do (echo "### Making $@ in $$d"; cd $$d; $(MAKE) $@) || exit 1; done + +world: depend all + diff --git a/afssync/Makefile.in b/afssync/Makefile.in index edbc229c..dcb5379c 100644 --- a/afssync/Makefile.in +++ b/afssync/Makefile.in @@ -21,6 +21,7 @@ AFS_EXTRA_LIBS=@AFS_EXTRA_LIBS@ AFS_DIR=@AFS_DIR@ SQL_LIBS=@SQL_LIBS@ LIBS=@LIBS@ +MR_LIBDEP=@MR_LIBDEP@ INSTALL=@INSTALL@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ @@ -57,8 +58,8 @@ install: all $(INSTALL_PROGRAM) pt_util $(mrbindir) $(INSTALL_PROGRAM) $(srcdir)/pt_util.pl $(mrbindir) -afssync: $(SYNC_OBJS) +afssync: $(SYNC_OBJS) $(MR_LIBDEP) $(CC) -o $@ $(LDFLAGS) $(SYNC_OBJS) $(AFS_LIBS) -llwp -lprot $(AFS_EXTRA_LIBS) $(SQL_LIBS) $(LIBS) -pt_util: $(UTIL_OBJS) +pt_util: $(UTIL_OBJS) $(MR_LIBDEP) $(CC) -o $@ $(LDFLAGS) $(UTIL_OBJS) $(AFS_LIBS) -llwp -lprot $(AFS_EXTRA_LIBS) $(LIBS) diff --git a/backup/Makefile.in b/backup/Makefile.in index 31c01bb3..fb27826d 100644 --- a/backup/Makefile.in +++ b/backup/Makefile.in @@ -15,6 +15,7 @@ PRO_C_OPTS=@PRO_C_OPTS@ PRO_C_FLAGS=$(PRO_C_OPTS) $(PRO_C_DEFS) $(PRO_C_INCLUDES) LDFLAGS=@LDFLAGS@ LIBS=@SQL_LIBS@ @LIBS@ +MR_LIBDEP=@MR_LIBDEP@ INSTALL=@INSTALL@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ @@ -51,10 +52,10 @@ install: all $(INSTALL_PROGRAM) mrbackup $(mrbindir) $(INSTALL_PROGRAM) mrrestore $(mrbindir) -mrbackup: $(BOBJS) +mrbackup: $(BOBJS) $(MR_LIBDEP) $(CC) -o $@ $(LDFLAGS) $(BOBJS) $(LIBS) -mrrestore: $(ROBJS) +mrrestore: $(ROBJS) $(MR_LIBDEP) $(CC) -o $@ $(LDFLAGS) $(ROBJS) $(LIBS) bkup.pc bkup1.pc bkup.h: $(SRCTOP)/db/schema.sql $(srcdir)/db2bkup.awk diff --git a/clients/addusr/Makefile.in b/clients/addusr/Makefile.in index a43087c5..6b62e51e 100644 --- a/clients/addusr/Makefile.in +++ b/clients/addusr/Makefile.in @@ -10,6 +10,7 @@ DEFS=@DEFS@ ALL_CFLAGS=$(CPPFLAGS) $(CFLAGS) $(DEFS) LDFLAGS=@LDFLAGS@ LIBS=@LIBS@ +MR_LIBDEP=@MR_LIBDEP@ INSTALL=@INSTALL@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ @@ -38,5 +39,5 @@ depend: install: all $(INSTALL_PROGRAM) -m 755 addusr $(bindir) -$(TARGET): $(OBJS) +$(TARGET): $(OBJS) $(MR_LIBDEP) $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) diff --git a/clients/blanche/Makefile.in b/clients/blanche/Makefile.in index e9eb3885..d00867ca 100644 --- a/clients/blanche/Makefile.in +++ b/clients/blanche/Makefile.in @@ -10,6 +10,7 @@ DEFS=@DEFS@ ALL_CFLAGS=$(CPPFLAGS) $(CFLAGS) $(DEFS) LDFLAGS=@LDFLAGS@ LIBS=@LIBS@ +MR_LIBDEP=@MR_LIBDEP@ INSTALL=@INSTALL@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ @@ -38,5 +39,5 @@ depend: install: all $(INSTALL_PROGRAM) blanche $(bindir) -$(TARGET): $(OBJS) +$(TARGET): $(OBJS) $(MR_LIBDEP) $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) diff --git a/clients/mailmaint/Makefile.in b/clients/mailmaint/Makefile.in index fc6187f5..2192c51a 100644 --- a/clients/mailmaint/Makefile.in +++ b/clients/mailmaint/Makefile.in @@ -10,6 +10,7 @@ DEFS=@DEFS@ ALL_CFLAGS=$(CPPFLAGS) $(CFLAGS) $(DEFS) LDFLAGS=@LDFLAGS@ LIBS=@CURSES_LIBS@ @LIBS@ +MR_LIBDEP=@MR_LIBDEP@ INSTALL=@INSTALL@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ @@ -38,5 +39,5 @@ depend: install: all $(INSTALL_PROGRAM) mailmaint $(bindir) -$(TARGET): $(OBJS) +$(TARGET): $(OBJS) $(MR_LIBDEP) $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) diff --git a/clients/moira/Makefile.in b/clients/moira/Makefile.in index 9ca16d7b..54370467 100644 --- a/clients/moira/Makefile.in +++ b/clients/moira/Makefile.in @@ -10,6 +10,8 @@ DEFS=@DEFS@ ALL_CFLAGS=$(CPPFLAGS) $(CFLAGS) $(DEFS) LDFLAGS=@LDFLAGS@ LIBS=@CURSES_LIBS@ @GDSS_LIBS@ @LIBS@ +MR_LIBDEP=@MR_LIBDEP@ +GDSS_LIBDEP=@GDSS_LIBDEP@ INSTALL=@INSTALL@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ @@ -46,8 +48,8 @@ install: all ln -s $(bindir)/dcmmaint moira ln -s $(bindir)/usermaint moira -moira: $(MOBJS) +moira: $(MOBJS) $(MR_LIBDEP) $(GDSS_LIBDEP) $(CC) -o $@ $(LDFLAGS) $(MOBJS) $(LIBS) -namespace: $(NOBJS) +namespace: $(NOBJS) $(MR_LIBDEP) $(GDSS_LIBDEP) $(CC) -o $@ $(LDFLAGS) $(NOBJS) $(LIBS) diff --git a/clients/mrcheck/Makefile.in b/clients/mrcheck/Makefile.in index e992fa71..457e4f1a 100644 --- a/clients/mrcheck/Makefile.in +++ b/clients/mrcheck/Makefile.in @@ -10,6 +10,7 @@ DEFS=@DEFS@ ALL_CFLAGS=$(CPPFLAGS) $(CFLAGS) $(DEFS) LDFLAGS=@LDFLAGS@ LIBS=@LIBS@ +MR_LIBDEP=@MR_LIBDEP@ INSTALL=@INSTALL@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ @@ -38,5 +39,5 @@ depend: install: all $(INSTALL_PROGRAM) mrcheck $(bindir) -$(TARGET): $(OBJS) +$(TARGET): $(OBJS) $(MR_LIBDEP) $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) diff --git a/clients/mrtest/Makefile.in b/clients/mrtest/Makefile.in index ef709cec..ec225f28 100644 --- a/clients/mrtest/Makefile.in +++ b/clients/mrtest/Makefile.in @@ -10,6 +10,7 @@ DEFS=@DEFS@ ALL_CFLAGS=$(CPPFLAGS) $(CFLAGS) $(DEFS) LDFLAGS=@LDFLAGS@ LIBS=@READLINE_LIBS@ @LIBS@ +MR_LIBDEP=@MR_LIBDEP@ INSTALL=@INSTALL@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ @@ -38,5 +39,5 @@ depend: install: all $(INSTALL_PROGRAM) mrtest $(bindir) -$(TARGET): $(OBJS) +$(TARGET): $(OBJS) $(MR_LIBDEP) $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) diff --git a/clients/passwd/Makefile.in b/clients/passwd/Makefile.in index 8fe80a80..fd5914d2 100644 --- a/clients/passwd/Makefile.in +++ b/clients/passwd/Makefile.in @@ -10,6 +10,7 @@ DEFS=@DEFS@ ALL_CFLAGS=$(CPPFLAGS) $(CFLAGS) $(DEFS) LDFLAGS=@LDFLAGS@ LIBS=@LIBS@ +MR_LIBDEP=@MR_LIBDEP@ INSTALL=@INSTALL@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ @@ -40,11 +41,11 @@ install: all $(INSTALL_PROGRAM0 chpobox $(bindir) $(INSTALL_PROGRAM) chsh $(bindir) -chfn: chfn.o +chfn: chfn.o $(MR_LIBDEP) $(CC) -o $@ $(LDFLAGS) $@.o $(LIBS) -chpobox: chpobox.o +chpobox: chpobox.o $(MR_LIBDEP) $(CC) -o $@ $(LDFLAGS) $@.o $(LIBS) -chsh: chsh.o +chsh: chsh.o $(MR_LIBDEP) $(CC) -o $@ $(LDFLAGS) $@.o $(LIBS) diff --git a/configure b/configure index 9f025a37..7194b501 100755 --- a/configure +++ b/configure @@ -1716,8 +1716,22 @@ else if test ! -d util; then mkdir util fi - GDSS_CPPFLAGS='-I$(SRCTOP)/util/gdss/include' + + + case $CPPFLAGS in + *-I'-I$(SRCTOP)/util/gdss/include'*) ;; + *) CPPFLAGS=-I'-I$(SRCTOP)/util/gdss/include'\ $CPPFLAGS ;; + esac + + + case $PRO_C_INCLUDES in + *INCLUDE='-I$(SRCTOP)/util/gdss/include'*) ;; + *) PRO_C_INCLUDES=INCLUDE='-I$(SRCTOP)/util/gdss/include'\ $PRO_C_INCLUDES ;; + esac + + GDSS_LIBS='-L$(BUILDTOP)/util/gdss/lib -lgdss' + GDSS_LIBDEP='$(BUILDTOP)/util/gdss/lib/libgdss.a' else gdss=no fi @@ -1748,9 +1762,10 @@ fi + # RSAREF support (default: build util/rsaref if present) echo $ac_n "checking for RSAREF""... $ac_c" 1>&6 -echo "configure:1754: checking for RSAREF" >&5 +echo "configure:1769: checking for RSAREF" >&5 # Check whether --with-rsaref or --without-rsaref was given. if test "${with_rsaref+set}" = set; then withval="$with_rsaref" @@ -1767,8 +1782,9 @@ else if test ! -d util; then mkdir util fi - RSAREF_CPPFLAGS="-I$(SRCTOP)/util/rsaref" + RSAREF_CPPFLAGS='-I$(SRCTOP)/util/rsaref' RSAREF_LIBS='$(BUILDTOP)/util/rsaref/rsaref.a' + RSAREF_LIBDEP='$(BUILDTOP)/util/rsaref/rsaref.a' else rsaref=no fi @@ -1793,9 +1809,10 @@ fi + # Oracle (default: yes, if $ORACLE_HOME is set) echo $ac_n "checking for Oracle""... $ac_c" 1>&6 -echo "configure:1799: checking for Oracle" >&5 +echo "configure:1816: checking for Oracle" >&5 # Check whether --with-oracle or --without-oracle was given. if test "${with_oracle+set}" = set; then withval="$with_oracle" @@ -1825,7 +1842,7 @@ fi # AFS support echo $ac_n "checking for AFS""... $ac_c" 1>&6 -echo "configure:1829: checking for AFS" >&5 +echo "configure:1846: checking for AFS" >&5 # Check whether --with-afs or --without-afs was given. if test "${with_afs+set}" = set; then withval="$with_afs" @@ -1843,12 +1860,12 @@ if test "$afs" != no -a "$oracle" != no; then AFS_DIR=$afs fi echo $ac_n "checking for insque""... $ac_c" 1>&6 -echo "configure:1847: checking for insque" >&5 +echo "configure:1864: checking for insque" >&5 if eval "test \"`echo '$''{'ac_cv_func_insque'+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; then +if { (eval echo configure:1892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_insque=yes" else @@ -1889,7 +1906,7 @@ if eval "test \"`echo '$ac_cv_func_'insque`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for insque in -lcompat""... $ac_c" 1>&6 -echo "configure:1893: checking for insque in -lcompat" >&5 +echo "configure:1910: checking for insque in -lcompat" >&5 ac_lib_var=`echo compat'_'insque | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1897,7 +1914,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcompat $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1929: \"$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 @@ -1932,12 +1949,12 @@ fi fi echo $ac_n "checking for sigvec""... $ac_c" 1>&6 -echo "configure:1936: checking for sigvec" >&5 +echo "configure:1953: checking for sigvec" >&5 if eval "test \"`echo '$''{'ac_cv_func_sigvec'+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; then +if { (eval echo configure:1981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_sigvec=yes" else @@ -1978,7 +1995,7 @@ if eval "test \"`echo '$ac_cv_func_'sigvec`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for sigvec in -lucb""... $ac_c" 1>&6 -echo "configure:1982: checking for sigvec in -lucb" >&5 +echo "configure:1999: checking for sigvec in -lucb" >&5 ac_lib_var=`echo ucb'_'sigvec | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1986,7 +2003,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lucb -L/usr/ucblib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2018: \"$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 @@ -2021,7 +2038,7 @@ fi fi echo $ac_n "checking for pioctl in -lsys""... $ac_c" 1>&6 -echo "configure:2025: checking for pioctl in -lsys" >&5 +echo "configure:2042: checking for pioctl in -lsys" >&5 ac_lib_var=`echo sys'_'pioctl | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2029,7 +2046,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsys $AFS_LIBS -lrx -llwp -lsys $AFS_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2061: \"$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 @@ -2082,14 +2099,14 @@ fi # GNU readline echo "checking for GNU readline..." 1>&6 -echo "configure:2086: checking for GNU readline..." >&5 +echo "configure:2103: checking for GNU readline..." >&5 # Check whether --with-readline or --without-readline was given. if test "${with_readline+set}" = set; then withval="$with_readline" readline="$withval" else echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 -echo "configure:2093: checking for readline in -lreadline" >&5 +echo "configure:2110: checking for readline in -lreadline" >&5 ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2097,7 +2114,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lreadline -ltermcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2129: \"$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 @@ -2143,9 +2160,9 @@ fi # Curses curses=curses echo "checking for curses" 1>&6 -echo "configure:2147: checking for curses" >&5 +echo "configure:2164: checking for curses" >&5 echo $ac_n "checking for main in -lcurses""... $ac_c" 1>&6 -echo "configure:2149: checking for main in -lcurses" >&5 +echo "configure:2166: checking for main in -lcurses" >&5 ac_lib_var=`echo curses'_'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 @@ -2153,14 +2170,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2181: \"$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 @@ -2179,7 +2196,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for main in -lncurses""... $ac_c" 1>&6 -echo "configure:2183: checking for main in -lncurses" >&5 +echo "configure:2200: checking for main in -lncurses" >&5 ac_lib_var=`echo ncurses'_'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 @@ -2187,14 +2204,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2215: \"$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 @@ -2220,12 +2237,12 @@ if test -n "$curses"; then OLDLIBS=$LIBS LIBS=-l$curses echo "checking if curses needs termcap" 1>&6 -echo "configure:2224: checking if curses needs termcap" >&5 +echo "configure:2241: checking if curses needs termcap" >&5 if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < main(int argc, char **argv) @@ -2235,7 +2252,7 @@ else return 0; } EOF -if { (eval echo configure:2239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then CURSES_LIBS="-l$curses" else @@ -2247,7 +2264,7 @@ else : else cat > conftest.$ac_ext < main(int argc, char **argv) @@ -2257,7 +2274,7 @@ else return 0; } EOF -if { (eval echo configure:2261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then CURSES_LIBS="-l$curses -ltermcap" else @@ -2279,14 +2296,14 @@ if test -n "$CURSES_LIBS"; then OLDLIBS=$LIBS LIBS=$CURSES_LIBS cat > conftest.$ac_ext < int main() { WINDOW *w; getmaxx(w); ; return 0; } EOF -if { (eval echo configure:2290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* : else @@ -2294,14 +2311,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < int main() { WINDOW *w; w->_maxx; ; return 0; } EOF -if { (eval echo configure:2305: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2322: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* CURSES_CPPFLAGS="-D'getmaxx(w)=w->_maxx'" else @@ -2327,12 +2344,12 @@ fi for ac_func in getusershell do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2331: checking for $ac_func" >&5 +echo "configure:2348: 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; then +if { (eval echo configure:2376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2461,6 +2478,9 @@ KLIBS="-lzephyr $KRB4_LIBS -lcom_err -lhesiod $LIBS" LIBS="-lmoira $KLIBS" +MR_LIBDEP='$(BUILDTOP)/lib/libmoira.a' + + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -2627,9 +2647,11 @@ s%@GDSS_SUBDIR@%$GDSS_SUBDIR%g s%@GDSS_OBJS@%$GDSS_OBJS%g s%@GDSS_CFILES@%$GDSS_CFILES%g s%@GDSS_TARGET@%$GDSS_TARGET%g +s%@GDSS_LIBDEP@%$GDSS_LIBDEP%g s%@RSAREF_CPPFLAGS@%$RSAREF_CPPFLAGS%g s%@RSAREF_LIBS@%$RSAREF_LIBS%g s%@RSAREF_SUBDIRS@%$RSAREF_SUBDIRS%g +s%@RSAREF_LIBDEP@%$RSAREF_LIBDEP%g s%@PRO_C@%$PRO_C%g s%@PRO_C_DEFS@%$PRO_C_DEFS%g s%@PRO_C_INCLUDES@%$PRO_C_INCLUDES%g @@ -2647,6 +2669,7 @@ s%@CURSES_CPPFLAGS@%$CURSES_CPPFLAGS%g s%@CURSES_LIBS@%$CURSES_LIBS%g s%@CURSES_SUBDIRS@%$CURSES_SUBDIRS%g s%@KLIBS@%$KLIBS%g +s%@MR_LIBDEP@%$MR_LIBDEP%g CEOF EOF diff --git a/configure.in b/configure.in index 422fbd86..c8c07ba8 100755 --- a/configure.in +++ b/configure.in @@ -191,6 +191,7 @@ AC_ARG_WITH(gdss, fi MR_INCLUDE('-I$(SRCTOP)/util/gdss/include') GDSS_LIBS='-L$(BUILDTOP)/util/gdss/lib -lgdss' + GDSS_LIBDEP='$(BUILDTOP)/util/gdss/lib/libgdss.a' else gdss=no fi]) @@ -207,6 +208,7 @@ AC_SUBST(GDSS_SUBDIR) AC_SUBST(GDSS_OBJS) AC_SUBST(GDSS_CFILES) AC_SUBST(GDSS_TARGET) +AC_SUBST(GDSS_LIBDEP) # RSAREF support (default: build util/rsaref if present) AC_MSG_CHECKING(for RSAREF) @@ -226,6 +228,7 @@ AC_ARG_WITH(rsaref, fi RSAREF_CPPFLAGS='-I$(SRCTOP)/util/rsaref' RSAREF_LIBS='$(BUILDTOP)/util/rsaref/rsaref.a' + RSAREF_LIBDEP='$(BUILDTOP)/util/rsaref/rsaref.a' else rsaref=no fi]) @@ -236,6 +239,7 @@ fi AC_SUBST(RSAREF_CPPFLAGS) AC_SUBST(RSAREF_LIBS) AC_SUBST(RSAREF_SUBDIRS) +AC_SUBST(RSAREF_LIBDEP) # Oracle (default: yes, if $ORACLE_HOME is set) AC_MSG_CHECKING(for Oracle) @@ -369,6 +373,9 @@ KLIBS="-lzephyr $KRB4_LIBS -lcom_err -lhesiod $LIBS" LIBS="-lmoira $KLIBS" AC_SUBST(KLIBS) +MR_LIBDEP='$(BUILDTOP)/lib/libmoira.a' +AC_SUBST(MR_LIBDEP) + AC_OUTPUT(Makefile lib/Makefile include/Makefile clients/Makefile \ clients/addusr/Makefile clients/blanche/Makefile \ clients/mailmaint/Makefile clients/moira/Makefile \ diff --git a/dbck/Makefile.in b/dbck/Makefile.in index 0ff16c09..342bb6e2 100644 --- a/dbck/Makefile.in +++ b/dbck/Makefile.in @@ -15,6 +15,7 @@ PRO_C_OPTS=@PRO_C_OPTS@ PRO_C_FLAGS=$(PRO_C_OPTS) $(PRO_C_DEFS) $(PRO_C_INCLUDES) LDFLAGS=@LDFLAGS@ LIBS=@SQL_LIBS@ @LIBS@ +MR_LIBDEP=@MR_LIBDEP@ INSTALL=@INSTALL@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ @@ -48,5 +49,5 @@ depend: $(CFILES) install: all $(INSTALL_PROGRAM) dbck $(mrbindir) -$(TARGET): $(OBJS) +$(TARGET): $(OBJS) $(MR_LIBDEP) $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) diff --git a/dcm/Makefile.in b/dcm/Makefile.in index 2d631b9e..f2698671 100644 --- a/dcm/Makefile.in +++ b/dcm/Makefile.in @@ -16,6 +16,7 @@ PRO_C_FLAGS=$(PRO_C_OPTS) $(PRO_C_DEFS) $(PRO_C_INCLUDES) LDFLAGS=@LDFLAGS@ SQL_LIBS=@SQL_LIBS@ LIBS=@LIBS@ +MR_LIBDEP=@MR_LIBDEP@ INSTALL=@INSTALL@ INSTALL_PROGRAM=$(INSTALL_PROGRAM) @@ -53,7 +54,7 @@ install: all $(INSTALL_PROGRAM) dcm $(mrbindir) $(INSTALL_PROGRAM) startdcm $(mrbindir) -dcm: $(DCM_OBJS) +dcm: $(DCM_OBJS) $(UPDATE_OBJS) $(MR_LIBDEP) $(CC) -o $@ $(LDFLAGS) $(DCM_OBJS) $(UPDATE_OBJS) $(SQL_LIBS) $(LIBS) startdcm: $(START_OBJS) diff --git a/gen/Makefile.in b/gen/Makefile.in index c9beaea9..37e6383d 100644 --- a/gen/Makefile.in +++ b/gen/Makefile.in @@ -15,6 +15,8 @@ PRO_C_OPTS=@PRO_C_OPTS@ PRO_C_FLAGS=$(PRO_C_OPTS) $(PRO_C_DEFS) $(PRO_C_INCLUDES) LDFLAGS=@LDFLAGS@ LIBS=@SQL_LIBS@ @GDSS_LIBS@ @LIBS@ +MR_LIBDEP=@MR_LIBDEP@ +GDSS_LIBDEP=@GDSS_LIBDEP@ INSTALL=@INSTALL@ INSTALL_TARGET=@INSTALL_TARGET@ @@ -54,29 +56,29 @@ depend: $(CFILES) install: all @for p in $(TARGET); do $(INSTALL_PROGRAM) $$p $(mrbindir); done -hesiod.gen: hesiod.o util.o moddiff.o +hesiod.gen: hesiod.o util.o moddiff.o $(MR_LIBDEP) $(CC) -o $@ $(LDFLAGS) hesiod.o util.o moddiff.o $(SQL_LIBS) $(LIBS) -hosts.gen: hosts.o util.o moddiff.o +hosts.gen: hosts.o util.o moddiff.o $(MR_LIBDEP) $(CC) -o $@ $(LDFLAGS) hosts.o util.o moddiff.o $(SQL_LIBS) $(LIBS) -nfs.gen: nfs.o util.o moddiff.o +nfs.gen: nfs.o util.o moddiff.o $(MR_LIBDEP) $(CC) -o $@ $(LDFLAGS) nfs.o util.o moddiff.o $(SQL_LIBS) $(LIBS) -directory.gen: directory.o util.o moddiff.o +directory.gen: directory.o util.o moddiff.o $(MR_LIBDEP) $(CC) -o $@ $(LDFLAGS) directory.o util.o moddiff.o $(SQL_LIBS) $(LIBS) -ndb.gen: ndb.o util.o moddiff.o +ndb.gen: ndb.o util.o moddiff.o $(MR_LIBDEP) $(CC) -o $@ $(LDFLAGS) ndb.o util.o moddiff.o $(SQL_LIBS) $(LIBS) -mailhub.gen: mailhub.o util.o moddiff.o +mailhub.gen: mailhub.o util.o moddiff.o $(MR_LIBDEP) $(CC) -o $@ $(LDFLAGS) mailhub.o util.o moddiff.o $(SQL_LIBS) $(LIBS) -pobox.gen: pobox.o util.o moddiff.o +pobox.gen: pobox.o util.o moddiff.o $(MR_LIBDEP) $(CC) -o $@ $(LDFLAGS) pobox.o util.o moddiff.o $(SQL_LIBS) $(LIBS) -network.gen: network.o util.o moddiff.o +network.gen: network.o util.o moddiff.o $(MR_LIBDEP) $(CC) -o $@ $(LDFLAGS) network.o util.o moddiff.o $(SQL_LIBS) $(LIBS) -warehouse.gen: warehouse.o util.o moddiff.o +warehouse.gen: warehouse.o util.o moddiff.o $(MR_LIBDEP) $(GDSS_LIBDEP) $(CC) -o $@ $(LDFLAGS) warehouse.o util.o moddiff.o $(SQL_LIBS) $(GDSS_LIBS) $(LIBS) diff --git a/incremental/Makefile.in b/incremental/Makefile.in index 8664aeb8..075abc19 100644 --- a/incremental/Makefile.in +++ b/incremental/Makefile.in @@ -14,6 +14,7 @@ AFS_LIBS=@AFS_LIBS@ AFS_EXTRA_LIBS=@AFS_EXTRA_LIBS@ AFS_DIR=@AFS_DIR@ LIBS=@LIBS@ +MR_LIBDEP=@MR_LIBDEP@ INSTALL=@INSTALL@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ @@ -48,7 +49,7 @@ install: all $(INSTALL_PROGRAM) ksrvtgt $(mrbindir) @for p in afs_create.pl afs_nightly.pl afs_quota.pl afs_rename.pl afs_utils.pl; do $(INSTALL_PROGRAM) $$p $(mrbindir); done -afs.incr: $(AFS_OBJS) +afs.incr: $(AFS_OBJS) $(MR_LIBDEP) $(CC) -o $@ $(LDFLAGS) $(AFS_OBJS) $(AFS_LIBS) -lprot -lauth -lrxkad -lrx -llwp -lubik -lsys -laudit $(AFS_DIR)/lib/afs/util.a $(AFS_EXTRA_LIBS) $(LIBS) ksrvtgt: $(KSRVTGT_OBJS) diff --git a/reg_svr/Makefile.in b/reg_svr/Makefile.in index df86050b..12a5192e 100644 --- a/reg_svr/Makefile.in +++ b/reg_svr/Makefile.in @@ -16,6 +16,8 @@ PRO_C_FLAGS=$(PRO_C_OPTS) $(PRO_C_DEFS) $(PRO_C_INCLUDES) LDFLAGS=@LDFLAGS@ SQL_LIBS=@SQL_LIBS@ LIBS=@RSAREF_LIBS@ @REG_SVR_LIBS@ @LIBS@ +MR_LIBDEP=@MR_LIBDEP@ +RSA_LIBDEP=@RSA_LIBDEP@ INSTALL=@INSTALL@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ @@ -54,7 +56,7 @@ install: all $(INSTALL_PROGRAM) reg_svr $(mrbindir) $(INSTALL_PROGRAM) startreg $(mrbindir) -reg_svr: $(REG_OBJS) +reg_svr: $(REG_OBJS) $(MR_LIBDEP) $(RSA_LIBDEP) $(CC) -o $@ $(LDFLAGS) $(REG_OBJS) $(SQL_LIBS) $(LIBS) startreg: $(START_OBJS) diff --git a/regtape/Makefile.in b/regtape/Makefile.in index 530c2456..58afe52d 100644 --- a/regtape/Makefile.in +++ b/regtape/Makefile.in @@ -17,6 +17,8 @@ LDFLAGS=@LDFLAGS@ SQL_LIBS=@SQL_LIBS@ GDSS_LIBS=@GDSS_LIBS@ LIBS=@LIBS@ +MR_LIBDEP=@MR_LIBDEP@ +GDSS_LIBDEP=@GDSS_LIBDEP@ INSTALL=@INSTALL@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ @@ -55,18 +57,18 @@ depend: $(CFILES) install: all @for p in $(TARGET); do $(INSTALL_PROGRAM) $$p $(mrbindir); done -students: $(STUDENTS_OBJS) +students: $(STUDENTS_OBJS) $(MR_LIBDEP) $(CC) -o $@ $(LDFLAGS) $(STUDENTS_OBJS) $(SQL_LIBS) $(LIBS) -employee: $(EMPLOYEE_OBJS) +employee: $(EMPLOYEE_OBJS) $(MR_LIBDEP) $(CC) -o $@ $(LDFLAGS) $(EMPLOYEE_OBJS) $(SQL_LIBS) $(LIBS) -vote: $(VOTE_OBJS) +vote: $(VOTE_OBJS) $(MR_LIBDEP) $(CC) -o $@ $(LDFLAGS) $(VOTE_OBJS) $(SQL_LIBS) $(LIBS) -sign: $(SIGN_OBJS) +sign: $(SIGN_OBJS) $(MR_LIBDEP) $(GDSS_LIBDEP) $(CC) -o $@ $(LDFLAGS) $(SIGN_OBJS) $(SQL_LIBS) $(GDSS_LIBS) $(LIBS) -verify: $(VERIFY_OBJS) +verify: $(VERIFY_OBJS) $(MR_LIBDEP) $(GDSS_LIBDEP) $(CC) -o $@ $(LDFLAGS) $(VERIFY_OBJS) $(SQL_LIBS) $(GDSS_LIBS) $(LIBS) diff --git a/server/Makefile.in b/server/Makefile.in index d7084629..00dd09b4 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -16,7 +16,8 @@ PRO_C_FLAGS=$(PRO_C_OPTS) $(PRO_C_DEFS) $(PRO_C_INCLUDES) LDFLAGS=@LDFLAGS@ SERVER_LIBS=@GDSS_LIBS@ @SQL_LIBS@ LIBS=@LIBS@ -RANLIB=@RANLIB@ +MR_LIBDEP=@MR_LIBDEP@ +GDSS_LIBDEP=@GDSS_LIBDEP@ INSTALL=@INSTALL@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ @@ -56,7 +57,7 @@ install: all $(INSTALL_PROGRAM) moirad $(mrbindir) $(INSTALL_PROGRAM) startmoira $(mrbindir) -moirad: $(SERVER_OBJS) +moirad: $(SERVER_OBJS) $(SCHEMA_OBJS) $(MR_LIBDEP) $(GDSS_LIBDEP) $(CC) -o $@ $(LDFLAGS) $(SERVER_OBJS) $(SCHEMA_OBJS) $(SERVER_LIBS) $(LIBS) startmoira: $(START_OBJS) diff --git a/update/Makefile.in b/update/Makefile.in index 76c30e47..87601ba8 100644 --- a/update/Makefile.in +++ b/update/Makefile.in @@ -10,6 +10,7 @@ DEFS=@DEFS@ ALL_CFLAGS=$(CPPFLAGS) $(CFLAGS) $(DEFS) LDFLAGS=@LDFLAGS@ LIBS=@LIBS@ +MR_LIBDEP=@MR_LIBDEP@ INSTALL=@INSTALL@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ @@ -42,8 +43,8 @@ install: all $(INSTALL_PROGRAM) update_test $(bindir) $(INSTALL_PROGRAM) update_server $(sbindir) -update_test: $(COBJS) +update_test: $(COBJS) $(MR_LIBDEP) $(CC) -o $@ $(LDFLAGS) $(COBJS) $(LIBS) -update_server: $(SOBJS) +update_server: $(SOBJS) $(MR_LIBDEP) $(CC) -o $@ $(LDFLAGS) $(SOBJS) $(LIBS) -- 2.45.1