diff --git a/configure.ac b/configure.ac
index 2f0830a37a..4fa36b5be6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1039,7 +1039,7 @@ AC_INIT(configure.ac)
 
     if test "$enable_dag" = "yes"; then
 
-	if test "$with_dag_includes" != "no"; then
+    	if test "$with_dag_includes" != "no"; then
             CPPFLAGS="${CPPFLAGS} -I${with_dag_includes}"
         fi
 
@@ -1209,38 +1209,43 @@ AC_INIT(configure.ac)
     fi
 
   # libluajit
-    enable_luajit="no"
+    AC_ARG_ENABLE(luajit,
+	        [  --enable-luajit  Enable Luajit support],
+	        [ enable_luajit="yes"],
+	        [ enable_luajit="no"])
     AC_ARG_WITH(libluajit_includes,
             [  --with-libluajit-includes=DIR  libluajit include directory],
-            [with_libluajit_includes="$withval"],[with_libluajit_includes=no])
+            [with_libluajit_includes="$withval"],[with_libluajit_includes="no"])
     AC_ARG_WITH(libluajit_libraries,
             [  --with-libluajit-libraries=DIR    libluajit library directory],
             [with_libluajit_libraries="$withval"],[with_libluajit_libraries="no"])
 
-    if test "$with_libluajit_includes" != "no"; then
-        CPPFLAGS="${CPPFLAGS} -I${with_libluajit_includes}"
-    fi
-
-    AC_CHECK_HEADER(lualib.h,LUAJIT="yes",LUAJIT="no")
-    if test "$LUAJIT" = "yes"; then
-        if test "$with_libluajit_libraries" != "no"; then
-            LDFLAGS="${LDFLAGS}  -L${with_libluajit_libraries}"
+    if test "$enable_luajit" = "yes"; then
+        if test "$with_libluajit_includes" != "no"; then
+            CPPFLAGS="${CPPFLAGS} -I${with_libluajit_includes}"
         fi
 
-        AC_CHECK_LIB(luajit-5.1, luaL_openlibs,, LUAJIT="no")
+        AC_CHECK_HEADER(lualib.h,LUAJIT="yes",LUAJIT="no")
+        if test "$LUAJIT" = "yes"; then
+            if test "$with_libluajit_libraries" != "no"; then
+                LDFLAGS="${LDFLAGS}  -L${with_libluajit_libraries}"
+            fi
 
-        if test "$LUAJIT" = "no"; then
-            echo
-            echo "   ERROR!  libluajit library not found, go get it"
-            echo "   from http://luajit.org/index.html or your distribution:"
-            echo
-            echo "   Ubuntu: apt-get install libluajit-5.1-dev"
-            echo
-            exit 1
-        fi
+            AC_CHECK_LIB(luajit-5.1, luaL_openlibs,, LUAJIT="no")
 
-        AC_DEFINE([HAVE_LUAJIT],[1],[libluajit available])
-        enable_luajit="yes"
+            if test "$LUAJIT" = "no"; then
+                echo
+                echo "   ERROR!  libluajit library not found, go get it"
+                echo "   from http://luajit.org/index.html or your distribution:"
+                echo
+                echo "   Ubuntu: apt-get install libluajit-5.1-dev"
+                echo
+                exit 1
+            fi
+
+            AC_DEFINE([HAVE_LUAJIT],[1],[libluajit available])
+            enable_luajit="yes"
+        fi
     fi
 
 # get revision