# HG changeset patch
# User adb014
# Date 1207754124 0
# Node ID 2282220f6b8b3605f4ed776bdc12d3c8ef2958d6
# Parent  df97404d1fb4d858ab5b14e09e4263b5af48a674
configuration and build fixes

diff --git a/src/Makeconf.in b/src/Makeconf.in
--- 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 $<
diff --git a/src/configure.base b/src/configure.base
--- 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"