[Wxlua-commit] wxLua configure,1.74,1.75

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

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

Modified Files:
	configure 
Log Message:
Updated bakefiles to separate LUA_DIR to LUA_INCLUDE_DIR and LUA_LIB_DIR so
a system Lua's include path can be specified exactly.
Used bakefile-0.2.3


Index: configure
===================================================================
RCS file: /cvsroot/wxlua/wxLua/configure,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** configure	15 Jan 2008 00:08:15 -0000	1.74
--- configure	15 Jan 2008 18:37:26 -0000	1.75
***************
*** 692,696 ****
  WX_PORT
  RPATH_FLAGS
! LUA_DIR
  CXXCPP
  GREP
--- 692,697 ----
  WX_PORT
  RPATH_FLAGS
! LUA_INCLUDE_DIR
! LUA_LIB_DIR
  CXXCPP
  GREP
***************
*** 4810,4813 ****
--- 4811,4815 ----
  { 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; }
+ USE_SYSTEM_LUA=0
  
  if test ! "$enable_systemlua" = "no"; then
***************
*** 4883,4890 ****
  echo "${ECHO_T}yes, using system Lua" >&6; }
          USE_SYSTEM_LUA=1
      else
          { echo "$as_me:$LINENO: result: not found, falling back to the built-in lua" >&5
  echo "${ECHO_T}not found, falling back to the built-in lua" >&6; }
-         USE_SYSTEM_LUA=0
  
          if test "$enable_systemlua" = "yes"; then
--- 4885,4898 ----
  echo "${ECHO_T}yes, using system Lua" >&6; }
          USE_SYSTEM_LUA=1
+         if test ! $lua_dir = ""; then
+             LUA_INCLUDE_DIR=$lua_dir
+             # We don't know where the system LUA_LIB_DIR is, just duplicate our lib path
+             LUA_LIB_DIR="`pwd`/lib"
+             echo "  Lua include path: '$LUA_INCLUDE_DIR'"
+         fi
+ 
      else
          { echo "$as_me:$LINENO: result: not found, falling back to the built-in lua" >&5
  echo "${ECHO_T}not found, falling back to the built-in lua" >&6; }
  
          if test "$enable_systemlua" = "yes"; then
***************
*** 4898,4905 ****
  
          fi
- 
-         # LUA_DIR must always be an absolute path!
-         LUA_DIR="`pwd`/$srcdir/modules/lua"
- 
      fi
  
--- 4906,4909 ----
***************
*** 4909,4924 ****
          CFLAGS="$SAVED_CFLAGS"
          LIBS="$SAVED_LIBS"
!             # remove the -llua5.1 piece from $LIBS
  
  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
  
  
  if test "$USE_SYSTEM_LUA" = "0"; then
  
      # Checks used to determine right LUA flags (see modules/lua/src/Makefile)
      luadefs=
--- 4913,4932 ----
          CFLAGS="$SAVED_CFLAGS"
          LIBS="$SAVED_LIBS"
!             # restore $CPPFLAGS and $LIBS
  
  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; }
  fi
  
  
+ 
+ 
  if test "$USE_SYSTEM_LUA" = "0"; then
  
+     # LUA_INCLUDE_DIR must always be an absolute path!
+     LUA_INCLUDE_DIR="`pwd`/$srcdir/modules/lua/include"
+     LUA_LIB_DIR="`pwd`/lib"
+ 
      # Checks used to determine right LUA flags (see modules/lua/src/Makefile)
      luadefs=
***************
*** 6177,6181 ****
  
  
- 
  fi
  
--- 6185,6188 ----
***************
*** 7154,7162 ****
      if test ! "$wxstedit_dir" = ""; then
          WXSTEDIT=$wxstedit_dir
!         echo "Path to wxStEdit from --with-wxstedit-dir: '$WXSTEDIT'"
      else
          # Try to get the wxStEdit src dir from the shell environment variable
          WXSTEDIT=`echo $WXSTEDIT`
!         echo "Path to wxStEdit from \$WXSTEDIT environment variable: '$WXSTEDIT'"
      fi
  
--- 7161,7169 ----
      if test ! "$wxstedit_dir" = ""; then
          WXSTEDIT=$wxstedit_dir
!         echo "  wxStEdit include path from --with-wxstedit-dir: '$WXSTEDIT'"
      else
          # Try to get the wxStEdit src dir from the shell environment variable
          WXSTEDIT=`echo $WXSTEDIT`
!         echo "  wxStEdit include path from \$WXSTEDIT environment variable: '$WXSTEDIT'"
      fi
  
***************
*** 14173,14177 ****
  WX_PORT!$WX_PORT$ac_delim
  RPATH_FLAGS!$RPATH_FLAGS$ac_delim
! LUA_DIR!$LUA_DIR$ac_delim
  CXXCPP!$CXXCPP$ac_delim
  GREP!$GREP$ac_delim
--- 14180,14185 ----
  WX_PORT!$WX_PORT$ac_delim
  RPATH_FLAGS!$RPATH_FLAGS$ac_delim
! LUA_INCLUDE_DIR!$LUA_INCLUDE_DIR$ac_delim
! LUA_LIB_DIR!$LUA_LIB_DIR$ac_delim
  CXXCPP!$CXXCPP$ac_delim
  GREP!$GREP$ac_delim
***************
*** 14192,14196 ****
  AR!$AR$ac_delim
  AROPTIONS!$AROPTIONS$ac_delim
- STRIP!$STRIP$ac_delim
  _ACEOF
  
--- 14200,14203 ----
***************
*** 14234,14237 ****
--- 14241,14245 ----
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
+ STRIP!$STRIP$ac_delim
  NM!$NM$ac_delim
  INSTALL_DIR!$INSTALL_DIR$ac_delim
***************
*** 14330,14334 ****
  COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1!$COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1$ac_delim
  COND_USE_SOVERLINUX_1!$COND_USE_SOVERLINUX_1$ac_delim
- COND_USE_SOVERSION_0!$COND_USE_SOVERSION_0$ac_delim
  _ACEOF
  
--- 14338,14341 ----
***************
*** 14372,14375 ****
--- 14379,14383 ----
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
+ COND_USE_SOVERSION_0!$COND_USE_SOVERSION_0$ac_delim
  COND_USE_SOVERSOLARIS_1!$COND_USE_SOVERSOLARIS_1$ac_delim
  COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1!$COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1$ac_delim
***************
*** 14382,14386 ****
  _ACEOF
  
!   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 8; then
      break
    elif $ac_last_try; then
--- 14390,14394 ----
  _ACEOF
  
!   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 9; then
      break
    elif $ac_last_try; then