From 2c706db02ca07868362085ca3eddb395e44e9826 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20K=C3=BChling?= Date: Thu, 22 Mar 2012 03:28:52 +0100 Subject: [PATCH] bard: fix compilation (various configure script fixes), still misses dejavu font Configure script is still in bad shape though, needs much more time to be cleaned up for proper cross-compilability. --- bard/Makefile | 6 +++ bard/patches/0010-configure.patch | 62 +++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 bard/patches/0010-configure.patch diff --git a/bard/Makefile b/bard/Makefile index 827cc21..c58be6d 100644 --- a/bard/Makefile +++ b/bard/Makefile @@ -44,3 +44,9 @@ define Package/bard/install endef $(eval $(call BuildPackage,bard)) + + +# The following comments configure the Emacs editor. Just ignore them. +# Local Variables: +# compile-command: "cd ~/src/nanonote/bard-0.7-current && ~/bin/quilt-export target && make -C ~/h/src/qi/openwrt-xburst package/bard/compile -j2 V=99" +# End: diff --git a/bard/patches/0010-configure.patch b/bard/patches/0010-configure.patch new file mode 100644 index 0000000..ceb85ab --- /dev/null +++ b/bard/patches/0010-configure.patch @@ -0,0 +1,62 @@ +Index: bard-0.7-current/configure.in +=================================================================== +--- bard-0.7-current.orig/configure.in 2012-03-22 03:13:47.186201055 +0100 ++++ bard-0.7-current/configure.in 2012-03-22 03:25:50.896839172 +0100 +@@ -456,28 +456,28 @@ + SDLLIBS="-lSDL" + + dnl Fix this .... +-if ! test -f /usr/include/SDL/SDL_ttf.h; then +- AC_MSG_ERROR("Cannot locate /usr/include/SDL/SDL_ttf.h.") +-fi ++AC_CHECK_HEADER(SDL/SDL_ttf.h,,[AC_MSG_ERROR([Cannot locate SDL/SDL_ttf.h])]) + SDLLIBS="-lSDL_ttf $SDLLIBS" + + dnl AC_CHECK_HEADER(SDL/SDL_ttf.h,,[AC_MSG_ERROR([Cannot locate SDL/SDL_ttf.h])]) +-if ! test "x$EPUBDEFS" = x; then +- if test -f /usr/include/SDL/SDL_image.h -a -f /usr/include/SDL/SDL_rotozoom.h +- then +- echo "EPUB (with SDL images) support found" ++AS_IF([test "x$EPUBDEFS" = x],[ ++ sdl_img=no ++ sdl_rotozoom=no ++ AC_CHECK_HEADER(SDL/SDL_image.h,sdl_img=yes) ++ AC_CHECK_HEADER(SDL/SDL_rotozoom.h,sdl_rotozoom=yes) ++ AS_IF([test x$sdl_img = xyes && test x$sdl_rotozoom = xyes], [ ++ AC_MSG_NOTICE([EPUB (with SDL images) support found]) + SDLLIBS="-lSDL_gfx -lSDL_image $SDLLIBS" + EPUBDEFS="-DBARD_EPUB_IMAGES $EPUBDEFS" +- else +- echo "EPUB (without SDL images) support found" +- fi +-else +- echo "No EPUB support found (missing libzip)" +-fi ++ ],[ ++ AC_MSG_NOTICE([EPUB (without SDL images) support found]) ++ ])],[ ++ AC_MSG_NOTICE([No EPUB support found (missing libzip)]) ++]) + ++CFLAGS="$CFLAGS $EPUBDEFS" ++LDFLAGS="$LDFLAGS $SDLLIBS" + AC_SUBST(SDLLIBS) +-AC_SUBST(EPUBLIBS) +-AC_SUBST(EPUBDEFS) + + dnl + dnl Find a font. +Index: bard-0.7-current/config/config.in +=================================================================== +--- bard-0.7-current.orig/config/config.in 2012-03-22 03:23:02.812217274 +0100 ++++ bard-0.7-current/config/config.in 2012-03-22 03:23:15.784265078 +0100 +@@ -29,8 +29,7 @@ + + EPUBLIBS = @EPUBLIBS@ + EPUBDEFS = @EPUBDEFS@ +-SDLINCLUDES = -I/usr/include/SDL ${EPUBDEFS} +-SDLLIBS = @SDLLIBS@ ${EPUBLIBS} ++SDLLIBS = @SDLLIBS@ + + DEFAULTFONT = @DEFAULTFONT@ +