--- configure.orig	2012-11-28 13:51:02.000000000 -0500
+++ configure	2012-12-17 01:11:49.000000000 -0500
@@ -25305,9 +25305,9 @@ $as_echo "yes" >&6; }
 		# searches the specified directory.
 		#
 		wireshark_save_CPPFLAGS="$CPPFLAGS"
-		CPPFLAGS="$CPPFLAGS -I$lua_dir/include"
+		CPPFLAGS="$CPPFLAGS -I%%LUA_INCDIR%%"
 		wireshark_save_LIBS="$LIBS"
-		LIBS="$LIBS -L$lua_dir/lib -llua -lm"
+		LIBS="$LIBS -L%%LUA_LIBDIR%% -llua -lm"
 		wireshark_save_LDFLAGS="$LDFLAGS"
 		LDFLAGS="$LDFLAGS -L$lua_dir/lib"
 	else
@@ -25512,8 +25512,8 @@ if test "x$ac_cv_lib_lua_luaL_register" 
 				# Put the "-I" and "-L" flags for lua into
 				# LUA_INCLUDES and LUA_LIBS, respectively.
 				#
-				LUA_LIBS="-L$lua_dir/lib -llua -lm"
-				LUA_INCLUDES="-I$lua_dir/include"
+				LUA_LIBS="-L%%LUA_LIBDIR%% -llua -lm"
+				LUA_INCLUDES="-I%%LUA_INCDIR%%"
 			else
 				LUA_LIBS="-llua -lm"
 				LUA_INCLUDES=""
@@ -26487,7 +26487,7 @@ $as_echo "yes" >&6; }
 	  # searches the specified directory.
 	  #
 	  CPPFLAGS="$CPPFLAGS -I$krb5_dir/include"
-	  ac_heimdal_version=`grep heimdal $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*heimdal.*$/HEIMDAL/'`
+	  ac_heimdal_version=`grep heimdal $krb5_dir/include/krb5.h | head -n 1 | tr "[:lower:]" "[:upper:]" sed 's/^.*heimdal.*$/HEIMDAL/'`
 	  # MIT Kerberos moved krb5.h to krb5/krb5.h starting with release 1.5
 	  ac_mit_version_olddir=`grep 'Massachusetts Institute of Technology' $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*Massachusetts Institute of Technology.*$/MIT/'`
 	  ac_mit_version_newdir=`grep 'Massachusetts Institute of Technology' $krb5_dir/include/krb5/krb5.h | head -n 1 | sed 's/^.*Massachusetts Institute of Technology.*$/MIT/'`
@@ -26547,7 +26547,7 @@ fi
 
 	  if test -x "$KRB5_CONFIG"
 	  then
-	    KRB5_FLAGS=`"$KRB5_CONFIG" --cflags`
+	    KRB5_FLAGS=`"$KRB5_CONFIG" --cflags | sed -e 's/@INCLUDE_des@//g'`
 	    KRB5_LIBS=`"$KRB5_CONFIG" --libs`
 	    CPPFLAGS="$CPPFLAGS $KRB5_FLAGS"
 	    #
