3 files changed, 49 insertions, 13 deletions
diff --git a/src/mesa/main/tests/Makefile.am b/src/mesa/main/tests/Makefile.am
index 74e02a8ccca..3d1a5d8923f 100644
--- a/src/mesa/main/tests/Makefile.am
+++ b/src/mesa/main/tests/Makefile.am
@@ -3,7 +3,7 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/src/mapi \
 	-I$(top_builddir)/src/mesa \
 	-I$(top_builddir)/include \
-	$(X11_CFLAGS)
+	$(API_DEFINES) $(DEFINES) $(INCLUDE_DIRS)
 
 TESTS = main-test
 check_PROGRAMS = main-test
@@ -14,4 +14,14 @@ main_test_SOURCES =			\
 main_test_LDADD = \
 	$(top_builddir)/src/mesa/libmesa.la \
 	$(top_builddir)/src/gtest/libgtest.la \
-	-lpthread
+	-lpthread -ldl
+
+if HAVE_SHARED_GLAPI
+AM_CPPFLAGS += -DHAVE_SHARED_GLAPI
+
+main_test_LDADD += \
+	$(top_builddir)/src/mapi/shared-glapi/libglapi.la
+else
+main_test_SOURCES +=			\
+	stubs.cpp
+endif
diff --git a/src/mesa/main/tests/enum_strings.cpp b/src/mesa/main/tests/enum_strings.cpp
index 7d46080a608..b9def32bdb7 100644
--- a/src/mesa/main/tests/enum_strings.cpp
+++ b/src/mesa/main/tests/enum_strings.cpp
@@ -28,17 +28,6 @@ extern "C" {
 #include "main/enums.h"
 }
 
-/* Stub this out because the real Mesa implementation is tied into a
- * bunch of the GL_ARB_debug infrastructure.  This results in pulling
- * in most of libmesa.a and a cacade of missing symbols, etc.
- */
-extern "C" void
-_mesa_warning( struct gl_context *ctx, const char *fmtString, ... )
-{
-   (void) ctx;
-   (void) fmtString;
-}
-
 struct enum_info {
    int value;
    const char *name;
diff --git a/src/mesa/main/tests/stubs.cpp b/src/mesa/main/tests/stubs.cpp
new file mode 100644
index 00000000000..c24df53a561
--- /dev/null
+++ b/src/mesa/main/tests/stubs.cpp
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2012 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+#include <GL/gl.h>
+#include "main/errors.h"
+
+extern "C" {
+/* Stub this out because the real Mesa implementation is tied into a
+ * bunch of the GL_ARB_debug infrastructure.  This results in pulling
+ * in most of libmesa.a and a cacade of missing symbols, etc.
+ */
+void
+_mesa_warning( struct gl_context *ctx, const char *fmtString, ... )
+{
+   (void) ctx;
+   (void) fmtString;
+}
+}