projects / packages / DevIL.git / blame
| Commit | Line | Data |
|---|---|---|
| 9111ccdf JB |
1 | --- DevIL-1.7.2/configure.ac.orig 2008-09-05 03:19:19.000000000 +0200 |
| 2 | +++ DevIL-1.7.2/configure.ac 2008-10-22 18:13:22.182086647 +0200 | |
| 3 | @@ -191,27 +191,6 @@ | |
| 4 | dnl Special code for libjpeg\r | |
| 5 | AC_DEFINE(IL_USE_JPEGLIB_UNMODIFIED,,[Use libjpeg without modification. always enabled.])\r | |
| 6 | \r | |
| 7 | -dnl\r | |
| 8 | -dnl Setup Libraries\r | |
| 9 | -dnl\r | |
| 10 | -AC_DEFUN([SET_LIB],[\r | |
| 11 | -LIB$2=""\r | |
| 12 | -AC_ARG_WITH($1,AC_HELP_STRING([--with-$1=path],[Specify the lib$1 installation path]),\r | |
| 13 | - ADD_CFLAGS([-I$enable_$1dir/include])\r | |
| 14 | - LIB$2="-L$enable_$1dir/lib"\r | |
| 15 | - no_$1=no\r | |
| 16 | - use_$1=yes )\r | |
| 17 | -AS_IF([test ! "$no_$1" = "yes" && test "$use_$1" = "yes" && test -z "$3"],[LIB$2="$LIB$2 -l$1"]\r | |
| 18 | - ,[test ! "$no_$1" = "yes" && test "$use_$1" = "yes" && ! test -z "$3"],[LIB$2="$3"],[])\r | |
| 19 | -AC_SUBST(LIB$2) ])\r | |
| 20 | -\r | |
| 21 | -SET_LIB(jpeg,JPG)\r | |
| 22 | -SET_LIB(tiff,TIFF)\r | |
| 23 | -SET_LIB(lcms,LCMS)\r | |
| 24 | -SET_LIB(mng,MNG)\r | |
| 25 | -SET_LIB(jp2,JP2)\r | |
| 26 | -SET_LIB(z,Z)\r | |
| 27 | -\r | |
| 28 | dnl libpng configuration\r | |
| 29 | AC_MSG_CHECKING(libpng)\r | |
| 30 | LIBPNG_INCLUDE=""\r | |
| 31 | @@ -278,6 +257,27 @@ | |
| 32 | AC_SUBST(LIBPNG_INCLUDE)\r | |
| 33 | \r | |
| 34 | dnl\r | |
| 35 | +dnl Setup Libraries\r | |
| 36 | +dnl\r | |
| 37 | +AC_DEFUN([SET_LIB],[\r | |
| 38 | +LIB$2=""\r | |
| 39 | +AC_ARG_WITH($1,AC_HELP_STRING([--with-$1=path],[Specify the lib$1 installation path]),\r | |
| 40 | + ADD_CFLAGS([-I$enable_$1dir/include])\r | |
| 41 | + LIB$2="-L$enable_$1dir/lib"\r | |
| 42 | + no_$1=no\r | |
| 43 | + use_$1=yes )\r | |
| 44 | +AS_IF([test ! "$no_$1" = "yes" && test "$use_$1" = "yes" && test -z "$3"],[LIB$2="$LIB$2 -l$1"]\r | |
| 45 | + ,[test ! "$no_$1" = "yes" && test "$use_$1" = "yes" && ! test -z "$3"],[LIB$2="$3"],[])\r | |
| 46 | +AC_SUBST(LIB$2) ])\r | |
| 47 | +\r | |
| 48 | +SET_LIB(jpeg,JPG)\r | |
| 49 | +SET_LIB(tiff,TIFF)\r | |
| 50 | +SET_LIB(lcms,LCMS)\r | |
| 51 | +SET_LIB(mng,MNG)\r | |
| 52 | +SET_LIB(jp2,JP2,[-ljasper])\r | |
| 53 | +SET_LIB(z,Z)\r | |
| 54 | +\r | |
| 55 | +dnl\r | |
| 56 | dnl ILUT APIs checking\r | |
| 57 | dnl\r | |
| 58 | AC_DEFUN([TEST_API],[\r | |
| 59 | --- DevIL-1.7.2/src-IL/src/Makefile.am.orig 2008-08-24 19:32:38.000000000 +0200 | |
| 60 | +++ DevIL-1.7.2/src-IL/src/Makefile.am 2008-10-22 18:22:57.715154030 +0200 | |
| 61 | @@ -15,6 +15,6 @@ | |
| 62 | \r | |
| 63 | AM_CFLAGS = @LIBIL_CFLAGS@\r | |
| 64 | libIL_la_LDFLAGS = @WIN32_EXTRA_LDFLAGS@ @VERSIONINFO@\r | |
| 65 | -libIL_la_LIBADD = @LIBPNG@ @LIBJPG@ @LIBTIFF@ @LIBMNG@ @LIBLCMS@ @LIBZ@\r | |
| 66 | +libIL_la_LIBADD = @LIBPNG@ @LIBJPG@ @LIBTIFF@ @LIBMNG@ @LIBLCMS@ @LIBZ@ @LIBJP2@\r | |
| 67 | \r | |
| 68 | INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src-IL/include -I$(top_builddir)/include @LIBPNG_INCLUDE@\r |