* Makefile.in: Integrate in the krb5 build tree rules.

	(use CC_LINK, etc).

	* configure.in: Add AC_BUILD_PROGRAM for test programs.

These changes allow --enable-profiled combined with --disable-static
to function in the build tree.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10492 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/util/profile/ChangeLog b/src/util/profile/ChangeLog
index 17fc6f0a7cad0c24ecfb8b54c7afc4a777180d81..c8bc9ce8187c57d4c036f668eafdf31093771f81 100644 (file)
--- a/src/util/profile/ChangeLog
+++ b/src/util/profile/ChangeLog
@@ -1,3 +1,10 @@
+Mon Mar  2 16:19:58 1998  Ezra Peisach  <epeisach@mit.edu>
+
+       * Makefile.in: Integrate in the krb5 build tree rules.
+       (use CC_LINK, etc).
+
+       * configure.in: Add AC_BUILD_PROGRAM for test programs.
+
 Wed Feb 18 16:33:38 1998  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in: Remove trailing slash from thisconfigdir.  Fix up

diff --git a/src/util/profile/Makefile.in b/src/util/profile/Makefile.in
index 5b3428e50f6620c8f0efee43d878ce5677399ddd..6dd0377c80a5cf84f447067a9ffa286068df0a1f 100644 (file)
--- a/src/util/profile/Makefile.in
+++ b/src/util/profile/Makefile.in
@@ -1,5 +1,7 @@
 thisconfigdir=.
 BUILDTOP=$(REL)$(U)$(S)$(U)
+PROG_LIBPATH=-L$(TOPLIBD)
+PROG_RPATH=$(KRB5_LIBDIR)
 ##DOS##BUILDTOP = ..\..
 ##DOS##OBJFILE=profile.lst
 ##DOS##LIBNAME=profile.lib
@@ -28,7 +30,8 @@ SRCS = $(srcdir)/prof_tree.c \
        prof_err.c \
        $(srcdir)/prof_init.c
 
-LIBS = ../et/libcom_err.$(LIBEXT)
+DEPLIBS = $(COM_ERR_DEPLIB)
+MLIBS = -lcom_err $(GEN_LIB)
 
 LIB=profile
 LIBMAJOR=1
@@ -59,11 +62,11 @@ awk-windows:
        if exist prof_err.h copy profile.hin+prof_err.h profile.h
        if exist profile.h copy profile.h $(BUILDTOP)\include\profile.h
 
-test_parse: test_parse.$(OBJEXT) $(OBJS) $(LIBS)
-       $(CC) -o test_parse test_parse.$(OBJEXT) $(OBJS) $(LIBS)
+test_parse: test_parse.$(OBJEXT) $(OBJS) $(DEPLIBS)
+       $(CC_LINK) -o test_parse test_parse.$(OBJEXT) $(OBJS) $(MLIBS)
 
-test_profile: test_profile.$(OBJEXT) $(OBJS) $(LIBS)
-       $(CC) -o test_profile test_profile.$(OBJEXT) $(OBJS) $(LIBS)
+test_profile: test_profile.$(OBJEXT) $(OBJS) $(DEPLIBS)
+       $(CC_LINK) -o test_profile test_profile.$(OBJEXT) $(OBJS) $(MLIBS)
 
 test_parse.exe: 
        $(CC) $(CFLAGS2) -o test_parse.exe test_parse.c \

diff --git a/src/util/profile/configure.in b/src/util/profile/configure.in
index b9245edceaa45896c2d7cac2d969960b0f955744..7441f615c6e0ef3b8ac467fdada4061014ab9df1 100644 (file)
--- a/src/util/profile/configure.in
+++ b/src/util/profile/configure.in
@@ -8,5 +8,6 @@ AC_CHECK_HEADERS(unistd.h stdlib.h)
 AC_HAVE_FUNCS(stat)
 AC_PROG_AWK
 KRB5_BUILD_LIBOBJS
+KRB5_BUILD_PROGRAM
 KRB5_BUILD_LIBRARY
 V5_AC_OUTPUT_MAKEFILE