diff options
| -rwxr-xr-x | android-configure.sh | 5 | ||||
| -rw-r--r-- | android/build/common.sh | 2 | ||||
| -rw-r--r-- | android/config/darwin-x86/config-host.h | 1 | ||||
| -rw-r--r-- | android/config/freebsd-x86/config-host.h | 1 | ||||
| -rw-r--r-- | android/config/linux-x86/config-host.h | 1 |
5 files changed, 9 insertions, 1 deletions
diff --git a/android-configure.sh b/android-configure.sh index 8b65c22..30d6f3c 100755 --- a/android-configure.sh +++ b/android-configure.sh @@ -357,6 +357,8 @@ fi # feature_check_header HAVE_BYTESWAP_H "<byteswap.h>" +feature_check_header HAVE_FNMATCH_H "<fnmatch.h>" + # Build the config.make file # @@ -404,6 +406,9 @@ echo "#define HOST_LONG_BITS $HOST_LONGBITS" >> $config_h if [ "$HAVE_BYTESWAP_H" = "yes" ] ; then echo "#define HAVE_BYTESWAP_H 1" >> $config_h fi +if [ "$HAVE_FNMATCH_H" = "yes" ] ; then + echo "#define CONFIG_FNMATCH 1" >> $config_h +fi echo "#define CONFIG_GDBSTUB 1" >> $config_h echo "#define CONFIG_SLIRP 1" >> $config_h echo "#define CONFIG_SKINS 1" >> $config_h diff --git a/android/build/common.sh b/android/build/common.sh index 6c62977..b053b97 100644 --- a/android/build/common.sh +++ b/android/build/common.sh @@ -413,7 +413,7 @@ feature_check_link () feature_check_header () { local result_ch - log2 "HeaderChk : $2" + log "HeaderCheck: $2" echo "#include $2" > $TMPC cat >> $TMPC <<EOF int main(void) { return 0; } diff --git a/android/config/darwin-x86/config-host.h b/android/config/darwin-x86/config-host.h index f02a109..1f5352b 100644 --- a/android/config/darwin-x86/config-host.h +++ b/android/config/darwin-x86/config-host.h @@ -2,6 +2,7 @@ #define CONFIG_QEMU_SHAREDIR "/usr/local/share/qemu" #define HOST_I386 1 #define HOST_LONG_BITS 32 +#define CONFIG_FNMATCH 1 #define CONFIG_DARWIN 1 #define CONFIG_GDBSTUB 1 #define CONFIG_SLIRP 1 diff --git a/android/config/freebsd-x86/config-host.h b/android/config/freebsd-x86/config-host.h index 844698a..b5a7f72 100644 --- a/android/config/freebsd-x86/config-host.h +++ b/android/config/freebsd-x86/config-host.h @@ -2,6 +2,7 @@ #define CONFIG_QEMU_SHAREDIR "/usr/local/share/qemu" #define HOST_I386 1 #define HOST_LONG_BITS 32 +#define CONFIG_FNMATCH 1 #define CONFIG_GDBSTUB 1 #define CONFIG_SLIRP 1 #define CONFIG_OSS 1 diff --git a/android/config/linux-x86/config-host.h b/android/config/linux-x86/config-host.h index 1a86213..df63ac8 100644 --- a/android/config/linux-x86/config-host.h +++ b/android/config/linux-x86/config-host.h @@ -3,6 +3,7 @@ #define HOST_I386 1 #define HOST_LONG_BITS 32 #define HAVE_BYTESWAP_H 1 +#define CONFIG_FNMATCH 1 #define CONFIG_GDBSTUB 1 #define CONFIG_SLIRP 1 #define QEMU_VERSION "0.10.50" |