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

diff --git a/src/kadmin/cli/ChangeLog b/src/kadmin/cli/ChangeLog
index d94a5583564f81413cc85566e0db259998992512..2cb7b032c2c085a8d0df60948e5f6a4fdcc9ffd5 100644 (file)
--- 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 992f6ef736888b4e9e7f44f0a7d45ad5846dd2ca..ecde8640be1d21dd06b20eaffa569c5ba9fd2be1 100644 (file)
--- 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 dae3be477ccd32ec16200f7a1e84ea0d362b489f..7d110fb7db5ae480c713ffc866c35cc1578e00a4 100644 (file)
--- 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 6f1fae6278622b0329bb7c6a221082b016eb8d27..8e0725fe331ec02b7bce9573c7b7bb0661c5ddc3 100644 (file)
--- 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 12c9bce4ce3e53e4cb6772f8d46bad3e26d491c6..d0903c49fe49e9ebb4fd4729a7c63468724dccce 100644 (file)
--- 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 74a8e1bb38fc4645036324ce21d30d04606ae317..391e8977381a31ea916e581ebbf56ecc8235b1c8 100644 (file)
--- 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 a81e3491f8627b6d96c017a84e5442c1092f53c0..6101c09c73430ef3cc1a59eb2d15c6d44e8c05ee 100644 (file)
--- 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 f53861e2113ff5e65b56928bbdb586b52a6201ed..6efa98ab8c3b14e0bd625e631d5d6b1bc0fe4e2c 100644 (file)
--- 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)

diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog
index 47a6d23ac0d1e0784bf6a630be3f21b949ae9ff3..8cbcf5bc16896d7f55576cd6e10a3c90027c7022 100644 (file)
--- a/src/kdc/ChangeLog
+++ b/src/kdc/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:
        * main.c:

diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in
index 9b18c4e912b3c77310448f65f1c45caa5c5a8566..32526ab64b613835b600a66c871f81249a462ab1 100644 (file)
--- a/src/kdc/Makefile.in
+++ b/src/kdc/Makefile.in
@@ -10,7 +10,7 @@ BUILDTOP=$(REL)..
 DEFINES = # -DNOCACHE
 RUN_SETUP = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH)
-KDB5_LIB_DEPS=-ldl -lpthread
+KDB5_LIB_DEPS=$(DL_LIB) $(THREAD_LINKOPTS)
 PROG_RPATH=$(KRB5_LIBDIR)
 FAKEKA=@FAKEKA@
 

diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog
index 7e404b482cfd83a1f927b777c6f704e7100a9c05..a8644ed903aa90eaac81e406aa33bc43c591396d 100644 (file)
--- a/src/krb524/ChangeLog
+++ b/src/krb524/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:
        * krb524d.c:

diff --git a/src/krb524/Makefile.in b/src/krb524/Makefile.in
index acbfb0da5054f63da754c6426c61d00a7f4c96e7..504f7456cb626eb767ee15da99cad88ea7ad146e 100644 (file)
--- a/src/krb524/Makefile.in
+++ b/src/krb524/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=..
 myfulldir=krb524
 mydir=krb524
 BUILDTOP=$(REL)..
-KDB_DEP_LIB=-ldl -lpthread
+KDB_DEP_LIB=$(DL_LIB) $(THREAD_LINKOPTS)
 
 # Copyright 1994 by OpenVision Technologies, Inc.
 # 

diff --git a/src/lib/kadm5/unit-test/ChangeLog b/src/lib/kadm5/unit-test/ChangeLog
index 67c82bcd36fe1e9b1f542f22d39d2382ed68a392..446c9af44b39c3b85f75e4b2d48c12a259c10d18 100644 (file)
--- a/src/lib/kadm5/unit-test/ChangeLog
+++ b/src/lib/kadm5/unit-test/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:
        * destroy-test.c:

diff --git a/src/lib/kadm5/unit-test/Makefile.in b/src/lib/kadm5/unit-test/Makefile.in
index 242e9c256ec046a1eac4ceecf063e10259614d73..88c0905b3a4f37eda9c2b372b482c9ecb8f4c44b 100644 (file)
--- a/src/lib/kadm5/unit-test/Makefile.in
+++ b/src/lib/kadm5/unit-test/Makefile.in
@@ -5,7 +5,7 @@ BUILDTOP=$(REL)..$(S)..$(S)..
 DEFINES = -DUSE_KADM5_API_VERSION=1
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
-KDB_DEP_LIB=-ldl -lpthread
+KDB_DEP_LIB=$(DL_LIB) $(THREAD_LINKOPTS)
 
 all:: init-test destroy-test client-handle-test client-iter-test
 all:: randkey-test server-handle-test lock-test server-iter-test 

diff --git a/src/tests/create/ChangeLog b/src/tests/create/ChangeLog
index 2078bcab3bf5ba58c61149dcce594d3b604c380d..1d329dd454cfb1ca8baafb7f99a3f24109667a44 100644 (file)
--- a/src/tests/create/ChangeLog
+++ b/src/tests/create/ChangeLog
@@ -1,5 +1,8 @@
 2005-06-20  Ken Raeburn  <raeburn@mit.edu>
 
+       * Makefile.in (KDB5_DEP_LIB): Use DL_LIB and THREAD_LINKOPTS
+       instead of explicitly using -ldl and -lpthread.
+
        Novell merge.
        * Makefile.in:
        * kdb5_mkdums.c:

diff --git a/src/tests/create/Makefile.in b/src/tests/create/Makefile.in
index 6a566b827b71ca3cc081dbcc56a1692d32671f0f..bbcd56ea7ccd81f0d4e27814fffa0bdbe0ac9ce6 100644 (file)
--- a/src/tests/create/Makefile.in
+++ b/src/tests/create/Makefile.in
@@ -5,7 +5,7 @@ BUILDTOP=$(REL)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 SRCS=$(srcdir)/kdb5_mkdums.c
-KDB5_DEP_LIBS=-lpthread -ldl
+KDB5_DEP_LIBS=$(THREAD_LINKOPTS) $(DL_LIB)
 
 all:: kdb5_mkdums
 

diff --git a/src/tests/gss-threads/ChangeLog b/src/tests/gss-threads/ChangeLog
index 5d6d0c7f936b98402c13bc25b8635a714ca7bba8..ae92cd92620ae594016bab47b68720df870008d3 100644 (file)
--- a/src/tests/gss-threads/ChangeLog
+++ b/src/tests/gss-threads/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-20  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (gss-client, gss-server): Use THREAD_LINKOPTS
+       instead of PTHREAD_LIBS.
+
 2005-03-25  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.in (all-unix): Use @THREAD_SUPPORT@ and helper targets

diff --git a/src/tests/gss-threads/Makefile.in b/src/tests/gss-threads/Makefile.in
index 88ee89461809afafe8737d4d7a8909d2eb0bdb29..edb4525300faef33b90852fc9958acb77f869fa4 100644 (file)
--- a/src/tests/gss-threads/Makefile.in
+++ b/src/tests/gss-threads/Makefile.in
@@ -19,10 +19,10 @@ all-unix-0::
 all-windows:: $(OUTPRE)gss-server.exe $(OUTPRE)gss-client.exe
 
 gss-server: gss-server.o gss-misc.o $(GSS_DEPLIBS) $(KRB5_BASE_DEPLIBS)
-       $(CC_LINK) $(PTHREAD_CFLAGS) -o gss-server gss-server.o gss-misc.o $(GSS_LIBS) $(KRB5_BASE_LIBS) $(PTHREAD_LIBS)
+       $(CC_LINK) $(PTHREAD_CFLAGS) -o gss-server gss-server.o gss-misc.o $(GSS_LIBS) $(KRB5_BASE_LIBS) $(THREAD_LINKOPTS)
 
 gss-client: gss-client.o gss-misc.o $(GSS_DEPLIBS) $(KRB5_BASE_DEPLIBS)
-       $(CC_LINK) $(PTHREAD_CFLAGS) -o gss-client gss-client.o gss-misc.o $(GSS_LIBS) $(KRB5_BASE_LIBS) $(PTHREAD_LIBS)
+       $(CC_LINK) $(PTHREAD_CFLAGS) -o gss-client gss-client.o gss-misc.o $(GSS_LIBS) $(KRB5_BASE_LIBS) $(THREAD_LINKOPTS)
 
 $(OUTPRE)gss-server.exe: $(OUTPRE)gss-server.obj $(OUTPRE)gss-misc.obj $(GLIB) $(KLIB)
        link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib

diff --git a/src/tests/shlib/ChangeLog b/src/tests/shlib/ChangeLog
index 32e9b48345fbbf1b090ad0a337ba0c4c37d38923..bfea7ca78be06d6e5b501f9226f44eba19067b12 100644 (file)
--- a/src/tests/shlib/ChangeLog
+++ b/src/tests/shlib/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-20  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (t_loader): Use DL_LIB instead of -ldl.
+
 2005-02-08  Ken Raeburn  <raeburn@mit.edu>
 
        * t_loader.c (verbose): New variable.

diff --git a/src/tests/shlib/Makefile.in b/src/tests/shlib/Makefile.in
index daf8ff0af55ae36a7ecbbb929db2bd6dce994dab..49cf20fa233049ff78abd108a70fd94a786917e9 100644 (file)
--- a/src/tests/shlib/Makefile.in
+++ b/src/tests/shlib/Makefile.in
@@ -21,7 +21,7 @@ valgrind-t_loader: t_loader
        $(RUN_SETUP) $(VALGRIND) $(VALGRINDFLAGS) ./t_loader
 
 t_loader: t_loader.o
-       $(CC_LINK) -o t_loader t_loader.o -ldl
+       $(CC_LINK) -o t_loader t_loader.o $(DL_LIB)
 
 check-unix::
 

diff --git a/src/tests/threads/ChangeLog b/src/tests/threads/ChangeLog
index 32fde2353a9741b33d9a763fd591284ff9cd16ed..704a052534ba1c4eecdac9150b9c567cc47b7272 100644 (file)
--- a/src/tests/threads/ChangeLog
+++ b/src/tests/threads/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-20  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (t_rcache, prof1): Use THREAD_LINKOPTS instead of
+       -lpthread.
+
 2004-12-12  Ken Raeburn  <raeburn@mit.edu>
 
        * prof1.c: New file.

diff --git a/src/tests/threads/Makefile.in b/src/tests/threads/Makefile.in
index c164717e78d4557833b942d5842dd896e68240f1..5386d00e1b7c1cce392c85cb8a04220db75dad16 100644 (file)
--- a/src/tests/threads/Makefile.in
+++ b/src/tests/threads/Makefile.in
@@ -16,7 +16,7 @@ run-t_rcache: t_rcache
        $(RUN_SETUP) ./t_rcache -n $(N)
 
 t_rcache: t_rcache.o $(KRB5_BASE_DEPLIBS)
-       $(CC_LINK) -o t_rcache t_rcache.o $(KRB5_BASE_LIBS) -lpthread
+       $(CC_LINK) -o t_rcache t_rcache.o $(KRB5_BASE_LIBS) $(THREAD_LINKOPTS)
 
 syms: syms.o
        $(CC_LINK) -o syms syms.o
@@ -25,7 +25,7 @@ run-syms: syms
        $(RUN_SETUP) ./syms
 
 prof1: prof1.o $(KRB5_BASE_DEPLIBS)
-       $(CC_LINK) -o prof1 prof1.o $(KRB5_BASE_LIBS) -lpthread
+       $(CC_LINK) -o prof1 prof1.o $(KRB5_BASE_LIBS) $(THREAD_LINKOPTS)
 
 prof1.o: prof1.c
 

diff --git a/src/tests/verify/ChangeLog b/src/tests/verify/ChangeLog
index 61b7357aa29b0090125e80c449a4f8615f114a70..0fec8083b9266226fda5239c42c9e43b109dffeb 100644 (file)
--- a/src/tests/verify/ChangeLog
+++ b/src/tests/verify/ChangeLog
@@ -1,5 +1,8 @@
 2005-06-20  Ken Raeburn  <raeburn@mit.edu>
 
+       * Makefile.in (KDB5_DEP_LIB): Use DL_LIB and THREAD_LINKOPTS
+       instead of explicitly using -ldl and -lpthread.
+
        Novell merge.
        * Makefile.in:
        * kdb5_verify.c:

diff --git a/src/tests/verify/Makefile.in b/src/tests/verify/Makefile.in
index 0444803c04548811b550d26be1d05a61ddfe7d3c..c774e0c74db0114bb71f3548a52414981b33217c 100644 (file)
--- a/src/tests/verify/Makefile.in
+++ b/src/tests/verify/Makefile.in
@@ -4,7 +4,7 @@ mydir=verify
 BUILDTOP=$(REL)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
-KDB5_DEP_LIB=-lpthread -ldl
+KDB5_DEP_LIB=$(THREAD_LINKOPTS) $(DL_LIB)
 
 SRCS=$(srcdir)/kdb5_verify.c