summaryrefslogtreecommitdiffstats
path: root/src/config
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2004-06-19 00:18:18 +0000
committerKen Raeburn <raeburn@mit.edu>2004-06-19 00:18:18 +0000
commitc2b8bd00d9e18b8ab2000ffa040c231fc8ac866e (patch)
treeb7c0ebb11b762dbf794b2fa7f990f8078e6fc899 /src/config
parent43e6c5bb19b61dcd315ecd83a00c37da12ef05c6 (diff)
downloadkrb5-c2b8bd00d9e18b8ab2000ffa040c231fc8ac866e.tar.gz
krb5-c2b8bd00d9e18b8ab2000ffa040c231fc8ac866e.tar.xz
krb5-c2b8bd00d9e18b8ab2000ffa040c231fc8ac866e.zip
* pre.in (PTHREAD_CFLAGS): New variable.
(ALL_CFLAGS): Include it. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16491 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/config')
-rw-r--r--src/config/ChangeLog3
-rw-r--r--src/config/pre.in5
2 files changed, 7 insertions, 1 deletions
diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index e302e47eab..6c23eadf0c 100644
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,5 +1,8 @@
2004-06-18 Ken Raeburn <raeburn@mit.edu>
+ * pre.in (PTHREAD_CFLAGS): New variable.
+ (ALL_CFLAGS): Include it.
+
* win-pre.in (SLIB): New variable.
2004-06-16 Ken Raeburn <raeburn@mit.edu>
diff --git a/src/config/pre.in b/src/config/pre.in
index 2bf2f155ad..9409a3ed63 100644
--- a/src/config/pre.in
+++ b/src/config/pre.in
@@ -150,10 +150,13 @@ FAKELIBDIR=$(FAKEPREFIX)/lib
# LOCALINCLUDES set by local Makefile.in
# CPPFLAGS user override
# CFLAGS user override but starts off set by configure
+# PTHREAD_CFLAGS set by configure, not included in CFLAGS so that we
+# don't pull the pthreads library into shared libraries
ALL_CFLAGS = $(DEFS) $(DEFINES) $(KRB_INCLUDES) $(LOCALINCLUDES) \
- $(CPPFLAGS) $(CFLAGS)
+ $(CPPFLAGS) $(CFLAGS) $(PTHREAD_CFLAGS)
CFLAGS = @CFLAGS@
+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
CPPFLAGS = @CPPFLAGS@
DEFS = @DEFS@
CC = @CC@