diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2007-10-29 22:00:53 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2007-10-29 22:00:53 +0000 |
| commit | 6ced4e0fa11dc0e2752ad03f8264a531470495b4 (patch) | |
| tree | 254772143b0bc337a7bef0cc8e6bb333fe20aedb /src/config | |
| parent | cd98f2bff6fdebd46f90c556502499341ae2888f (diff) | |
| download | krb5-6ced4e0fa11dc0e2752ad03f8264a531470495b4.zip krb5-6ced4e0fa11dc0e2752ad03f8264a531470495b4.tar.gz krb5-6ced4e0fa11dc0e2752ad03f8264a531470495b4.tar.bz2 | |
Test that C++ code can use our installed headers
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20149 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/pre.in | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/config/pre.in b/src/config/pre.in index 023e846..0747853 100644 --- a/src/config/pre.in +++ b/src/config/pre.in @@ -160,14 +160,19 @@ FAKELIBDIR=$(FAKEPREFIX)/lib ALL_CFLAGS = $(DEFS) $(DEFINES) $(KRB_INCLUDES) $(LOCALINCLUDES) \ -DKRB5_DEPRECATED=1 \ $(CPPFLAGS) $(CFLAGS) $(PTHREAD_CFLAGS) +ALL_CXXFLAGS = $(DEFS) $(DEFINES) $(KRB_INCLUDES) $(LOCALINCLUDES) \ + -DKRB5_DEPRECATED=1 \ + $(CPPFLAGS) $(CXXFLAGS) $(PTHREAD_CFLAGS) CFLAGS = @CFLAGS@ +CXXFLAGS = @CXXFLAGS@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@ THREAD_LINKOPTS = $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) CPPFLAGS = @CPPFLAGS@ DEFS = @DEFS@ CC = @CC@ +CXX = @CXX@ LD = $(PURE) @LD@ DEPLIBS = @DEPLIBS@ KRB_INCLUDES = -I$(BUILDTOP)/include -I$(SRCTOP)/include @@ -457,9 +462,14 @@ COMPILE_ET-k5= $(BUILDTOP)/util/et/compile_et -d $(SRCTOP)/util/et # rule to make object files # -.SUFFIXES: .c .o +.SUFFIXES: .cpp .c .o .c.o: $(CC) $(ALL_CFLAGS) -c $< +# Use .cpp because that's what autoconf uses in its test. +# If the compiler doesn't accept a .cpp suffix here, it wouldn't +# have accepted it when autoconf tested it. +.cpp.o: + $(CXX) $(ALL_CXXFLAGS) -c $< # ss command table rules # |