- merged from HEAD

Changed files:
    liboil-opt.patch -> 1.1.2.1

diff --git a/liboil-opt.patch b/liboil-opt.patch
index 2bf077a91eb7bc391eea7d97656db0c7938dd4a4..9c5f4cc064cfb4a0e4a030d68241f2de49527f41 100644 (file)
--- a/liboil-opt.patch
+++ b/liboil-opt.patch
@@ -1,29 +1,19 @@
---- liboil-0.3.1/configure.ac.orig     2005-03-17 19:44:51.000000000 +0100
-+++ liboil-0.3.1/configure.ac  2005-03-21 20:53:43.000000000 +0100
-@@ -147,6 +147,7 @@
- AC_CHECK_HEADER(ieee754.h,
-   AC_DEFINE(HAVE_IEEE754_H, 1, [Define if ieee754.h exists]))
+--- liboil-0.3.3/configure.ac.orig     2005-09-30 01:51:05.000000000 +0200
++++ liboil-0.3.3/configure.ac  2005-10-06 07:25:22.884978056 +0200
+@@ -128,6 +128,7 @@
+ LIBM="-lm"
+ AC_SUBST(LIBM)
  
 +LIBOIL_CFLAGS="$CFLAGS"
  AS_COMPILER_FLAG(-Wall, LIBOIL_CFLAGS="$LIBOIL_CFLAGS -Wall")
  if test "x$LIBOIL_CVS" = "xyes"
  then
-@@ -163,7 +164,7 @@
-     true)
- fi
+@@ -158,7 +159,7 @@
+ AC_SUBST(SSE3_CFLAGS)
+ AC_SUBST(_3DNOW_CFLAGS)
  
--LIBOIL_CFLAGS="$LIBOIL_CFLAGS -D_GNU_SOURCE -D_POSIX_C_SOURCE=200112L -I\$(top_srcdir) -O2"
-+LIBOIL_CFLAGS="$LIBOIL_CFLAGS -D_GNU_SOURCE -D_POSIX_C_SOURCE=200112L -I\$(top_srcdir)"
+-LIBOIL_CFLAGS="$LIBOIL_CFLAGS -D_BSD_SOURCE -D_GNU_SOURCE -I\$(top_srcdir) -O2"
++LIBOIL_CFLAGS="$LIBOIL_CFLAGS -D_BSD_SOURCE -D_GNU_SOURCE -I\$(top_srcdir)"
  AC_SUBST(LIBOIL_CFLAGS)
  
  LIBOIL_LIBS="\$(top_builddir)/liboil/liboil-$LIBOIL_MAJORMINOR.la"
-@@ -172,9 +173,6 @@
- pkgconfigdir="\$(libdir)/pkgconfig"
- AC_SUBST(pkgconfigdir)
- 
--#CFLAGS=`echo "$CFLAGS" | sed -e 's/-O[0-9*]//g'`
--CFLAGS="-g"
--
- AC_CONFIG_FILES([
- Makefile 
- doc/Makefile