Mercurial > octave-nkf

comparison Makeconf.in @ 8560:5cc594679cdc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
get display characteristics from system
author John W. Eaton <jwe@octave.org>
date Wed, 21 Jan 2009 21:43:05 -0500
parents d66c9b6e506a
children f8b3ece45bda
comparison
equal deleted inserted replaced
8559:07c93dae3fdb 8560:5cc594679cdc
145 -I$(top_srcdir)/liboctave \ 145 -I$(top_srcdir)/liboctave \
146 -I$(top_srcdir)/src \ 146 -I$(top_srcdir)/src \
147 -I$(top_srcdir)/libcruft/misc 147 -I$(top_srcdir)/libcruft/misc
148 endif 148 endif
149 INCFLAGS = $(TMP_IF_1) $(TMP_IF_2) 149 INCFLAGS = $(TMP_IF_1) $(TMP_IF_2)
150
151 X11_INCFLAGS = @X11_INCFLAGS@
152 X11_LIBS = @X11_LIBS@
150 153
151 MAGICK_CONFIG = @MAGICK_CONFIG@ 154 MAGICK_CONFIG = @MAGICK_CONFIG@
152 MAGICK_INCFLAGS = $(shell $(MAGICK_CONFIG) --cppflags) 155 MAGICK_INCFLAGS = $(shell $(MAGICK_CONFIG) --cppflags)
153 MAGICK_LIBS = $(shell $(MAGICK_CONFIG) --ldflags --libs) 156 MAGICK_LIBS = $(shell $(MAGICK_CONFIG) --ldflags --libs)
154 157