[ooo-build-commit] .: configure.in set_soenv.in

[Fridrich Strba]

 configure.in |   17 +++++++++++++++++
 set_soenv.in |    1 +
 2 files changed, 18 insertions(+)

New commits:
commit 268c9dd532cc163349b416e54ff3ef9b213b20d6
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Sep 14 11:44:27 2010 +0200

    internal-mesa-headers-config_office.diff: make configure aware of Mesa.

diff --git a/configure.in b/configure.in
index 29d808d..f0e170e 100644
--- a/configure.in
+++ b/configure.in
@@ -515,6 +515,9 @@ AC_ARG_WITH(system-sane,
 AC_ARG_WITH(system-xrender,
 [  --with-system-xrender-headers  Use XRender headers already on system
 ],,)
+AC_ARG_WITH(system-mesa-headers,
+[  --with-system-mesa-headers     Use Mesa headers already on system
+],,)
 AC_ARG_WITH(system-curl,
 [  --with-system-curl      Use curl already on system
 ],,)
@@ -5016,6 +5019,20 @@ AC_SUBST(XRANDR_LIBS)
 AC_SUBST(ENABLE_RANDR)
 
 dnl ===================================================================
+dnl Check for system Mesa
+dnl ===================================================================
+AC_MSG_CHECKING([which Mesa headers to use])
+if test "$with_system_mesa_headers" == "no"; then
+   AC_MSG_RESULT([internal])
+   SYSTEM_MESA_HEADERS=NO
+   BUILD_TYPE="$BUILD_TYPE MESA"
+else
+   AC_MSG_RESULT([external])
+   SYSTEM_MESA_HEADERS=YES
+fi
+AC_SUBST(SYSTEM_MESA_HEADERS)
+
+dnl ===================================================================
 dnl Check for building neon
 dnl ===================================================================
 AC_MSG_CHECKING([whether to use neon])
diff --git a/set_soenv.in b/set_soenv.in
index 977f93e..dea0948 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1899,6 +1899,7 @@ ToFile( "LIBXSLT_CFLAGS",    "@LIBXSLT_CFLAGS@",   "e" );
 ToFile( "LIBXSLT_LIBS",      "@LIBXSLT_LIBS@",     "e" );
 ToFile( "SYSTEM_SANE_HEADER","@SYSTEM_SANE_HEADER@","e" );
 ToFile( "SYSTEM_XRENDER_HEADERS","@SYSTEM_XRENDER_HEADERS@","e" );
+ToFile( "SYSTEM_MESA_HEADERS","@SYSTEM_MESA_HEADERS@","e" );
 ToFile( "SYSTEM_CURL",       "@SYSTEM_CURL@",      "e" );
 ToFile( "CURL_CFLAGS",       "@CURL_CFLAGS@",      "e" );
 ToFile( "CURL_LIBS",         "@CURL_LIBS@",        "e" );