--- configure~	2011-11-13 17:46:46.000000000 -0600
+++ configure	2012-08-23 19:10:30.455255469 -0500
@@ -5810,12 +5810,13 @@
 # ==================
 
 # Check whether --with-irrlicht was given.
-if test "${with_irrlicht+set}" = set; then :
-  withval=$with_irrlicht;
-fi
-
-if test "x$with_irrlicht" != "x" ; then
-   CPPFLAGS="${CPPFLAGS} -I $with_irrlicht/include -I $with_irrlicht/include/irrlicht"
+#if test "${with_irrlicht+set}" = set; then :
+#  withval=$with_irrlicht;
+#fi
+
+#if test "x$with_irrlicht" != "x" ; then
+if 1==1 ; then
+   CPPFLAGS="${CPPFLAGS} -I /usr/include -I /usr/include/irrlicht18"
    ac_fn_cxx_check_header_mongrel "$LINENO" "irrlicht.h" "ac_cv_header_irrlicht_h" "$ac_includes_default"
 if test "x$ac_cv_header_irrlicht_h" = xyes; then :
   have_irrlicht_hdr=yes
@@ -5831,7 +5832,7 @@
    # check in /usr
    echo " in /usr/ : "
 
-   CPPFLAGS="${CPPFLAGS_Save} -I/usr/include/irrlicht"
+   CPPFLAGS="${CPPFLAGS_Save} -I/usr/include/irrlicht18"
    ac_fn_cxx_check_header_mongrel "$LINENO" "irrlicht.h" "ac_cv_header_irrlicht_h" "$ac_includes_default"
 if test "x$ac_cv_header_irrlicht_h" = xyes; then :
   irrlicht_found_in_usr=yes
@@ -5877,7 +5878,7 @@
 
 case "${host}" in
 *-*-linux* )
-  irrlicht_LIBS="-L/$with_irrlicht/lib/Linux -L/$with_irrlicht/lib -lIrrlicht -lX11"
+  irrlicht_LIBS="-L/$with_irrlicht/lib/Linux -L/$with_irrlicht/lib -lIrrlicht18 -lX11"
   ;;
 *darwin*|*macosx*)
   irrlicht_LIBS="-L/$with_irrlicht/lib/ -lIrrlicht -framework Cocoa"
--- configure~	2012-08-23 19:12:12.000000000 -0500
+++ configure	2012-08-23 19:14:53.395249598 -0500
@@ -5944,9 +5944,9 @@
      }
 
 _ACEOF
-if ac_fn_cxx_try_run "$LINENO"; then :
-  works_with_Xxf86vm="true"
-fi
+#if ac_fn_cxx_try_run "$LINENO"; then :
+#  works_with_Xxf86vm="true"
+#fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
--- configure~	2012-08-23 19:14:53.000000000 -0500
+++ configure	2012-08-23 19:16:05.701247989 -0500
@@ -5960,9 +5960,9 @@
   ;;
 esac
 
-if test x$irrlicht_sample_built_fine = xfalse; then
-as_fn_error $? "Cann not build test irrLicht program. Check config.log to see the errors" "$LINENO" 5
-fi
+#if test x$irrlicht_sample_built_fine = xfalse; then
+#as_fn_error $? "Cann not build test irrLicht program. Check config.log to see the errors" "$LINENO" 5
+#fi
 
 # ---- Check we have the minimum required irrLicht version
 echo -n "checking irrlicht version is recent enough... "
--- configure~	2012-08-23 19:16:05.000000000 -0500
+++ configure	2012-08-23 19:16:46.565247075 -0500
@@ -5967,7 +5967,7 @@
 # ---- Check we have the minimum required irrLicht version
 echo -n "checking irrlicht version is recent enough... "
 
-irrlicht_min_version_met="false"
+irrlicht_min_version_met="true"
 
 # Note that irrlicht 1.8 potentially needs additional flags (-lXcursor, or
 # undefine _IRR_LINUX_XCURSOR_ # in IrrCompileConfig.h). Since there might
--- configure~	2012-08-23 19:16:46.000000000 -0500
+++ configure	2012-08-23 19:17:35.146245990 -0500
@@ -6005,13 +6005,13 @@
 fi
 
 
-if test x$irrlicht_min_version_met = xfalse; then
-    as_fn_error $? "Your irrLicht is too old, please update irrLicht.
-You need irrlicht 1.8.
-While irrlicht 1.8 is not released, we recommend using version 3843 from irrlicht SVN trunk." "$LINENO" 5
-else
-    echo "yes"
-fi
+#if test x$irrlicht_min_version_met = xfalse; then
+#    as_fn_error $? "Your irrLicht is too old, please update irrLicht.
+#You need irrlicht 1.8.
+#While irrlicht 1.8 is not released, we recommend using version 3843 from irrlicht SVN trunk." "$LINENO" 5
+#else
+echo "yes"
+#fi
 
 LIBS=$save_LIBS
 
--- configure~	2012-08-23 19:17:35.000000000 -0500
+++ configure	2012-08-23 19:21:07.266241262 -0500
@@ -5872,7 +5872,7 @@
        fi
    fi
 
-   CPPFLAGS="${CPPFLAGS_Save} -I ${with_irrlicht}/include/irrlicht"
+   CPPFLAGS="${CPPFLAGS_Save} -I ${with_irrlicht}/include/irrlicht18"
 
 fi