Mercurial > octave-nkf
changeset 9437:db08c2376970
Makeconf.in (MAGICK_LIBS): Don't pass --ldflags to $(MAGICK_CONFIG)
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 16 Jul 2009 14:06:29 -0400 |
| parents | 5302df15ad76 |
| children | bac81ac76a57 |
| files | ChangeLog Makeconf.in |
| diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Jul 16 14:04:29 2009 -0400 +++ b/ChangeLog Thu Jul 16 14:06:29 2009 -0400 @@ -1,3 +1,7 @@ +2009-07-16 John W. Eaton <jwe@octave.org> + + * Makeconf.in (MAGICK_LIBS): Don't pass --ldflags to $(MAGICK_CONFIG). + 2009-07-09 John W. Eaton <jwe@octave.org> * configure.in: Don't use system strftime on MinGW systems.
--- a/Makeconf.in Thu Jul 16 14:04:29 2009 -0400 +++ b/Makeconf.in Thu Jul 16 14:06:29 2009 -0400 @@ -153,7 +153,7 @@ MAGICK_CONFIG = @MAGICK_CONFIG@ MAGICK_INCFLAGS = $(shell $(MAGICK_CONFIG) --cppflags) -MAGICK_LIBS = $(shell $(MAGICK_CONFIG) --ldflags --libs) +MAGICK_LIBS = $(shell $(MAGICK_CONFIG) --libs) LIBFLAGS = -L$(TOPDIR)