Use DL_LIB and THREAD_LINKOPTS instead of explicitly specifying the dl

and pthread libraries by name.

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

8 files changed, 16 insertions, 4 deletions

diff --git a/src/kadmin/cli/ChangeLog b/src/kadmin/cli/ChangeLog
index d94a558356..2cb7b032c2 100644
--- a/src/kadmin/cli/ChangeLog
+++ b/src/kadmin/cli/ChangeLog
@@ -1,5 +1,8 @@
 2005-06-20  Ken Raeburn  <raeburn@mit.edu>
 
+	* Makefile.in (KDB_DEP_LIB): Use DL_LIB and THREAD_LINKOPTS
+	instead of explicitly using -ldl and -lpthread.
+
 	Novell merge.
 	* Makefile.in:
 	* kadmin.c:
diff --git a/src/kadmin/cli/Makefile.in b/src/kadmin/cli/Makefile.in
index 992f6ef736..ecde8640be 100644
--- a/src/kadmin/cli/Makefile.in
+++ b/src/kadmin/cli/Makefile.in
@@ -4,7 +4,7 @@ mydir=cli
 BUILDTOP=$(REL)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
-KDB_DEP_LIB=-ldl -lpthread
+KDB_DEP_LIB=$(DL_LIB) $(THREAD_LINKOPTS)
 
 PROG = kadmin
 OBJS = kadmin.o kadmin_ct.o ss_wrapper.o getdate.o keytab.o
diff --git a/src/kadmin/dbutil/ChangeLog b/src/kadmin/dbutil/ChangeLog
index dae3be477c..7d110fb7db 100644
--- a/src/kadmin/dbutil/ChangeLog
+++ b/src/kadmin/dbutil/ChangeLog
@@ -1,5 +1,8 @@
 2005-06-20  Ken Raeburn  <raeburn@mit.edu>
 
+	* Makefile.in (KDB_DEP_LIB): Use DL_LIB and THREAD_LINKOPTS
+	instead of explicitly using -ldl and -lpthread.
+
 	Novell merge.
 	* Makefile.in:
 	* dump.c:
diff --git a/src/kadmin/dbutil/Makefile.in b/src/kadmin/dbutil/Makefile.in
index 6f1fae6278..8e0725fe33 100644
--- a/src/kadmin/dbutil/Makefile.in
+++ b/src/kadmin/dbutil/Makefile.in
@@ -6,7 +6,7 @@ DEFINES = -DKDB4_DISABLE
 LOCALINCLUDES = -I. @KRB4_INCLUDES@ 
 PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH)
 PROG_RPATH=$(KRB5_LIBDIR)
-KDB_DEP_LIB=-ldl -lpthread
+KDB_DEP_LIB=$(DL_LIB) $(THREAD_LINKOPTS)
 
 PROG = kdb5_util
 ###OBJS	= kdb5_util.o dump.o dumpv4.o loadv4.o \
diff --git a/src/kadmin/server/ChangeLog b/src/kadmin/server/ChangeLog
index 12c9bce4ce..d0903c49fe 100644
--- a/src/kadmin/server/ChangeLog
+++ b/src/kadmin/server/ChangeLog
@@ -1,5 +1,8 @@
 2005-06-20  Ken Raeburn  <raeburn@mit.edu>
 
+	* Makefile.in (KDB_DEP_LIB): Use DL_LIB and THREAD_LINKOPTS
+	instead of explicitly using -ldl and -lpthread.
+
 	Novell merge.
 	* Makefile.in:
 	* misc.c:
diff --git a/src/kadmin/server/Makefile.in b/src/kadmin/server/Makefile.in
index 74a8e1bb38..391e897738 100644
--- a/src/kadmin/server/Makefile.in
+++ b/src/kadmin/server/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=./..
 myfulldir=kadmin/server
 mydir=server
 BUILDTOP=$(REL)..$(S)..
-KDB_DEP_LIB=-ldl -lpthread
+KDB_DEP_LIB=$(DL_LIB) $(THREAD_LINKOPTS)
 
 LOCALINCLUDES = -I$(SRCTOP)/lib/gssapi/generic -I$(SRCTOP)/lib/gssapi/krb5 \
 	-I$(BUILDTOP)/lib/gssapi/generic -I$(BUILDTOP)/lib/gssapi/krb5
diff --git a/src/kadmin/testing/util/ChangeLog b/src/kadmin/testing/util/ChangeLog
index a81e3491f8..6101c09c73 100644
--- a/src/kadmin/testing/util/ChangeLog
+++ b/src/kadmin/testing/util/ChangeLog
@@ -1,5 +1,8 @@
 2005-06-20  Ken Raeburn  <raeburn@mit.edu>
 
+	* Makefile.in (KDB_DEP_LIB): Use THREAD_LINKOPTS instead of
+	explicitly using -lpthread.
+
 	Novell merge.
 	* Makefile.in:
 	* tcl_kadm5.c:
diff --git a/src/kadmin/testing/util/Makefile.in b/src/kadmin/testing/util/Makefile.in
index f53861e211..6efa98ab8c 100644
--- a/src/kadmin/testing/util/Makefile.in
+++ b/src/kadmin/testing/util/Makefile.in
@@ -6,7 +6,7 @@ LOCALINCLUDES = $(TCL_INCLUDES) -I$(BUILDTOP)/lib/kdb/
 # Force Tcl headers to use stdarg.h, because krb5 does too, and if
 # Tcl uses varargs.h it'll just mess things up.
 DEFINES= -DHAS_STDARG
-KRB5_PTHREAD_LIB=-lpthread 
+KRB5_PTHREAD_LIB=$(THREAD_LINKOPTS) 
 
 PROG_LIBPATH=-L$(TOPLIBD) $(TCL_LIBPATH)
 PROG_RPATH=$(KRB5_LIBDIR)$(TCL_RPATH)