From 454b0101d7a4a7db3527f43311fd027bb188b2d8 Mon Sep 17 00:00:00 2001
From: Amar Takhar <verm@aegisub.org>
Date: Wed, 5 Mar 2008 21:03:05 +0000
Subject: [PATCH] Fix auto3 support.

Originally committed to SVN as r1911.
---
 auto3/auto3.h | 8 ++++++++
 configure.in  | 6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/auto3/auto3.h b/auto3/auto3.h
index 24a26cb31..10945d1f0 100644
--- a/auto3/auto3.h
+++ b/auto3/auto3.h
@@ -37,9 +37,17 @@
 
 #include <stdlib.h>
 #ifdef AUTO3LIB
+
+#ifdef __WINDOWS__
 #include "lua/include/lua.h"
 #include "lua/include/lualib.h"
 #include "lua/include/lauxlib.h"
+#else
+#include "lua.h"
+#include "lualib.h"
+#include "lauxlib.h"
+#endif
+
 #endif
 
 
diff --git a/configure.in b/configure.in
index a44830fd2..d864853dc 100644
--- a/configure.in
+++ b/configure.in
@@ -435,12 +435,12 @@ AC_ARG_WITH(lua50-include,
 
 if ! test -z "$lua50_lib_dir" && ! test -z "$lua50_include_dir"; then
   aegisub_save_LDFLAGS="$LDFLAGS"
-  LDFLAGS="-L$lua50_lib_dir"
-  AC_CHECK_LIB([lua], [lua_call],[LUA50_LDFLAGS="$lua50_lib_dir -llua"; lua50_lib="yes"], [lua50_lib="no"])
+  LDFLAGS="$lua50_lib_dir -llua"
+  AC_CHECK_LIB([lualib], [luaopen_base], [LUA50_LDFLAGS="$lua50_lib_dir -llua -llualib"; lua50_lib="yes"], [lua50_lib="no"])
   LDFLAGS="$aegisub_save_LDFLAGS"
 
   aegisub_save_CPPFLAGS="$CPPFLAGS"
-  CPPFLAGS="-I$lua50_include_dir"
+  CPPFLAGS="$lua50_include_dir"
   AC_CHECK_HEADER([lua.h],[LUA50_CPPFLAGS="$lua50_include_dir"; lua50_include="yes"],[lua50_include="no"])
   CPPFLAGS="$aegisub_save_CPPFLAGS"
 fi