- rediffed patches, added jasper3 patch to adjust to jasper 3.0.x API; release 2

[packages/DevIL.git] / DevIL-gnu-inline.patch

diff --git a/DevIL-gnu-inline.patch b/DevIL-gnu-inline.patch
index 72ea08794b125ba274e65c7eec30b5f9990fedd1..2b578f897b825216dceae63de75cba205260136b 100644 (file)
--- a/DevIL-gnu-inline.patch
+++ b/DevIL-gnu-inline.patch
@@ -1,27 +1,20 @@
---- DevIL-1.7.2/configure.ac.orig      2008-10-22 22:30:53.081626650 +0200
-+++ DevIL-1.7.2/configure.ac   2008-10-22 22:44:29.328824639 +0200
-@@ -75,11 +75,23 @@
-       [AC_DEFINE(RESTRICT_KEYWORD,,restric keyword available)]\r
-       [AC_MSG_RESULT(yes)]\r
-       [CFLAGS="$TMP_CFLAGS"]\r
--      [ADD_CFLAGS(-std=gnu99 -fgnu89-inline)]\r
-+      [ADD_CFLAGS(-std=gnu99)]\r
-       ,[AC_MSG_RESULT(no)]\r
-        [CFLAGS="$TMP_CFLAGS"])\r
- ])\r
- \r
-+dnl checking if the -fgnu89-inline flag is available\r
-+TMP_CFLAGS="$CFLAGS"\r
-+CFLAGS="$CFLAGS -fgnu89-inline"\r
-+AC_MSG_CHECKING([gnu89-inline option])\r
-+AC_COMPILE_IFELSE([[void main(void){}]],\r
-+      [AC_MSG_RESULT(yes)]\r
-+      [CFLAGS="$TMP_CFLAGS"]\r
-+      [ADD_CFLAGS(-fgnu89-inline)]\r
-+      ,[AC_MSG_RESULT(no)]\r
-+       [CFLAGS="$TMP_CFLAGS"])\r
-+\r
-+\r
- dnl must add AC_CACHE_CHECK support where possible\r
- \r
- AM_INIT_AUTOMAKE("DevIL", $DEVIL_MAJOR.$DEVIL_MINOR.$DEVIL_REVISION)\r
+--- DevIL-1.7.8/devil-1.7.8/configure.ac~      2009-03-08 21:43:03.000000000 +0100
++++ DevIL-1.7.8/devil-1.7.8/configure.ac       2010-04-21 15:40:09.671716250 +0200
+@@ -154,6 +154,17 @@
+ AS_IF([test  "x$restrict_keyword" = "xfound"],
+       [DEVIL_CHECK_RESTRICT_GNU99])
+ 
++dnl checking if the -fgnu89-inline flag is available
++TMP_CFLAGS="$CFLAGS"
++CFLAGS="$CFLAGS -fgnu89-inline"
++AC_MSG_CHECKING([gnu89-inline option])
++AC_COMPILE_IFELSE([[void main(void){}]],
++      [AC_MSG_RESULT(yes)]
++      [CFLAGS="$TMP_CFLAGS"]
++      [ADD_CFLAGS(-fgnu89-inline)]
++      ,[AC_MSG_RESULT(no)]
++      [CFLAGS="$TMP_CFLAGS"])
++
+ dnl must add AC_CACHE_CHECK support where possible
+ 
+ dnl AM_MAINTAINER_MODE