Mercurial > hg > octave-image

changeset 322:2282220f6b8b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configuration and build fixes
author adb014
date Wed, 09 Apr 2008 15:15:24 +0000
parents df97404d1fb4
children bed6f83a4687
files src/Makeconf.in src/configure.base
diffstat 2 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/Makeconf.in
+++ b/src/Makeconf.in
@@ -7,6 +7,7 @@
 @DEFHAVE_JPEG@
 @DEFHAVE_PNG@
 @DEFHAVE_MAGICKXX@
+MKOCTFILE=@MKOCTFILE@
 
 %.o: %.c ; $(MKOCTFILE) -c $<
 %.o: %.f ; $(MKOCTFILE) -c $<
--- a/src/configure.base
+++ b/src/configure.base
@@ -8,6 +8,7 @@
 AC_INIT(configure.base)
 
 MKOCTFILE=mkoctfile
+AC_SUBST(MKOCTFILE)
 
 dnl Strip on windows, don't strip on Mac OS/X or IRIX
 dnl For the rest, you can force strip using MKOCTFILE="mkoctfile -s"
@@ -69,3 +70,4 @@
     IMAGESTATUS="$IMAGESTATUS, ImageMagick++ not found"
 fi
 
+CONFIGURE_OUTPUTS="Makeconf"