From 4cfad888da6d11365d0a123f21026aaf3488b1df Mon Sep 17 00:00:00 2001
From: Ari Johnson <ari@theari.com>
Date: Wed, 12 Jan 2011 20:18:25 +0000
Subject: [PATCH] Use global lua5.1 installation

---
 Makefile.SH |  4 ++--
 U/Myinit.U  |  2 +-
 U/ccflags.U |  2 +-
 U/d_lua.U   | 26 ++++++++++----------------
 U/libpth.U  |  2 +-
 U/libs.U    |  2 +-
 6 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/Makefile.SH b/Makefile.SH
index 2a8cbfe..0c3ecd8 100644
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -45,12 +45,12 @@ $spitshell >Makefile <<!GROK!THIS!
 # If you want to profile the code, add -pg -a -DPROFILING to CCFLAGS
 # and (probably) remove -O
 #
-# If you want to do a paranoid compile, add the following to CCFLAGS:
+# If you want to do a less paranoid compile, remove the following from CCFLAGS:
 # -Wall -Wno-comment -Wno-parentheses -Wno-switch -Werror
 #
 $make_set_make
 CC=$cc
-CCFLAGS=$optimize -I.. -I../lua/src -I../hdrs $ccflags $warnings
+CCFLAGS=$optimize -I.. -I../hdrs -Wall -WNo-comment -Wno-parentheses -Wno-switch -Werror $ccflags $warnings
 LDFLAGS=$ldflags
 CLIBS=$libs $cryptlib $libssl $libcrypto $libmysqlclient
 INSTALL=$install
diff --git a/U/Myinit.U b/U/Myinit.U
index 6aeca69..95e5324 100644
--- a/U/Myinit.U
+++ b/U/Myinit.U
@@ -26,5 +26,5 @@
 ?LINT:set defvoidused libswanted toplev
 ?INIT:toplev=`cd ..;pwd`
 defvoidused=15
-libswanted='nsl socket m c crypt bind resolv ld dl tcl intl lua'
+libswanted='nsl socket m c crypt bind resolv ld dl tcl intl lua5.1'
 
diff --git a/U/ccflags.U b/U/ccflags.U
index 25b6f62..66bc158 100644
--- a/U/ccflags.U
+++ b/U/ccflags.U
@@ -83,7 +83,7 @@
 ?T:inctest thisincl xxx flag inclwanted ftry previous thislibdir
 ?D:cppflags=''
 ?D:ccflags=''
-?D:ldflags='-L$toplev/lua/src/'
+?D:ldflags=''
 ?D:optimize=''
 ?D:warnings=''
 ?INIT:: Possible local include directories to search.
diff --git a/U/d_lua.U b/U/d_lua.U
index af7bb00..0efc9e4 100644
--- a/U/d_lua.U
+++ b/U/d_lua.U
@@ -3,20 +3,14 @@
 # see if lua exists, otherwise end configure script
 echo " "
 
-if $test -f lua/src/lua.c -o -f ../lua/src/lua.c ; then
-  echo "Let's see if we have LUA." >&4
-
-    case $libs in 
-      *lua*)   
-	       echo "We have the LUA library, too." >&4
-  	   ;;
-      *)       echo "Oops, no LUA library. Check your LUA installation." >&4
-               exit 1;
-	   ;;
-    esac
-else
-  echo "Can not find LUA source directory.  Check your LUA installation.">&4
-  exit 1
-fi
-
+echo "Let's see if we have LUA (version 5.1)." >&4
 
+case $libs in 
+    *lua5.1*)   
+        echo "We have the LUA 5.1 library, too." >&4
+        ;;
+    *)
+        echo "Oops, no LUA 5.1 library. Check your LUA installation." >&4
+        exit 1;
+        ;;
+esac
diff --git a/U/libpth.U b/U/libpth.U
index 4f4ecfc..b468243 100644
--- a/U/libpth.U
+++ b/U/libpth.U
@@ -66,7 +66,7 @@
 ?INIT:: change the next line if compiling for Xenix/286 on Xenix/386
 ?INIT:xlibpth='/usr/lib/386 /lib/386'
 ?INIT:: Possible local library directories to search.
-?INIT:loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib $toplev/lua/src"
+?INIT:loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib"
 ?INIT:loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib"
 ?INIT:
 ?INIT:: general looking path for locating libraries
diff --git a/U/libs.U b/U/libs.U
index f14bb40..a1849ea 100644
--- a/U/libs.U
+++ b/U/libs.U
@@ -58,7 +58,7 @@
 ?X: Set proper libswanted in your private Myinit.U if needed.
 ?X:
 ?X:: default ordered library list
-?X:libswanted='net socket inet nsl nm sdbm gdbm ndbm dbm malloc dl lua'
+?X:libswanted='net socket inet nsl nm sdbm gdbm ndbm dbm malloc dl lua5.1'
 ?X:libswanted="$libswanted dld sun m c_s c posix cposix ndir dir ucb"
 ?X:libswanted="$libswanted bsd BSD PW x"
 ?X:
-- 
2.30.2