Sophie

Sophie

distrib > Mandriva > 2008.1 > x86_64 > by-pkgid > c044d6dedf084ab2368f5fcffa6751fb > files > 2

octave-forge-20071212-5mdv2008.1.src.rpm

--- src/Makefile	2007-12-07 03:30:01.000000000 +0100
+++ src/Makefile.oden	2008-03-25 17:30:06.000000000 +0100
@@ -29,6 +29,6 @@
 	$(MKOCTFILE) $< -lpng
 
 __magick_read__.oct: __magick_read__.cc
-	$(MKOCTFILE) $< -lMagick++ -lMagick
+	$(MKOCTFILE) $< -lMagick++ -lMagickCore
 
 clean: ; -$(RM) *.o octave-core core *.oct *~
--- src/configure.base	2007-12-07 03:30:01.000000000 +0100
+++ src/configure.base.oden	2008-03-25 18:00:10.000000000 +0100
@@ -162,7 +162,7 @@
 AC_MSG_RESULT([retrieving compile and link flags from $MKOCTFILE])
 CC=`$MKOCTFILE -p CC`
 CFLAGS=`$MKOCTFILE -p CFLAGS`
-CPPFLAGS=`$MKOCTFILE -p CPPFLAGS`
+CPPFLAGS=`$MKOCTFILE -p CPPFLAGS` `MagickCore-config --cppflags`
 CPICFLAG=`$MKOCTFILE -p CPICFLAG`
 LDFLAGS=`$MKOCTFILE -p LDFLAGS`
 LIBS=`$MKOCTFILE -p LIBS`
--- src/configure	2007-12-09 23:23:59.000000000 +0100
+++ src/configure.oden	2008-03-25 18:03:44.000000000 +0100
@@ -2814,7 +2814,7 @@
 echo "${ECHO_T}retrieving compile and link flags from $MKOCTFILE" >&6; }
 CC=`$MKOCTFILE -p CC`
 CFLAGS=`$MKOCTFILE -p CFLAGS`
-CPPFLAGS=`$MKOCTFILE -p CPPFLAGS`
+CPPFLAGS=`$MKOCTFILE -p CPPFLAGS` `MagickCore-config --cppflags`
 CPICFLAG=`$MKOCTFILE -p CPICFLAG`
 LDFLAGS=`$MKOCTFILE -p LDFLAGS`
 LIBS=`$MKOCTFILE -p LIBS`