Annotation of /trunk/pilot-link/patches/pilot-link-0.12.4-png.patch
Parent Directory
| 
Revision Log
Revision 847 -
(hide annotations)
(download)
Fri Jun 12 17:42:06 2009 UTC (14 years, 11 months ago) by niro
File size: 2166 byte(s)
Fri Jun 12 17:42:06 2009 UTC (14 years, 11 months ago) by niro
File size: 2166 byte(s)
-patches for pilot-link
| 1 | niro | 847 | diff -Naur pilot-link-0.12.3.orig/configure.ac pilot-link-0.12.3/configure.ac |
| 2 | --- pilot-link-0.12.3.orig/configure.ac 2007-11-09 20:36:37.000000000 +0100 | ||
| 3 | +++ pilot-link-0.12.3/configure.ac 2007-12-19 21:38:27.000000000 +0100 | ||
| 4 | @@ -225,42 +225,44 @@ | ||
| 5 | AC_ARG_WITH(libpng, | ||
| 6 | [ --with-libpng Prefix where libpng is installed]) | ||
| 7 | |||
| 8 | - case $with_libpng in | ||
| 9 | - /*) | ||
| 10 | - PNG_CFLAGS="-I$withval/include" | ||
| 11 | - PNG_LIBS="-L$withval/lib" | ||
| 12 | - ;; | ||
| 13 | - esac | ||
| 14 | + if test "x$with_libpng" != "xno"; then | ||
| 15 | |||
| 16 | - save_CFLAGS="$CFLAGS" | ||
| 17 | - save_CPPFLAGS="$CPPFLAGS" | ||
| 18 | - save_LDFLAGS="$LDFLAGS" | ||
| 19 | - CFLAGS="$CFLAGS $PNG_CFLAGS" | ||
| 20 | - CPPFLAGS="$CPPFLAGS $PNG_CFLAGS" | ||
| 21 | - LDFLAGS="$LDFLAGS $PNG_LIBS" | ||
| 22 | - | ||
| 23 | - AC_CHECK_LIB(png, main, [have_png=yes; PNG_LIBS="$PNG_LIBS -lpng"],[have_png=no],[-lm]) | ||
| 24 | - if test "$have_png" = yes; then | ||
| 25 | - AC_CHECK_HEADER(png.h, , have_png=no) | ||
| 26 | + case $with_libpng in | ||
| 27 | + /*) | ||
| 28 | + PNG_CFLAGS="-I$withval/include" | ||
| 29 | + PNG_LIBS="-L$withval/lib" | ||
| 30 | + ;; | ||
| 31 | + esac | ||
| 32 | + | ||
| 33 | + save_CFLAGS="$CFLAGS" | ||
| 34 | + save_CPPFLAGS="$CPPFLAGS" | ||
| 35 | + save_LDFLAGS="$LDFLAGS" | ||
| 36 | + CFLAGS="$CFLAGS $PNG_CFLAGS" | ||
| 37 | + CPPFLAGS="$CPPFLAGS $PNG_CFLAGS" | ||
| 38 | + LDFLAGS="$LDFLAGS $PNG_LIBS" | ||
| 39 | + | ||
| 40 | + AC_CHECK_LIB(png, main, [have_png=yes; PNG_LIBS="$PNG_LIBS -lpng"],[have_png=no],[-lm]) | ||
| 41 | if test "$have_png" = yes; then | ||
| 42 | - AC_MSG_CHECKING(for png setjmp support) | ||
| 43 | - AC_EGREP_CPP(yes, | ||
| 44 | - [#include <png.h> | ||
| 45 | - #ifdef PNG_SETJMP_SUPPORTED | ||
| 46 | - yes | ||
| 47 | - #endif], , have_png=no) | ||
| 48 | - AC_MSG_RESULT($have_png) | ||
| 49 | + AC_CHECK_HEADER(png.h, , have_png=no) | ||
| 50 | if test "$have_png" = yes; then | ||
| 51 | - AC_DEFINE(HAVE_PNG, 1, [Define if we have PNG support]) | ||
| 52 | - have_png=yes | ||
| 53 | - msg_png=yes | ||
| 54 | + AC_MSG_CHECKING(for png setjmp support) | ||
| 55 | + AC_EGREP_CPP(yes, | ||
| 56 | + [#include <png.h> | ||
| 57 | + #ifdef PNG_SETJMP_SUPPORTED | ||
| 58 | + yes | ||
| 59 | + #endif], , have_png=no) | ||
| 60 | + AC_MSG_RESULT($have_png) | ||
| 61 | + if test "$have_png" = yes; then | ||
| 62 | + AC_DEFINE(HAVE_PNG, 1, [Define if we have PNG support]) | ||
| 63 | + have_png=yes | ||
| 64 | + msg_png=yes | ||
| 65 | + fi | ||
| 66 | fi | ||
| 67 | fi | ||
| 68 | + CFLAGS="$save_CFLAGS" | ||
| 69 | + CPPFLAGS="$save_CPPFLAGS" | ||
| 70 | + LDFLAGS="$save_LDFLAGS" | ||
| 71 | fi | ||
| 72 | - | ||
| 73 | - CFLAGS="$save_CFLAGS" | ||
| 74 | - CPPFLAGS="$save_CPPFLAGS" | ||
| 75 | - LDFLAGS="$save_LDFLAGS" | ||
| 76 | else | ||
| 77 | have_png="none" | ||
| 78 | PNG_CFLAGS= |