DirectFB-extra-acfix.patch

   1 --- DirectFB-extra-0.9.16/configure.in.orig     Mon Jan 13 16:19:59 2003
   2 +++ DirectFB-extra-0.9.16/configure.in  Fri Jan 17 22:08:03 2003
   3 @@ -101,7 +101,7 @@
   4  DFB_CFLAGS="$DFB_CFLAGS $DFB_INTERNAL_CFLAGS -DREENTRANT"
   5
   6  if test "x$GCC" = xyes; then
   7 -  DFB_CFLAGS="$DFB_CFLAGS -O3 -fexpensive-optimizations -ffast-math -Wall"
   8 +  DFB_CFLAGS="$DFB_CFLAGS -ffast-math -Wall"
   9  fi
  10
  11
  12 @@ -113,8 +113,6 @@
  13  if test "x$enable_debug" = xyes; then
  14      AC_DEFINE(DFB_DEBUG, 1, [Define to 1 to enable debugging support.])
  15      DFB_CFLAGS="$DFB_CFLAGS -g3"
  16 -else
  17 -    DFB_CFLAGS="$DFB_CFLAGS -g0"
  18  fi
  19  AM_CONDITIONAL(ENABLE_DEBUG, test "x$enable_debug" = xyes)
  20
  21 @@ -123,6 +121,8 @@
  22  # Imlib2 check
  23  #
  24
  25 +AC_ARG_ENABLE(imlib2, [  --disable-imlib2     disable imlib2 plugin [default=yes]],, enable_imlib2=yes)
  26 +if test "x$enable_imlib2" = xyes ; then
  27  AC_PATH_PROG(IMLIB2_CONFIG, imlib2-config, no)
  28  if test "x$IMLIB2_CONFIG" = xno; then
  29    AC_MSG_WARN([*** Imlib2 library not found, building without Imlib2 support ***])
  30 @@ -135,13 +135,17 @@
  31
  32  AC_SUBST(IMLIB2_LIBS)
  33  AC_SUBST(IMLIB2_INCLUDES)
  34 -
  35 +else
  36 +       imlib2=no
  37 +fi
  38  AM_CONDITIONAL(IMLIB2, test "x$imlib2" = xyes)
  39
  40
  41  #
  42  # OpenQuicktime check
  43  #
  44 +AC_ARG_ENABLE(openquicktime, [  --disable-openquicktime     disable openquicktime plugin [default=yes]],, enable_openquicktime=yes)
  45 +if test "x$enable_openquicktime" = xyes ; then
  46  AC_CHECK_LIB(openquicktime, quicktime_open, openquicktime="yes", openquicktime="no")
  47  if test "x$openquicktime" = xyes; then
  48    OPENQUICKTIME_LIBS="-lopenquicktime"
  49 @@ -155,7 +159,9 @@
  50  fi
  51
  52  AC_SUBST(OPENQUICKTIME_LIBS)
  53 -
  54 +else
  55 +       openquicktime=no
  56 +fi
  57  AM_CONDITIONAL(OPENQUICKTIME, test "x$openquicktime" = xyes)
  58
  59
  60 @@ -223,7 +229,10 @@
  61  # Honor aclocal flags
  62  ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
  63
  64 -
  65 +if test "x$cflags_set" != "xset" ; then
  66 +       DFB_CFLAGS="$DFB_CFLAGS $CFLAGS"
  67 +fi
  68 +
  69  AC_SUBST(DFB_CFLAGS)
  70  AC_SUBST(DFB_LIBS)
  71  AC_SUBST(DATADIR)
  72 --- DirectFB-extra-0.9.16/interfaces/IDirectFBImageProvider/Makefile.am.orig    Mon Oct 28 16:54:28 2002
  73 +++ DirectFB-extra-0.9.16/interfaces/IDirectFBImageProvider/Makefile.am Fri Jan 17 22:08:45 2003
  74 @@ -3,7 +3,7 @@
  75  idirectfbimageproviderdir = $(MODULEDIR)/interfaces/IDirectFBImageProvider
  76
  77
  78 -AM_CFLAGS = $(DFB_CFLAGS) -DDATADIR=\"@DATADIR@\"
  79 +AM_CFLAGS = $(DFB_CFLAGS) -DDATADIR=\"@DATADIR@\" $(IMLIB2_INCLUDES)
  80
  81  if IMLIB2
  82  IMLIB2_PROVIDER = libidirectfbimageprovider_imlib2.la