[Wxlua-commit] wxLua configure,1.56,1.57

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	configure 
Log Message:
regenerated configure script with working frm-bakefile

Index: configure
===================================================================
RCS file: /cvsroot/wxlua/wxLua/configure,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** configure	27 Jul 2007 14:11:57 -0000	1.56
--- configure	28 Jul 2007 21:21:41 -0000	1.57
***************
*** 708,711 ****
--- 708,712 ----
  MAKE_SET
  AR
+ AROPTIONS
  STRIP
  NM
***************
*** 744,747 ****
--- 745,749 ----
  SONAME_FLAG
  DEPS_TRACKING
+ BK_DEPS
  WINDRES
  REZ
***************
*** 749,752 ****
--- 751,755 ----
  GCC_PCH
  ICC_PCH
+ BK_MAKE_PCH
  COND_BUILD_DEBUG
  COND_BUILD_DEBUG_UNICODE_0
***************
*** 6508,6512 ****
  
  
!     if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ar; ac_word=$2
--- 6511,6524 ----
  
  
!     if test "x$SUNCXX" = "xyes"; then
!                                 AR=$CXX
!         AROPTIONS="-xar -o"
! 
!     elif test "x$SGICC" = "xyes"; then
!                 AR=$CXX
!         AROPTIONS="-ar -o"
! 
!     else
!         if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ar; ac_word=$2
***************
*** 6604,6607 ****
--- 6616,6623 ----
  fi
  
+         AROPTIONS=rcu
+     fi
+ 
+ 
      if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
***************
*** 6801,6805 ****
                                      INSTALL_DIR="mkdir -p"
              ;;
!         *)  INSTALL_DIR="$INSTALL -d"
              ;;
      esac
--- 6817,6822 ----
                                      INSTALL_DIR="mkdir -p"
              ;;
!         * )
!                                     INSTALL_DIR='$(INSTALL) -d'
              ;;
      esac
***************
*** 7062,7066 ****
  
                          #ifndef __INTEL_COMPILER
!                         #error Not ICC
                          #endif
  
--- 7079,7083 ----
  
                          #ifndef __INTEL_COMPILER
!                         This is not ICC
                          #endif
  
***************
*** 7133,7136 ****
--- 7150,7157 ----
  ldargs="-r -keep_private_externs -nostdlib"
  
+ if test "x${D}CXX" = "x"; then
+     CXX="c++"
+ fi
+ 
  while test ${D}# -gt 0; do
      case ${D}1 in
***************
*** 7146,7149 ****
--- 7167,7176 ----
          ;;
  
+        -arch|-isysroot)
+         # collect these options and values
+         ldargs="${D}{ldargs} ${D}1 ${D}2"
+         shift
+         ;;
+ 
         -s|-Wl,*)
          # collect these load args
***************
*** 7185,7191 ****
  #
  if test ${D}{verbose} = 1; then
!     echo "c++ ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o"
  fi
! c++ ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o
  status=${D}?
  
--- 7212,7218 ----
  #
  if test ${D}{verbose} = 1; then
!     echo "${D}CXX ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o"
  fi
! ${D}CXX ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o
  status=${D}?
  
***************
*** 7196,7202 ****
  if test ${D}{status} = 0; then
      if test ${D}{verbose} = 1; then
!         echo "c++ ${D}{linking_flag} master.${D}${D}.o ${D}{args}"
      fi
!     c++ ${D}{linking_flag} master.${D}${D}.o ${D}{args}
      status=${D}?
  fi
--- 7223,7229 ----
  if test ${D}{status} = 0; then
      if test ${D}{verbose} = 1; then
!         echo "${D}CXX ${D}{linking_flag} master.${D}${D}.o ${D}{args}"
      fi
!     ${D}CXX ${D}{linking_flag} master.${D}${D}.o ${D}{args}
      status=${D}?
  fi
***************
*** 7213,7217 ****
  
          SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o"
!         SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC"
  
  
--- 7240,7244 ----
  
          SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o"
!         SHARED_LD_MODULE_CXX="CXX=\$(CXX) $SHARED_LD_MODULE_CC"
  
  
***************
*** 7235,7239 ****
                     #if (__GNUC__ < 3) || \
                         ((__GNUC__ == 3) && (__GNUC_MINOR__ < 1))
!                        #error old gcc
                     #endif
  
--- 7262,7266 ----
                     #if (__GNUC__ < 3) || \
                         ((__GNUC__ == 3) && (__GNUC_MINOR__ < 1))
!                        This is old gcc
                     #endif
  
***************
*** 7854,7857 ****
--- 7881,7885 ----
        powerpc-apple-macos* | \
        *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-k*bsd*-gnu | \
+       *-*-mirbsd* | \
        *-*-sunos4* | \
        *-*-osf* | \
***************
*** 7939,7942 ****
--- 7967,7971 ----
  echo $ECHO_N "checking for dependency tracking method... $ECHO_C" >&6; }
  
+     BK_DEPS=""
      if test "x$bk_use_trackdeps" = "xno" ; then
          DEPS_TRACKING=0
***************
*** 7995,7999 ****
  #!/bin/sh
  
! # This script is part of Bakefile (http://bakefile.sourceforge.net) autoconf
  # script. It is used to track C/C++ files dependencies in portable way.
  #
--- 8024,8028 ----
  #!/bin/sh
  
! # This script is part of Bakefile (http://www.bakefile.org) autoconf
  # script. It is used to track C/C++ files dependencies in portable way.
  #
***************
*** 8095,8098 ****
--- 8124,8128 ----
  
              chmod +x bk-deps
+                                     BK_DEPS="`pwd`/bk-deps"
          fi
      fi
***************
*** 8101,8104 ****
--- 8131,8135 ----
  
  
+ 
      case ${BAKEFILE_HOST} in
          *-*-cygwin* | *-*-mingw32* )
***************
*** 8302,8305 ****
--- 8333,8337 ----
      ICC_PCH=0
      USE_PCH=0
+     BK_MAKE_PCH=""
  
      case ${BAKEFILE_HOST} in
***************
*** 8325,8332 ****
  
                      #if !defined(__GNUC__) || !defined(__GNUC_MINOR__)
!                         #error "no pch support"
                      #endif
                      #if (__GNUC__ < 3)
!                         #error "no pch support"
                      #endif
                      #if (__GNUC__ == 3) && \
--- 8357,8364 ----
  
                      #if !defined(__GNUC__) || !defined(__GNUC_MINOR__)
!                         There is no PCH support
                      #endif
                      #if (__GNUC__ < 3)
!                         There is no PCH support
                      #endif
                      #if (__GNUC__ == 3) && \
***************
*** 8334,8338 ****
                         ( defined(__APPLE_CC__) && (__GNUC_MINOR__ < 3))) || \
                         ( defined(__INTEL_COMPILER) )
!                         #error "no pch support"
                      #endif
  
--- 8366,8370 ----
                         ( defined(__APPLE_CC__) && (__GNUC_MINOR__ < 3))) || \
                         ( defined(__INTEL_COMPILER) )
!                         There is no PCH support
                      #endif
  
***************
*** 8381,8385 ****
                              #if !defined(__INTEL_COMPILER) || \
                                  (__INTEL_COMPILER < 800)
!                                 #error "no pch support"
                              #endif
  
--- 8413,8417 ----
                              #if !defined(__INTEL_COMPILER) || \
                                  (__INTEL_COMPILER < 800)
!                                 There is no PCH support
                              #endif
  
***************
*** 8432,8436 ****
  #!/bin/sh
  
! # This script is part of Bakefile (http://bakefile.sourceforge.net) autoconf
  # script. It is used to generated precompiled headers.
  #
--- 8464,8468 ----
  #!/bin/sh
  
! # This script is part of Bakefile (http://www.bakefile.org) autoconf
  # script. It is used to generated precompiled headers.
  #
***************
*** 8495,8498 ****
--- 8527,8531 ----
  
                  chmod +x bk-make-pch
+                                                                 BK_MAKE_PCH="`pwd`/bk-make-pch"
              fi
          fi
***************
*** 8502,8505 ****
--- 8535,8539 ----
  
  
+ 
      COND_BUILD_DEBUG="#"
      if test "x$BUILD" = "xdebug" ; then
***************
*** 9606,9613 ****
  MAKE_SET!$MAKE_SET$ac_delim
  AR!$AR$ac_delim
  STRIP!$STRIP$ac_delim
  NM!$NM$ac_delim
  INSTALL_DIR!$INSTALL_DIR$ac_delim
- LDFLAGS_GUI!$LDFLAGS_GUI$ac_delim
  _ACEOF
  
--- 9640,9647 ----
  MAKE_SET!$MAKE_SET$ac_delim
  AR!$AR$ac_delim
+ AROPTIONS!$AROPTIONS$ac_delim
  STRIP!$STRIP$ac_delim
  NM!$NM$ac_delim
  INSTALL_DIR!$INSTALL_DIR$ac_delim
  _ACEOF
  
***************
*** 9651,9654 ****
--- 9685,9689 ----
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
+ LDFLAGS_GUI!$LDFLAGS_GUI$ac_delim
  IF_GNU_MAKE!$IF_GNU_MAKE$ac_delim
  PLATFORM_UNIX!$PLATFORM_UNIX$ac_delim
***************
*** 9683,9686 ****
--- 9718,9722 ----
  SONAME_FLAG!$SONAME_FLAG$ac_delim
  DEPS_TRACKING!$DEPS_TRACKING$ac_delim
+ BK_DEPS!$BK_DEPS$ac_delim
  WINDRES!$WINDRES$ac_delim
  REZ!$REZ$ac_delim
***************
*** 9688,9691 ****
--- 9724,9728 ----
  GCC_PCH!$GCC_PCH$ac_delim
  ICC_PCH!$ICC_PCH$ac_delim
+ BK_MAKE_PCH!$BK_MAKE_PCH$ac_delim
  COND_BUILD_DEBUG!$COND_BUILD_DEBUG$ac_delim
  COND_BUILD_DEBUG_UNICODE_0!$COND_BUILD_DEBUG_UNICODE_0$ac_delim
***************
*** 9745,9751 ****
  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
- COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1!$COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1$ac_delim
- COND_USE_WXLUACANAPP_1!$COND_USE_WXLUACANAPP_1$ac_delim
- COND_USE_WXLUAFREEZEAPP_1!$COND_USE_WXLUAFREEZEAPP_1$ac_delim
  _ACEOF
  
--- 9782,9785 ----
***************
*** 9789,9792 ****
--- 9823,9829 ----
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
+ COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1!$COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1$ac_delim
+ COND_USE_WXLUACANAPP_1!$COND_USE_WXLUACANAPP_1$ac_delim
+ COND_USE_WXLUAFREEZEAPP_1!$COND_USE_WXLUAFREEZEAPP_1$ac_delim
  COND_WINDOWS_IMPLIB_1!$COND_WINDOWS_IMPLIB_1$ac_delim
  COND_WX_PORT_GTK!$COND_WX_PORT_GTK$ac_delim
***************
*** 9800,9804 ****
  _ACEOF
  
!   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 9; then
      break
    elif $ac_last_try; then
--- 9837,9841 ----
  _ACEOF
  
!   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 12; then
      break
    elif $ac_last_try; then