# HG changeset patch # User YAMAMOTO Mitsuharu # Date 1163492509 0 # Node ID 13efda9a990973aa4b9e72ae0047772eba0bfc52 # Parent e64942376b6b6cb1daea849fdeccab52762e1cdc Regenerate. diff -r e64942376b6b -r 13efda9a9909 configure --- a/configure Tue Nov 14 08:21:26 2006 +0000 +++ b/configure Tue Nov 14 08:21:49 2006 +0000 @@ -13205,113 +13205,6 @@ fi # We also have mouse menus. HAVE_MENUS=yes - - tmp_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -framework Carbon" - echo "$as_me:$LINENO: checking for CancelMenuTracking" >&5 -echo $ECHO_N "checking for CancelMenuTracking... $ECHO_C" >&6 -if test "${ac_cv_func_CancelMenuTracking+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. */ -/* Define CancelMenuTracking to an innocuous variant, in case declares CancelMenuTracking. - For example, HP-UX 11i declares gettimeofday. */ -#define CancelMenuTracking innocuous_CancelMenuTracking - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char CancelMenuTracking (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef CancelMenuTracking - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char CancelMenuTracking (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_CancelMenuTracking) || defined (__stub___CancelMenuTracking) -choke me -#else -char (*f) () = CancelMenuTracking; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != CancelMenuTracking; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 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_c_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_exeext' - { (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 - ac_cv_func_CancelMenuTracking=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_CancelMenuTracking=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_CancelMenuTracking" >&5 -echo "${ECHO_T}$ac_cv_func_CancelMenuTracking" >&6 -if test $ac_cv_func_CancelMenuTracking = yes; then - have_cmt=yes -else - have_cmt=no -fi - - if test "$have_cmt" = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_CANCELMENUTRACKING 1 -_ACEOF - - fi - CFLAGS="$tmp_CFLAGS" fi ### Use session management (-lSM -lICE) if available diff -r e64942376b6b -r 13efda9a9909 src/config.in --- a/src/config.in Tue Nov 14 08:21:26 2006 +0000 +++ b/src/config.in Tue Nov 14 08:21:49 2006 +0000 @@ -99,9 +99,6 @@ /* Define to 1 if you have the `bzero' function. */ #undef HAVE_BZERO -/* Define to 1 if CancelMenuTracking is available (Mac OSX). */ -#undef HAVE_CANCELMENUTRACKING - /* Define to 1 if you are using the Carbon API on Mac OS X. */ #undef HAVE_CARBON