OpenWrt packages
Sign in or create your account | Project List | Help
OpenWrt packages Git Source Tree
Root/
| 1 | Index: bard-0.7-current/configure.in |
| 2 | =================================================================== |
| 3 | --- bard-0.7-current.orig/configure.in 2012-03-22 03:13:47.186201055 +0100 |
| 4 | +++ bard-0.7-current/configure.in 2012-03-22 03:25:50.896839172 +0100 |
| 5 | @@ -456,28 +456,28 @@ |
| 6 | SDLLIBS="-lSDL" |
| 7 | |
| 8 | dnl Fix this .... |
| 9 | -if ! test -f /usr/include/SDL/SDL_ttf.h; then |
| 10 | - AC_MSG_ERROR("Cannot locate /usr/include/SDL/SDL_ttf.h.") |
| 11 | -fi |
| 12 | +AC_CHECK_HEADER(SDL/SDL_ttf.h,,[AC_MSG_ERROR([Cannot locate SDL/SDL_ttf.h])]) |
| 13 | SDLLIBS="-lSDL_ttf $SDLLIBS" |
| 14 | |
| 15 | dnl AC_CHECK_HEADER(SDL/SDL_ttf.h,,[AC_MSG_ERROR([Cannot locate SDL/SDL_ttf.h])]) |
| 16 | -if ! test "x$EPUBDEFS" = x; then |
| 17 | - if test -f /usr/include/SDL/SDL_image.h -a -f /usr/include/SDL/SDL_rotozoom.h |
| 18 | - then |
| 19 | - echo "EPUB (with SDL images) support found" |
| 20 | +AS_IF([test "x$EPUBDEFS" = x],[ |
| 21 | + sdl_img=no |
| 22 | + sdl_rotozoom=no |
| 23 | + AC_CHECK_HEADER(SDL/SDL_image.h,sdl_img=yes) |
| 24 | + AC_CHECK_HEADER(SDL/SDL_rotozoom.h,sdl_rotozoom=yes) |
| 25 | + AS_IF([test x$sdl_img = xyes && test x$sdl_rotozoom = xyes], [ |
| 26 | + AC_MSG_NOTICE([EPUB (with SDL images) support found]) |
| 27 | SDLLIBS="-lSDL_gfx -lSDL_image $SDLLIBS" |
| 28 | EPUBDEFS="-DBARD_EPUB_IMAGES $EPUBDEFS" |
| 29 | - else |
| 30 | - echo "EPUB (without SDL images) support found" |
| 31 | - fi |
| 32 | -else |
| 33 | - echo "No EPUB support found (missing libzip)" |
| 34 | -fi |
| 35 | + ],[ |
| 36 | + AC_MSG_NOTICE([EPUB (without SDL images) support found]) |
| 37 | + ])],[ |
| 38 | + AC_MSG_NOTICE([No EPUB support found (missing libzip)]) |
| 39 | +]) |
| 40 | |
| 41 | +CFLAGS="$CFLAGS $EPUBDEFS" |
| 42 | +LDFLAGS="$LDFLAGS $SDLLIBS" |
| 43 | AC_SUBST(SDLLIBS) |
| 44 | -AC_SUBST(EPUBLIBS) |
| 45 | -AC_SUBST(EPUBDEFS) |
| 46 | |
| 47 | dnl |
| 48 | dnl Find a font. |
| 49 | Index: bard-0.7-current/config/config.in |
| 50 | =================================================================== |
| 51 | --- bard-0.7-current.orig/config/config.in 2012-03-22 03:23:02.812217274 +0100 |
| 52 | +++ bard-0.7-current/config/config.in 2012-03-22 03:23:15.784265078 +0100 |
| 53 | @@ -29,8 +29,7 @@ |
| 54 | |
| 55 | EPUBLIBS = @EPUBLIBS@ |
| 56 | EPUBDEFS = @EPUBDEFS@ |
| 57 | -SDLINCLUDES = -I/usr/include/SDL ${EPUBDEFS} |
| 58 | -SDLLIBS = @SDLLIBS@ ${EPUBLIBS} |
| 59 | +SDLLIBS = @SDLLIBS@ |
| 60 | |
| 61 | DEFAULTFONT = @DEFAULTFONT@ |
| 62 | |
| 63 |
