--- configure.orig	2013-03-17 06:56:20.000000000 -0500
+++ configure	2013-08-07 23:38:01.000000000 -0500
@@ -16,7 +16,7 @@
 # some hopefully reasonable defaults
 LDD=ldd
 POSTLINKCMD="true"
-MAKEDEPEND="gcc -MM"
+MAKEDEPEND="@@MAKEDEPEND@@"
 MAKEDEPENDOPTS=""
 SRCDIR="`dirname $0`"
 LIBRARY_PATH=LD_LIBRARY_PATH
@@ -184,7 +184,7 @@
 DEFINES_SWIG=
 PRELINKFLAGS=
 LINKFLAGS=
-POSTLINKFLAGS=
+test "$POSTLINKFLAGS" && POSTLINKFLAGS="$POSTLINKFLAGS"
 
 INCLUDES_STATIC_INTERFACES=
 LINKFLAGS_STATIC_INTEFACES=
@@ -1170,7 +1170,7 @@
   echo >> "$TMPLOG"
   echo "$COMP_C $INCLUDES $COMPFLAGS_C $TMPC -o $TMPO $LINKFLAGS $@" $POSTLINKFLAGS >> "$TMPLOG"
   rm -f "$TMPO"
-  ( "$COMP_C" $INCLUDES $COMPFLAGS_C "$TMPC" -o "$TMPO" $LINKFLAGS "$@" $POSTLINKFLAGS ) >> "$TMPLOG" 2>&1
+  ( $COMP_C $INCLUDES $COMPFLAGS_C "$TMPC" -o "$TMPO" $LINKFLAGS "$@" $POSTLINKFLAGS ) >> "$TMPLOG" 2>&1
   TMP="$?"
   if test -f "$TMPO"
   then
@@ -1190,7 +1190,7 @@
   echo >> "$TMPLOG"
   echo "$COMP_CPP $INCLUDES $COMPFLAGS_CPP $TMPCXX -o $TMPO $LINKFLAGS $@" $POSTLINKFLAGS >> "$TMPLOG"
   rm -f "$TMPO"
-  ( "$COMP_CPP" $INCLUDES $COMPFLAGS_CPP "$TMPCXX" -o "$TMPO" $LINKFLAGS "$@" $POSTLINKFLAGS ) >> "$TMPLOG" 2>&1
+  ( $COMP_CPP $INCLUDES $COMPFLAGS_CPP "$TMPCXX" -o "$TMPO" $LINKFLAGS "$@" $POSTLINKFLAGS ) >> "$TMPLOG" 2>&1
   TMP="$?"
   if test -f "$TMPO"
   then
@@ -1210,7 +1210,7 @@
   echo >> "$TMPLOG"
   echo "$COMP_CPP $INCLUDES $COMPFLAGS_CPP $TMPCXX -o $TMPSO $LINKFLAGS $@" $POSTLINKFLAGS >> "$TMPLOG"
   rm -f "$TMPSO"
-  ( "$COMP_CPP" $INCLUDES $COMPFLAGS_CPP "$TMPCXX" -o "$TMPSO" $LINKFLAGS "$@" $POSTLINKFLAGS ) >> "$TMPLOG" 2>&1
+  ( $COMP_CPP $INCLUDES $COMPFLAGS_CPP "$TMPCXX" -o "$TMPSO" $LINKFLAGS "$@" $POSTLINKFLAGS ) >> "$TMPLOG" 2>&1
   TMP="$?"
   if test -f "$TMPSO"
   then
@@ -3039,7 +3039,7 @@
 }
 EOF
 
-	"$COMP_C" $INCLUDES "$TMPC" -o ./"$TMPO"
+	$COMP_C $INCLUDES "$TMPC" -o ./"$TMPO"
 	$POSTLINKCMD ./"$TMPO"
 	./"$TMPO"
 	WORDSIZE=$?
@@ -4003,7 +4003,7 @@
 }
 EOF
 		echocheck "lpsolve Developer Files"
-		LPSOLVELINKFLAGS="-L /usr/lib/lp_solve -llpsolve55"
+		LPSOLVELINKFLAGS="-llpsolve55"
 		if cc_check $LPSOLVELINKFLAGS
 		then
 			echores "yes"
@@ -5011,6 +5011,7 @@
 		if test "$_readline" = yes || test "$_readline" = auto;
 		then
 cat > $TMPC << EOF
+#include <stdio.h>
 #include <readline/readline.h>
 int main(void) { return 0; }
 EOF
@@ -5274,7 +5275,7 @@
 CONFDIR			= ${_confdir}
 INCDIR			= ${_incdir}
 LIBDIR			= ${_libdir}
-PYDIR			= ${_libdir}/${_pydir}
+PYDIR			= ${_pydir}
 OCTDIR			= ${_octdir}
 RDIR			= ${_rdir}
 EOF