[Wxlua-commit] wxLua configure,1.67,1.68

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10474/wxLua

Modified Files:
	configure 
Log Message:
Add --enable-systemlua=yes/no/auto and have a better check for a system Lua.


Index: configure
===================================================================
RCS file: /cvsroot/wxlua/wxLua/configure,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** configure	14 Jan 2008 13:22:38 -0000	1.67
--- configure	14 Jan 2008 17:11:10 -0000	1.68
***************
*** 1448,1451 ****
--- 1448,1452 ----
                            Installs wxBind sources for custom builds (default
                            is yes)
+   --enable-systemlua      Use the system Lua (default is auto)
    --enable-omf            use OMF object format (OS/2)
    --disable-dependency-tracking
***************
*** 2448,2451 ****
--- 2449,2459 ----
  
  
+ # Check whether --enable-systemlua was given.
+ if test "${enable_systemlua+set}" = set; then
+   enableval=$enable_systemlua;
+ else
+   enable_systemlua=auto
+ fi
+ 
  
  # Check whether --with-lua-prefix was given.
***************
*** 4801,4805 ****
  #     exist then we use our built-in lua
  
! if test "$lua_dir" = ""; then
  
  
--- 4809,4816 ----
  #     exist then we use our built-in lua
  
! { echo "$as_me:$LINENO: checking if Lua 5.1 is installed" >&5
! echo $ECHO_N "checking if Lua 5.1 is installed... $ECHO_C" >&6; }
! 
! if test ! "$enable_systemlua" = "no"; then
  
  
***************
*** 4810,4813 ****
--- 4821,4831 ----
  
  
+     # force C compilation, not C++
+     CPPFLAGS="-x c $CPPFLAGS"
+ 
+     # use their Lua path --with-lua-prefix=$lua_dir
+     if test ! "$lua_dir" = ""; then
+         CPPFLAGS="-I$lua_dir $CPPFLAGS"
+     fi
      LIBS="$LIBS -llua5.1"
  
***************
*** 4862,4870 ****
      #       from other macros called by AC_LINK_IFELSE may interfere
      #       in the final output
-     { echo "$as_me:$LINENO: checking if Lua 5.1 is installed" >&5
- echo $ECHO_N "checking if Lua 5.1 is installed... $ECHO_C" >&6; }
      if test "$LUA_PRESENCE" = "1"; then
!         { echo "$as_me:$LINENO: result: yes" >&5
! echo "${ECHO_T}yes" >&6; }
          USE_SYSTEM_LUA=1
      else
--- 4880,4886 ----
      #       from other macros called by AC_LINK_IFELSE may interfere
      #       in the final output
      if test "$LUA_PRESENCE" = "1"; then
!         { echo "$as_me:$LINENO: result: yes, using system Lua" >&5
! echo "${ECHO_T}yes, using system Lua" >&6; }
          USE_SYSTEM_LUA=1
      else
***************
*** 4873,4876 ****
--- 4889,4903 ----
          USE_SYSTEM_LUA=0
  
+         if test "$enable_systemlua" = "yes"; then
+             { { echo "$as_me:$LINENO: error:
+     You specified --enable-systemlua=yes, but it is not useable. See config.log.
+             " >&5
+ echo "$as_me: error:
+     You specified --enable-systemlua=yes, but it is not useable. See config.log.
+             " >&2;}
+    { (exit 1); exit 1; }; }
+ 
+         fi
+ 
          # LUA_DIR must always be an absolute path!
          LUA_DIR="`pwd`/$srcdir/modules/lua"
***************
*** 4886,4892 ****
  
  else
! 
!     USE_SYSTEM_LUA=1
!     LUA_DIR="$lua_dir"
  fi
  
--- 4913,4920 ----
  
  else
!     { echo "$as_me:$LINENO: result: using built-in Lua --enable-systemlua=no" >&5
! echo "${ECHO_T}using built-in Lua --enable-systemlua=no" >&6; }
!     USE_SYSTEM_LUA=0
!     LUA_DIR="`pwd`/$srcdir/modules/lua"
  fi