pull up r19208 from trunk

 r19208@cathode-dark-space:  raeburn | 2007-03-05 18:51:22 -0500
 ticket: new
 subject: osf1: get proper library dependencies installed
 target_version: 1.6.1
 tags: pullup

 The LDCOMBINE setting for Tru64 left out $(CFLAGS), which meant the
 -pthread option wasn't being passed in, so the libraries didn't
 indicate a dependency on the pthread library despite the fact that we
 need it unconditionally (if thread support is enabled).  Including
 $(CFLAGS) should fix this.

 Our own binaries get linked with -pthread anyways, so they build okay,
 but other binaries trying to link against or load our libraries could
 have problems.

ticket: 5458
version_fixed: 1.6.1

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@19311 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/config/shlib.conf b/src/config/shlib.conf
index 3e75b8767873a17c8ce5b79c0660452f0d225681..b26566a30ed6b7994361b05f0cd9a483c32f3afe 100644 (file)
--- a/src/config/shlib.conf
+++ b/src/config/shlib.conf
@@ -58,7 +58,7 @@ alpha*-dec-osf*)
        # Alpha OSF/1 doesn't need separate PIC objects
        SHOBJEXT=.o
        INIT_FINI_PREP=initfini=
-       LDCOMBINE='$(CC) $(PTHREAD_CFLAGS) -shared -Wl,-expect_unresolved -Wl,\* -Wl,-update_registry -Wl,$(BUILDTOP)/so_locations -Wl,-soname -Wl,$(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT) -Wl,-hidden -Wl,-input,osf1.exports $$initfini'
+       LDCOMBINE='$(CC) $(CFLAGS) $(PTHREAD_CFLAGS) -shared -Wl,-expect_unresolved -Wl,\* -Wl,-update_registry -Wl,$(BUILDTOP)/so_locations -Wl,-soname -Wl,$(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT) -Wl,-hidden -Wl,-input,osf1.exports $$initfini'
        SHLIB_EXPORT_FILE_DEP=osf1.exports
        use_linker_init_option=yes
        use_linker_fini_option=yes