diff --git a/CHANGES.current b/CHANGES.current
index 1570a1ad1..bd94eca51 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -1,6 +1,10 @@
 Version 1.3.37 (in progress)
 =============================
 
+2008-07-17: wsfulton
+            Fix SF #2019156 Configuring with --without-octave or --without-alllang
+            did not disable octave.
+
 2008-07-14: wsfultonn
             [Java, C#] Fix director typemaps for pointers so that NULL pointers are correctly 
             marshalled to C#/Java null in director methods.
diff --git a/configure.in b/configure.in
index 13c3c6bc9..b9a5dc04a 100644
--- a/configure.in
+++ b/configure.in
@@ -732,13 +732,13 @@ OCTAVEDYNAMICLINKING=
 OCTAVE_SO=.oct
 
 AC_ARG_WITH(octave, AS_HELP_STRING([--without-octave], [Disable Octave])
-AS_HELP_STRING([--with-octave=path], [Set location of Octave executable]),[ OCTAVEBIN="$withval"], [OCTAVEBIN=yes])
+AS_HELP_STRING([--with-octave=path], [Set location of Octave executable]),[OCTAVEBIN="$withval"], [OCTAVEBIN=yes])
 
 # First, check for "--without-octave" or "--with-octave=no".
 if test x"${OCTAVEBIN}" = xno -o x"${with_alllang}" = xno ; then 
 AC_MSG_NOTICE([Disabling Octave])
 OCTAVE=
-fi
+else
 
 # First figure out what the name of Octave is
 
@@ -779,6 +779,8 @@ else
        	AC_MSG_RESULT(could not figure out how to run octave)
 fi
 
+fi
+
 AC_SUBST(OCTAVE)
 AC_SUBST(OCTAVEEXT)
 AC_SUBST(OCTAVE_SO)