[Libreoffice-commits] core.git: config_host/config_features.h.in configure.ac

[Michael Stahl]

 config_host/config_features.h.in |    6 +++---
 configure.ac                     |    2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit fb8d3a65c52de029135297b1aae2eb5c5bae8ffe
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Mar 29 21:35:58 2016 +0200

    configure: put back lines erroneously deleted by 96c1ae1
    
    Change-Id: I495d7508cab853717952735a2a0365a915165e51

diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in
index 0aa1d67..0a38979 100644
--- a/config_host/config_features.h.in
+++ b/config_host/config_features.h.in
@@ -152,13 +152,13 @@
 #define HAVE_FEATURE_BREAKPAD 0
 
 /*
- *  * Whether to enable ATL
- *   */
+ * Whether to enable ATL
+ */
 #define HAVE_FEATURE_ATL 0
 
 /*
  *  Whether OpenGL is enabled
- *   */
+ */
 #define HAVE_FEATURE_OPENGL 0
 
 /*
diff --git a/configure.ac b/configure.ac
index 7a2ec3b..c1657a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3760,6 +3760,7 @@ if test "$_os" = "WINNT" -a "$WITH_MINGW" != yes; then
     AC_MSG_CHECKING([whether to use ATL])
     if test "$enable_atl" = "yes" -o "$enable_atl" = "" -a "$vcexpress" != Express; then
         DISABLE_ATL=""
+        AC_DEFINE(HAVE_FEATURE_ATL, 1)
         AC_MSG_RESULT([yes])
     else
         DISABLE_ATL="TRUE"
@@ -10436,6 +10437,7 @@ elif test $_os = WINNT; then
     ENABLE_OPENGL_CANVAS=TRUE
 else
     if test "$USING_X11" = TRUE; then
+        AC_CHECK_LIB(GL, glBegin, [:], AC_MSG_ERROR([libGL required.]))
         ENABLE_OPENGL=TRUE
         AC_DEFINE(HAVE_FEATURE_OPENGL,1)
         ENABLE_OPENGL_CANVAS=TRUE