Mercurial > octave

comparison Makeconf.in @ 12115:a691ccd72863 release-3-2-x

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add configure checks for pthread library and compiler flags
author John W. Eaton <jwe@octave.org>
date Wed, 05 Aug 2009 13:27:58 -0400
parents 4cd9c36b705e
children af86991d8d47
comparison
equal deleted inserted replaced
12114:22bc7fc7ff4d 12115:a691ccd72863
153 153
154 MAGICK_CONFIG = @MAGICK_CONFIG@ 154 MAGICK_CONFIG = @MAGICK_CONFIG@
155 MAGICK_INCFLAGS = $(shell $(MAGICK_CONFIG) --cppflags) 155 MAGICK_INCFLAGS = $(shell $(MAGICK_CONFIG) --cppflags)
156 MAGICK_LIBS = $(shell $(MAGICK_CONFIG) --libs) 156 MAGICK_LIBS = $(shell $(MAGICK_CONFIG) --libs)
157 157
158 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
159 PTHREAD_LIBS = @PTHREAD_LIBS@
160
158 LIBFLAGS = -L$(TOPDIR) 161 LIBFLAGS = -L$(TOPDIR)
159 162
160 DEFS = @DEFS@ 163 DEFS = @DEFS@
161 164
162 UGLY_DEFS = @UGLY_DEFS@ 165 UGLY_DEFS = @UGLY_DEFS@
165 CC_VERSION = @CC_VERSION@ 168 CC_VERSION = @CC_VERSION@
166 CFLAGS = @CFLAGS@ 169 CFLAGS = @CFLAGS@
167 CPICFLAG = @CPICFLAG@ 170 CPICFLAG = @CPICFLAG@
168 XTRA_CFLAGS = @XTRA_CFLAGS@ 171 XTRA_CFLAGS = @XTRA_CFLAGS@
169 WARN_CFLAGS = @WARN_CFLAGS@ 172 WARN_CFLAGS = @WARN_CFLAGS@
170 ALL_CFLAGS = $(INCFLAGS) $(DLL_CDEFS) $(DEFS) $(XTRA_CFLAGS) $(WARN_CFLAGS) $(CFLAGS) 173 ALL_CFLAGS = $(INCFLAGS) $(DLL_CDEFS) $(DEFS) $(XTRA_CFLAGS) $(WARN_CFLAGS) $(CFLAGS) $(PTHREAD_CFLAGS)
171 BUG_CFLAGS = $(DEFS) $(XTRA_CFLAGS) $(WARN_CFLAGS) $(CFLAGS) 174 BUG_CFLAGS = $(DEFS) $(XTRA_CFLAGS) $(WARN_CFLAGS) $(CFLAGS)
172 175
173 BUILD_CC = @BUILD_CC@ 176 BUILD_CC = @BUILD_CC@
174 BUILD_CFLAGS = @BUILD_CFLAGS@ 177 BUILD_CFLAGS = @BUILD_CFLAGS@
175 178
188 CXXFLAGS = @CXXFLAGS@ 191 CXXFLAGS = @CXXFLAGS@
189 CXXPICFLAG = @CXXPICFLAG@ 192 CXXPICFLAG = @CXXPICFLAG@
190 XTRA_CXXFLAGS = @XTRA_CXXFLAGS@ 193 XTRA_CXXFLAGS = @XTRA_CXXFLAGS@
191 WARN_CXXFLAGS = @WARN_CXXFLAGS@ 194 WARN_CXXFLAGS = @WARN_CXXFLAGS@
192 ALL_CXXFLAGS = \ 195 ALL_CXXFLAGS = \
193 $(INCFLAGS) $(DLL_CXXDEFS) $(DEFS) $(XTRA_CXXFLAGS) $(WARN_CXXFLAGS) $(CXXFLAGS) 196 $(INCFLAGS) $(DLL_CXXDEFS) $(DEFS) $(XTRA_CXXFLAGS) $(WARN_CXXFLAGS) $(CXXFLAGS) $(PTHREAD_CFLAGS)
194 BUG_CXXFLAGS = $(DEFS) $(XTRA_CXXFLAGS) $(WARN_CXXFLAGS) $(CXXFLAGS) 197 BUG_CXXFLAGS = $(DEFS) $(XTRA_CXXFLAGS) $(WARN_CXXFLAGS) $(CXXFLAGS)
195 198
196 BUILD_CXX = @BUILD_CXX@ 199 BUILD_CXX = @BUILD_CXX@
197 BUILD_CXXFLAGS = @BUILD_CXXFLAGS@ 200 BUILD_CXXFLAGS = @BUILD_CXXFLAGS@
198 201