From: Francesco M. <fr...@us...> - 2005-11-26 14:06:15
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13105 Modified Files: configure Log Message: added configure checks for wxLua apps,modules,util options Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** configure 20 Nov 2005 12:11:48 -0000 1.2 --- configure 26 Nov 2005 14:06:05 -0000 1.3 *************** *** 274,278 **** PACKAGE_BUGREPORT='fr...@us...' ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os AWK INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S RANLIB ac_ct_RANLIB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CXXCPP WX_CONFIG_PATH WX_CPPFLAGS WX_CFLAGS WX_CXXFLAGS WX_CFLAGS_ONLY WX_CXXFLAGS_ONLY WX_LIBS WX_LIBS_STATIC WX_VERSION SET_MAKE MAKE_SET AR ac_ct_AR STRIP ac_ct_STRIP NM ac_ct_NM INSTALL_DIR LDFLAGS_GUI IF_GNU_MAKE PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOS PLATFORM_MACOSX PLATFORM_OS2 PLATFORM_BEOS SO_SUFFIX SO_SUFFIX_MODULE DLLIMP_SUFFIX LIBPREFIX LIBEXT DLLPREFIX DLLPREFIX_MODULE dlldir AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX SHARED_LD_MODULE_CC SHARED_LD_MODULE_CXX PIC_FLAG WINDOWS_IMPLIB USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_SOVERCYGWIN USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING RESCOMP SETFILE COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_MAC_1 COND_PLATFORM_OS2_1 COND_PLATFORM_WIN32_1 COND_USE_APPS_1 COND_USE_BIN2C_1 COND_USE_SOSYMLINKS_1 COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_USE_UTIL_1 COND_WINDOWS_IMPLIB_1 COND_WX_SHARED_0 COND_WX_SHARED_1 LIBOBJS LTLIBOBJS' ac_subst_files='' --- 274,278 ---- PACKAGE_BUGREPORT='fr...@us...' ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os AWK INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S RANLIB ac_ct_RANLIB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CXXCPP WX_CONFIG_PATH WX_CPPFLAGS WX_CFLAGS WX_CXXFLAGS WX_CFLAGS_ONLY WX_CXXFLAGS_ONLY WX_LIBS WX_LIBS_STATIC WX_VERSION SET_MAKE MAKE_SET AR ac_ct_AR STRIP ac_ct_STRIP NM ac_ct_NM INSTALL_DIR LDFLAGS_GUI IF_GNU_MAKE PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOS PLATFORM_MACOSX PLATFORM_OS2 PLATFORM_BEOS SO_SUFFIX SO_SUFFIX_MODULE DLLIMP_SUFFIX LIBPREFIX LIBEXT DLLPREFIX DLLPREFIX_MODULE dlldir AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX SHARED_LD_MODULE_CC SHARED_LD_MODULE_CXX PIC_FLAG WINDOWS_IMPLIB USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_SOVERCYGWIN USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING WINDRES ac_ct_WINDRES REZ SETFILE COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_MAC_1 COND_PLATFORM_OS2_1 COND_PLATFORM_WIN32_1 COND_USE_APPS_1 COND_USE_BIN2C_1 COND_USE_SOSYMLINKS_1 COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_USE_UTIL_1 COND_USE_WXLUAAPP_1 COND_USE_WXLUAEDITAPP_1 COND_WINDOWS_IMPLIB_1 COND_WX_SHARED_0 COND_WX_SHARED_1 LIBOBJS LTLIBOBJS' ac_subst_files='' *************** *** 820,823 **** --- 820,828 ---- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-wxlua-app Compiles the wxLua app (default is yes) + --enable-wxluaedit-app Compiles the wxLuaEditor app (default is no) + --enable-wxluadebuglib Compiles the wxLua debug support (default is yes) + --enable-wxluasocketlib Compiles the wxLua socket support (default is yes) + --enable-bin2c Compiles the bin2c utility (default is yes) --enable-static Builds in static mode (default is wxlike) --enable-unicode Builds in unicode mode (default is wxlike) *************** *** 1354,1357 **** --- 1359,1365 ---- + + + ac_aux_dir= for ac_dir in build/autoconf $srcdir/build/autoconf; do *************** *** 1389,1395 **** --- 1397,1521 ---- + ## CONFIGURE OPTIONS ##################################################################### + # Options for the APPS section + + # Check whether --enable-wxlua-app or --disable-wxlua-app was given. + if test "${enable_wxlua_app+set}" = set; then + enableval="$enable_wxlua_app" + + else + enable_wxlua_app=yes + fi; + # Check whether --enable-wxluaedit-app or --disable-wxluaedit-app was given. + if test "${enable_wxluaedit_app+set}" = set; then + enableval="$enable_wxluaedit_app" + + else + enable_wxluaedit_app=no + fi; + + + # Options for the MODULES section + + # Check whether --enable-wxluadebuglib or --disable-wxluadebuglib was given. + if test "${enable_wxluadebuglib+set}" = set; then + enableval="$enable_wxluadebuglib" + + else + enable_wxluadebuglib=yes + fi; + # Check whether --enable-wxluasocketlib or --disable-wxluasocketlib was given. + if test "${enable_wxluasocketlib+set}" = set; then + enableval="$enable_wxluasocketlib" + + else + enable_wxluasocketlib=yes + fi; + + + # Options for the UTIL section + + # Check whether --enable-bin2c or --disable-bin2c was given. + if test "${enable_bin2c+set}" = set; then + enableval="$enable_bin2c" + + else + enable_bin2c=yes + fi; + + + + echo "$as_me:$LINENO: checking for --enable-wxlua-app option" >&5 + echo $ECHO_N "checking for --enable-wxlua-app option... $ECHO_C" >&6 + if [ "x$enable_wxlua_app" = "xyes" ]; then + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + USE_WXLUAAPP=1 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + USE_WXLUAAPP=0 + fi + + + echo "$as_me:$LINENO: checking for --enable-wxluaedit-app option" >&5 + echo $ECHO_N "checking for --enable-wxluaedit-app option... $ECHO_C" >&6 + if [ "x$enable_wxluaedit_app" = "xyes" ]; then + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + USE_WXLUAEDITAPP=1 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + USE_WXLUAEDITAPP=0 + fi + + + + echo "$as_me:$LINENO: checking for --enable-wxluadebuglib option" >&5 + echo $ECHO_N "checking for --enable-wxluadebuglib option... $ECHO_C" >&6 + if [ "x$enable_wxluadebuglib" = "xyes" ]; then + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + USE_WXLUADEBUGLIB=1 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + USE_WXLUADEBUGLIB=0 + fi + + + echo "$as_me:$LINENO: checking for --enable-wxluasocketlib option" >&5 + echo $ECHO_N "checking for --enable-wxluasocketlib option... $ECHO_C" >&6 + if [ "x$enable_wxluasocketlib" = "xyes" ]; then + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + USE_WXLUASOCKETLIB=1 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + USE_WXLUASOCKETLIB=0 + fi + + + + echo "$as_me:$LINENO: checking for --enable-bin2c option" >&5 + echo $ECHO_N "checking for --enable-bin2c option... $ECHO_C" >&6 + if [ "x$enable_bin2c" = "xyes" ]; then + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + USE_BIN2C=1 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + USE_BIN2C=0 + fi + + + + *************** *** 5164,5234 **** *-*-darwin* ) - echo "$as_me:$LINENO: checking for gcc 3.1 or later" >&5 - echo $ECHO_N "checking for gcc 3.1 or later... $ECHO_C" >&6 - if test "${bakefile_cv_gcc31+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - - int - main () - { - - #if (__GNUC__ < 3) || \ - ((__GNUC__ == 3) && (__GNUC_MINOR__ < 1)) - #error old gcc - #endif - - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - bakefile_cv_gcc31=yes - - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - - bakefile_cv_gcc31=no - - - fi - rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - - fi - echo "$as_me:$LINENO: result: $bakefile_cv_gcc31" >&5 - echo "${ECHO_T}$bakefile_cv_gcc31" >&6 - if test "$bakefile_cv_gcc31" = "no"; then - D='$' cat <<EOF >shared-ld-sh --- 5290,5293 ---- *************** *** 5325,5339 **** EOF ! chmod +x shared-ld-sh SHARED_LD_CC="`pwd`/shared-ld-sh -dynamiclib -headerpad_max_install_names -o" - SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o" SHARED_LD_CXX="$SHARED_LD_CC" - SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC" else SHARED_LD_CC="\${CC} -dynamiclib -single_module -headerpad_max_install_names -o" - SHARED_LD_MODULE_CC="\${CC} -bundle -single_module -headerpad_max_install_names -o" SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o" - SHARED_LD_MODULE_CXX="\${CXX} -bundle -single_module -headerpad_max_install_names -o" fi --- 5384,5464 ---- EOF ! chmod +x shared-ld-sh ! ! SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o" ! SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC" ! ! ! echo "$as_me:$LINENO: checking for gcc 3.1 or later" >&5 ! echo $ECHO_N "checking for gcc 3.1 or later... $ECHO_C" >&6 ! if test "${bakefile_cv_gcc31+set}" = set; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! ! cat >conftest.$ac_ext <<_ACEOF ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ ! ! int ! main () ! { ! ! #if (__GNUC__ < 3) || \ ! ((__GNUC__ == 3) && (__GNUC_MINOR__ < 1)) ! #error old gcc ! #endif + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + bakefile_cv_gcc31=yes + + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + + bakefile_cv_gcc31=no + + + fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + echo "$as_me:$LINENO: result: $bakefile_cv_gcc31" >&5 + echo "${ECHO_T}$bakefile_cv_gcc31" >&6 + if test "$bakefile_cv_gcc31" = "no"; then SHARED_LD_CC="`pwd`/shared-ld-sh -dynamiclib -headerpad_max_install_names -o" SHARED_LD_CXX="$SHARED_LD_CC" else SHARED_LD_CC="\${CC} -dynamiclib -single_module -headerpad_max_install_names -o" SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o" fi *************** *** 5348,5363 **** *-*-aix* ) if test "x$GCC" = "xyes"; then ! PIC_FLAG="" ! case "${BAKEFILE_HOST}" in ! *-*-aix5* ) ! LD_EXPFULL="-Wl,-bexpfull" ! ;; ! esac ! SHARED_LD_CC="\$(CC) -shared $LD_EXPFULL -o" ! SHARED_LD_CXX="\$(CXX) -shared $LD_EXPFULL -o" ! else ! # Extract the first word of "makeC++SharedLib", so it can be a program name with args. set dummy makeC++SharedLib; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 --- 5473,5488 ---- *-*-aix* ) if test "x$GCC" = "xyes"; then ! PIC_FLAG="" ! case "${BAKEFILE_HOST}" in ! *-*-aix5* ) ! LD_EXPFULL="-Wl,-bexpfull" ! ;; ! esac ! SHARED_LD_CC="\$(CC) -shared $LD_EXPFULL -o" ! SHARED_LD_CXX="\$(CXX) -shared $LD_EXPFULL -o" ! else ! # Extract the first word of "makeC++SharedLib", so it can be a program name with args. set dummy makeC++SharedLib; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 *************** *** 6139,6159 **** - RESCOMP= - SETFILE= - case ${BAKEFILE_HOST} in *-*-cygwin* | *-*-mingw32* ) ! if test "$build" != "$host" ; then ! RESCOMP=$host_alias-windres ! else ! # Extract the first word of "windres", so it can be a program name with args. set dummy windres; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ! if test "${ac_cv_prog_RESCOMP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! if test -n "$RESCOMP"; then ! ac_cv_prog_RESCOMP="$RESCOMP" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --- 6264,6317 ---- case ${BAKEFILE_HOST} in *-*-cygwin* | *-*-mingw32* ) ! if test -n "$ac_tool_prefix"; then ! # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. ! set dummy ${ac_tool_prefix}windres; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 ! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ! if test "${ac_cv_prog_WINDRES+set}" = set; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! if test -n "$WINDRES"; then ! ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. ! else ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_prog_WINDRES="${ac_tool_prefix}windres" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 ! fi ! done ! done ! ! fi ! fi ! WINDRES=$ac_cv_prog_WINDRES ! if test -n "$WINDRES"; then ! echo "$as_me:$LINENO: result: $WINDRES" >&5 ! echo "${ECHO_T}$WINDRES" >&6 ! else ! echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 ! fi ! ! fi ! if test -z "$ac_cv_prog_WINDRES"; then ! ac_ct_WINDRES=$WINDRES ! # Extract the first word of "windres", so it can be a program name with args. set dummy windres; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ! if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! if test -n "$ac_ct_WINDRES"; then ! ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR *************** *** 6164,6168 **** for ac_exec_ext in '' $ac_executable_extensions; do if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_prog_RESCOMP="windres" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 --- 6322,6326 ---- for ac_exec_ext in '' $ac_executable_extensions; do if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_prog_ac_ct_WINDRES="windres" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 *************** *** 6171,6181 **** done - test -z "$ac_cv_prog_RESCOMP" && ac_cv_prog_RESCOMP="windres" fi fi ! RESCOMP=$ac_cv_prog_RESCOMP ! if test -n "$RESCOMP"; then ! echo "$as_me:$LINENO: result: $RESCOMP" >&5 ! echo "${ECHO_T}$RESCOMP" >&6 else echo "$as_me:$LINENO: result: no" >&5 --- 6329,6338 ---- done fi fi ! ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES ! if test -n "$ac_ct_WINDRES"; then ! echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5 ! echo "${ECHO_T}$ac_ct_WINDRES" >&6 else echo "$as_me:$LINENO: result: no" >&5 *************** *** 6183,6187 **** fi ! fi ;; --- 6340,6348 ---- fi ! WINDRES=$ac_ct_WINDRES ! else ! WINDRES="$ac_cv_prog_WINDRES" ! fi ! ;; *************** *** 6191,6199 **** echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ! if test "${ac_cv_prog_RESCOMP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! if test -n "$RESCOMP"; then ! ac_cv_prog_RESCOMP="$RESCOMP" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --- 6352,6360 ---- echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ! if test "${ac_cv_prog_REZ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! if test -n "$REZ"; then ! ac_cv_prog_REZ="$REZ" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR *************** *** 6204,6208 **** for ac_exec_ext in '' $ac_executable_extensions; do if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_prog_RESCOMP="Rez" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 --- 6365,6369 ---- for ac_exec_ext in '' $ac_executable_extensions; do if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_prog_REZ="Rez" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 *************** *** 6211,6221 **** done ! test -z "$ac_cv_prog_RESCOMP" && ac_cv_prog_RESCOMP="/Developer/Tools/Rez" fi fi ! RESCOMP=$ac_cv_prog_RESCOMP ! if test -n "$RESCOMP"; then ! echo "$as_me:$LINENO: result: $RESCOMP" >&5 ! echo "${ECHO_T}$RESCOMP" >&6 else echo "$as_me:$LINENO: result: no" >&5 --- 6372,6382 ---- done ! test -z "$ac_cv_prog_REZ" && ac_cv_prog_REZ="/Developer/Tools/Rez" fi fi ! REZ=$ac_cv_prog_REZ ! if test -n "$REZ"; then ! echo "$as_me:$LINENO: result: $REZ" >&5 ! echo "${ECHO_T}$REZ" >&6 else echo "$as_me:$LINENO: result: no" >&5 *************** *** 6266,6269 **** --- 6427,6431 ---- + BAKEFILE_BAKEFILE_M4_VERSION="0.1.9" *************** *** 6356,6359 **** --- 6518,6531 ---- fi + COND_USE_WXLUAAPP_1="#" + if test "x$USE_WXLUAAPP" = "x1" ; then + COND_USE_WXLUAAPP_1="" + fi + + COND_USE_WXLUAEDITAPP_1="#" + if test "x$USE_WXLUAEDITAPP" = "x1" ; then + COND_USE_WXLUAEDITAPP_1="" + fi + COND_WINDOWS_IMPLIB_1="#" if test "x$WINDOWS_IMPLIB" = "x1" ; then *************** *** 7106,7110 **** s,@SONAME_FLAG@,$SONAME_FLAG,;t t s,@DEPS_TRACKING@,$DEPS_TRACKING,;t t ! s,@RESCOMP@,$RESCOMP,;t t s,@SETFILE@,$SETFILE,;t t s,@COND_DEPS_TRACKING_0@,$COND_DEPS_TRACKING_0,;t t --- 7278,7284 ---- s,@SONAME_FLAG@,$SONAME_FLAG,;t t s,@DEPS_TRACKING@,$DEPS_TRACKING,;t t ! s,@WINDRES@,$WINDRES,;t t ! s,@ac_ct_WINDRES@,$ac_ct_WINDRES,;t t ! s,@REZ@,$REZ,;t t s,@SETFILE@,$SETFILE,;t t s,@COND_DEPS_TRACKING_0@,$COND_DEPS_TRACKING_0,;t t *************** *** 7125,7128 **** --- 7299,7304 ---- s,@COND_USE_SOVERSOLARIS_1@,$COND_USE_SOVERSOLARIS_1,;t t s,@COND_USE_UTIL_1@,$COND_USE_UTIL_1,;t t + s,@COND_USE_WXLUAAPP_1@,$COND_USE_WXLUAAPP_1,;t t + s,@COND_USE_WXLUAEDITAPP_1@,$COND_USE_WXLUAEDITAPP_1,;t t s,@COND_WINDOWS_IMPLIB_1@,$COND_WINDOWS_IMPLIB_1,;t t s,@COND_WX_SHARED_0@,$COND_WX_SHARED_0,;t t |