# HG changeset patch
# User Thinker K.F. Li <thinker@branda.to>
# Date 1259218980 -28800
# Node ID ebc431f2af703bed5618aaaa1ecf4b98e4639293
# Parent  1b6228092a570e11a1d7e182a5c7f3bdb88d4bba
Fix issue of replace realloc and malloc.

Since autoconf always say malloc and realloc are not defined when it is
running for cross-compiling.  We use a predefined configure cache file
to hard set for the realloc and malloc.

diff -r 1b6228092a57 -r ebc431f2af70 Android/mb/Android.mk
--- a/Android/mb/Android.mk	Thu Nov 26 15:02:51 2009 +0800
+++ b/Android/mb/Android.mk	Thu Nov 26 15:03:00 2009 +0800
@@ -1,17 +1,25 @@
 LOCAL_PATH:= $(call my-dir)
+MB_LOCAL_PATH := $(LOCAL_PATH)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := MadButterfly
 LOCAL_CONFIGURE := $(LOCAL_PATH)/../../configure
-LOCAL_CONFIGURE_ARGS := --enable-skia
+LOCAL_CONFIGURE_ARGS := --enable-skia --config-cache
 LOCAL_CFLAGS := -I$(shell pwd)/$(call include-path-for,corecg) \
 	-I$(shell pwd)/$(call include-path-for,corecg)/../effects/ \
 	-I$(shell pwd)/$(call include-path-for,frameworks-base)
+LOCAL_CONFIGURE_CACHE := config.cache
 
 include $(BUILD_AUTOCONF)
 
 MB_INTERMEDIATES:=$(strip $(intermediates))
 
+$(LOCAL_BUILT_MODULE): $(MB_INTERMEDIATES)/build/config.cache
+
+$(MB_INTERMEDIATES)/build/config.cache:
+	$(hide) mkdir -p $(MB_INTERMEDIATES)/build/;
+	cp $(strip $(MB_LOCAL_PATH))/config.cache $(MB_INTERMEDIATES)/build/
+
 include $(CLEAR_VARS)
 
 LOCAL_MODULE:= libmbfly
@@ -49,3 +57,4 @@
 all_copied_headers: $(TARGET_OUT_HEADERS)/$(LOCAL_COPY_HEADERS_TO)/mb_config.h
 
 $(MB_INTERMEDIATES)/build/src/.libs/libmbfly.a: MadButterfly
+
diff -r 1b6228092a57 -r ebc431f2af70 Android/mb/config.cache
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Android/mb/config.cache	Thu Nov 26 15:03:00 2009 +0800
@@ -0,0 +1,129 @@
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+ac_cv_build=${ac_cv_build=i386-unknown-freebsd9.0}
+ac_cv_c_compiler_gnu=${ac_cv_c_compiler_gnu=yes}
+ac_cv_c_const=${ac_cv_c_const=yes}
+ac_cv_c_uint32_t=${ac_cv_c_uint32_t=yes}
+ac_cv_c_uint64_t=${ac_cv_c_uint64_t=yes}
+ac_cv_cxx_compiler_gnu=${ac_cv_cxx_compiler_gnu=yes}
+ac_cv_env_CCC_set=''
+ac_cv_env_CCC_value=''
+ac_cv_env_CC_set=set
+ac_cv_env_CC_value=/home/thinker/progm/Android/prebuilt/freebsd-x86/toolchain/arm-eabi-4.4.0/bin/arm-unknown-eabi-gcc
+ac_cv_env_CFLAGS_set=set
+ac_cv_env_CFLAGS_value='-specs /home/thinker/progm/Android/build/core/combo/linux-arm.specs -mandroid --sysroot=/home/thinker/progm/Android/out/target/product/generic/obj/ -I/home/thinker/progm/Android/external/skia/include/core -I/home/thinker/progm/Android/external/skia/include/core/../effects/ -I/home/thinker/progm/Android/frameworks/base/include'
+ac_cv_env_CPPFLAGS_set=''
+ac_cv_env_CPPFLAGS_value=''
+ac_cv_env_CPP_set=''
+ac_cv_env_CPP_value=''
+ac_cv_env_CXXCPP_set=''
+ac_cv_env_CXXCPP_value=''
+ac_cv_env_CXXFLAGS_set=set
+ac_cv_env_CXXFLAGS_value='-specs /home/thinker/progm/Android/build/core/combo/linux-arm.specs -mandroid --sysroot=/home/thinker/progm/Android/out/target/product/generic/obj/ -I/home/thinker/progm/Android/external/skia/include/core -I/home/thinker/progm/Android/external/skia/include/core/../effects/ -I/home/thinker/progm/Android/frameworks/base/include'
+ac_cv_env_CXX_set=set
+ac_cv_env_CXX_value=/home/thinker/progm/Android/prebuilt/freebsd-x86/toolchain/arm-eabi-4.4.0/bin/arm-unknown-eabi-g++
+ac_cv_env_LDFLAGS_set=set
+ac_cv_env_LDFLAGS_value=''
+ac_cv_env_LIBS_set=''
+ac_cv_env_LIBS_value=''
+ac_cv_env_PKG_CONFIG_set=''
+ac_cv_env_PKG_CONFIG_value=''
+ac_cv_env_XMKMF_set=''
+ac_cv_env_XMKMF_value=''
+ac_cv_env_build_alias_set=''
+ac_cv_env_build_alias_value=''
+ac_cv_env_cairo_CFLAGS_set=''
+ac_cv_env_cairo_CFLAGS_value=''
+ac_cv_env_cairo_LIBS_set=''
+ac_cv_env_cairo_LIBS_value=''
+ac_cv_env_host_alias_set=set
+ac_cv_env_host_alias_value=i386-unknown-freebsd
+ac_cv_env_pangocairo_CFLAGS_set=''
+ac_cv_env_pangocairo_CFLAGS_value=''
+ac_cv_env_pangocairo_LIBS_set=''
+ac_cv_env_pangocairo_LIBS_value=''
+ac_cv_env_target_alias_set=set
+ac_cv_env_target_alias_value=arm-unknown-linux
+ac_cv_func_gettimeofday=${ac_cv_func_gettimeofday=yes}
+ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes}
+ac_cv_func_memset=${ac_cv_func_memset=yes}
+ac_cv_func_realloc_0_nonnull=${ac_cv_func_realloc_0_nonnull=yes}
+ac_cv_func_select=${ac_cv_func_select=yes}
+ac_cv_func_select_args=${ac_cv_func_select_args='int,fd_set *,struct timeval *'}
+ac_cv_func_sqrt=${ac_cv_func_sqrt=no}
+ac_cv_func_strdup=${ac_cv_func_strdup=yes}
+ac_cv_have_x=${ac_cv_have_x='have_x=yes	ac_x_includes='\''/usr/local/include'\''	ac_x_libraries='\''/usr/local/lib'\'}
+ac_cv_header_dlfcn_h=${ac_cv_header_dlfcn_h=yes}
+ac_cv_header_inttypes_h=${ac_cv_header_inttypes_h=yes}
+ac_cv_header_memory_h=${ac_cv_header_memory_h=yes}
+ac_cv_header_stdc=${ac_cv_header_stdc=no}
+ac_cv_header_stdint_h=${ac_cv_header_stdint_h=yes}
+ac_cv_header_stdlib_h=${ac_cv_header_stdlib_h=yes}
+ac_cv_header_string_h=${ac_cv_header_string_h=yes}
+ac_cv_header_strings_h=${ac_cv_header_strings_h=yes}
+ac_cv_header_sys_select_h=${ac_cv_header_sys_select_h=yes}
+ac_cv_header_sys_socket_h=${ac_cv_header_sys_socket_h=yes}
+ac_cv_header_sys_stat_h=${ac_cv_header_sys_stat_h=yes}
+ac_cv_header_sys_time_h=${ac_cv_header_sys_time_h=yes}
+ac_cv_header_sys_types_h=${ac_cv_header_sys_types_h=yes}
+ac_cv_header_time=${ac_cv_header_time=yes}
+ac_cv_header_unistd_h=${ac_cv_header_unistd_h=yes}
+ac_cv_host=${ac_cv_host=i386-unknown-freebsd}
+ac_cv_objext=${ac_cv_objext=o}
+ac_cv_path_EGREP=${ac_cv_path_EGREP='/usr/bin/grep -E'}
+ac_cv_path_FGREP=${ac_cv_path_FGREP='/usr/bin/grep -F'}
+ac_cv_path_GREP=${ac_cv_path_GREP=/usr/bin/grep}
+ac_cv_path_SED=${ac_cv_path_SED=/usr/bin/sed}
+ac_cv_path_install=${ac_cv_path_install='/usr/bin/install -c'}
+ac_cv_prog_AWK=${ac_cv_prog_AWK=gawk}
+ac_cv_prog_CC=${ac_cv_prog_CC=/home/thinker/progm/Android/prebuilt/freebsd-x86/toolchain/arm-eabi-4.4.0/bin/arm-unknown-eabi-gcc}
+ac_cv_prog_CPP=${ac_cv_prog_CPP='/home/thinker/progm/Android/prebuilt/freebsd-x86/toolchain/arm-eabi-4.4.0/bin/arm-unknown-eabi-gcc -E'}
+ac_cv_prog_CXXCPP=${ac_cv_prog_CXXCPP='/home/thinker/progm/Android/prebuilt/freebsd-x86/toolchain/arm-eabi-4.4.0/bin/arm-unknown-eabi-g++ -E'}
+ac_cv_prog_STRIP=${ac_cv_prog_STRIP=strip}
+ac_cv_prog_ac_ct_AR=${ac_cv_prog_ac_ct_AR=ar}
+ac_cv_prog_ac_ct_DUMPBIN=${ac_cv_prog_ac_ct_DUMPBIN='link -dump -symbols'}
+ac_cv_prog_ac_ct_OBJDUMP=${ac_cv_prog_ac_ct_OBJDUMP=objdump}
+ac_cv_prog_ac_ct_RANLIB=${ac_cv_prog_ac_ct_RANLIB=ranlib}
+ac_cv_prog_ac_ct_STRIP=${ac_cv_prog_ac_ct_STRIP=strip}
+ac_cv_prog_cc_c89=${ac_cv_prog_cc_c89=''}
+ac_cv_prog_cc_g=${ac_cv_prog_cc_g=yes}
+ac_cv_prog_cxx_g=${ac_cv_prog_cxx_g=yes}
+ac_cv_prog_make_make_set=${ac_cv_prog_make_make_set=yes}
+ac_cv_struct_tm=${ac_cv_struct_tm=time.h}
+ac_cv_type_size_t=${ac_cv_type_size_t=yes}
+am_cv_CC_dependencies_compiler_type=${am_cv_CC_dependencies_compiler_type=gcc3}
+am_cv_CXX_dependencies_compiler_type=${am_cv_CXX_dependencies_compiler_type=gcc3}
+lt_cv_deplibs_check_method=${lt_cv_deplibs_check_method=pass_all}
+lt_cv_file_magic_cmd=${lt_cv_file_magic_cmd='$MAGIC_CMD'}
+lt_cv_file_magic_test_file=${lt_cv_file_magic_test_file=''}
+lt_cv_ld_reload_flag=${lt_cv_ld_reload_flag=-r}
+lt_cv_nm_interface=${lt_cv_nm_interface='BSD nm'}
+lt_cv_objdir=${lt_cv_objdir=.libs}
+lt_cv_path_LD=${lt_cv_path_LD=/usr/home/thinker/progm/Android/prebuilt/freebsd-x86/toolchain/arm-eabi-4.4.0/arm-unknown-eabi/bin/ld}
+lt_cv_path_LDCXX=${lt_cv_path_LDCXX=/usr/home/thinker/progm/Android/prebuilt/freebsd-x86/toolchain/arm-eabi-4.4.0/arm-unknown-eabi/bin/ld}
+lt_cv_path_NM=${lt_cv_path_NM=no}
+lt_cv_prog_compiler_c_o=${lt_cv_prog_compiler_c_o=yes}
+lt_cv_prog_compiler_c_o_CXX=${lt_cv_prog_compiler_c_o_CXX=yes}
+lt_cv_prog_compiler_pic_works=${lt_cv_prog_compiler_pic_works=yes}
+lt_cv_prog_compiler_pic_works_CXX=${lt_cv_prog_compiler_pic_works_CXX=yes}
+lt_cv_prog_compiler_rtti_exceptions=${lt_cv_prog_compiler_rtti_exceptions=no}
+lt_cv_prog_compiler_static_works=${lt_cv_prog_compiler_static_works=no}
+lt_cv_prog_compiler_static_works_CXX=${lt_cv_prog_compiler_static_works_CXX=no}
+lt_cv_prog_gnu_ld=${lt_cv_prog_gnu_ld=yes}
+lt_cv_prog_gnu_ldcxx=${lt_cv_prog_gnu_ldcxx=yes}
+lt_cv_sys_global_symbol_pipe=${lt_cv_sys_global_symbol_pipe=''}
+test "${lt_cv_sys_global_symbol_to_c_name_address+set}" = set || lt_cv_sys_global_symbol_to_c_name_address='sed -n -e '\''s/^: \([^ ]*\) $/  {\"\1\", (void *) 0},/p'\'' -e '\''s/^[BCDEGRST]* \([^ ]*\) \([^ ]*\)$/  {"\2", (void *) \&\2},/p'\'
+test "${lt_cv_sys_global_symbol_to_c_name_address_lib_prefix+set}" = set || lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='sed -n -e '\''s/^: \([^ ]*\) $/  {\"\1\", (void *) 0},/p'\'' -e '\''s/^[BCDEGRST]* \([^ ]*\) \(lib[^ ]*\)$/  {"\2", (void *) \&\2},/p'\'' -e '\''s/^[BCDEGRST]* \([^ ]*\) \([^ ]*\)$/  {"lib\2", (void *) \&\2},/p'\'
+lt_cv_sys_global_symbol_to_cdecl=${lt_cv_sys_global_symbol_to_cdecl=''}
+lt_cv_sys_max_cmd_len=${lt_cv_sys_max_cmd_len=196608}