From 5c470deb5c228a75682f4d5325a740bab6823bcf Mon Sep 17 00:00:00 2001 From: Xiangfu Liu Date: Mon, 23 Jan 2012 22:38:44 +0800 Subject: [PATCH] bard: fix the FLITEDIR and SDL check --- bard/Makefile | 7 +++++++ .../001-remove-configure-hardcode-check.patch | 21 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 bard/patches/001-remove-configure-hardcode-check.patch diff --git a/bard/Makefile b/bard/Makefile index a340542..23e3c54 100644 --- a/bard/Makefile +++ b/bard/Makefile @@ -29,6 +29,13 @@ Bard Storyteller is a text reader. Bard not only allows a user to read books, but can also read books to a user using text-to-speech. endef +define Build/Configure + cd $(PKG_BUILD_DIR) && autoconf + $(call Build/Configure/Default, FLITEDIR=$(STAGING_DIR)/usr) +endef + +TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/SDL + define Package/bard/install $(INSTALL_DIR) $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/bard $(1)/usr/bin/ diff --git a/bard/patches/001-remove-configure-hardcode-check.patch b/bard/patches/001-remove-configure-hardcode-check.patch new file mode 100644 index 0000000..189df29 --- /dev/null +++ b/bard/patches/001-remove-configure-hardcode-check.patch @@ -0,0 +1,21 @@ +diff --git a/configure.in b/configure.in +index 0e44011..254d1da 100644 +--- a/configure.in ++++ b/configure.in +@@ -430,16 +430,6 @@ echo CMU Flite found in $FLITEDIR + AC_SUBST(FLITEDIR) + + dnl +-dnl SDL support +-dnl +-if ! test -f /usr/include/SDL/SDL.h; then +- AC_MSG_ERROR("Cannot locate /usr/include/SDL/SDL.h.") +-fi +-if ! test -f /usr/include/SDL/SDL_ttf.h; then +- AC_MSG_ERROR("Cannot locate /usr/include/SDL/SDL_ttf.h.") +-fi +- +-dnl + dnl Find a font. + dnl + if test "x$DEFAULTFONT" = "x"