applied_patches/0528-internal-mesa-headers-config_office.diff

   1 --- configure.in.old    2009-04-06 16:42:14.000000000 +0000
   2 +++ configure.in        2009-04-06 16:42:19.000000000 +0000
   3 @@ -512,6 +512,9 @@ AC_ARG_WITH(system-sane,
   4  AC_ARG_WITH(system-xrender,
   5  [  --with-system-xrender-headers  Use XRender headers already on system
   6  ],,)
   7 +AC_ARG_WITH(system-mesa-headers,
   8 +[  --with-system-mesa-headers     Use Mesa headers already on system
   9 +],,)
  10  AC_ARG_WITH(system-curl,
  11  [  --with-system-curl      Use curl already on system
  12  ],,)
  13 @@ -4722,6 +4725,20 @@ AC_SUBST(XRANDR_LIBS)
  14  AC_SUBST(ENABLE_RANDR)
  15
  16  dnl ===================================================================
  17 +dnl Check for system Mesa
  18 +dnl ===================================================================
  19 +AC_MSG_CHECKING([which Mesa headers to use])
  20 +if test "$with_system_mesa_headers" == "no"; then
  21 +   AC_MSG_RESULT([internal])
  22 +   SYSTEM_MESA_HEADERS=NO
  23 +   BUILD_TYPE="$BUILD_TYPE MESA"
  24 +else
  25 +   AC_MSG_RESULT([external])
  26 +   SYSTEM_MESA_HEADERS=YES
  27 +fi
  28 +AC_SUBST(SYSTEM_MESA_HEADERS)
  29 +
  30 +dnl ===================================================================
  31  dnl Check for building neon
  32  dnl ===================================================================
  33  AC_MSG_CHECKING([whether to use neon])
  34 --- set_soenv.in.old    2009-04-06 16:42:14.000000000 +0000
  35 +++ set_soenv.in        2009-04-06 16:42:19.000000000 +0000
  36 @@ -2009,6 +2009,7 @@ ToFile( "LIBXSLT_CFLAGS",    "@LIBXSLT_C
  37  ToFile( "LIBXSLT_LIBS",      "@LIBXSLT_LIBS@",     "e" );
  38  ToFile( "SYSTEM_SANE_HEADER","@SYSTEM_SANE_HEADER@","e" );
  39  ToFile( "SYSTEM_XRENDER_HEADERS","@SYSTEM_XRENDER_HEADERS@","e" );
  40 +ToFile( "SYSTEM_MESA_HEADERS","@SYSTEM_MESA_HEADERS@","e" );
  41  ToFile( "SYSTEM_CURL",       "@SYSTEM_CURL@",      "e" );
  42  ToFile( "CURL_CFLAGS",       "@CURL_CFLAGS@",      "e" );
  43  ToFile( "CURL_LIBS",         "@CURL_LIBS@",        "e" );