From 11a1befdf78f9ab06d2cf2689a21fe072cf9024f Mon Sep 17 00:00:00 2001
From: Marcus Comstedt <marcus@mc.pp.se>
Date: Fri, 16 Jul 1999 22:02:27 +0200
Subject: [PATCH] Updated to 0.7, and Mesa support added.
Rev: src/post_modules/GL/Makefile.in:1.2
Rev: src/post_modules/GL/acconfig.h:1.1
Rev: src/post_modules/GL/auto.c.in:1.5
Rev: src/post_modules/GL/configure.in:1.2
Rev: src/post_modules/GL/top.c:1.3
---
.gitattributes | 1 +
src/post_modules/GL/Makefile.in | 3 ++-
src/post_modules/GL/acconfig.h | 1 +
src/post_modules/GL/auto.c.in | 6 ++++--
src/post_modules/GL/configure.in | 8 ++++++--
src/post_modules/GL/top.c | 6 ++++--
6 files changed, 18 insertions(+), 7 deletions(-)
create mode 100644 src/post_modules/GL/acconfig.h
diff --git a/.gitattributes b/.gitattributes
index d959e0ea08..b65cc0ad86 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -8,6 +8,7 @@
# Remove the corresponding line before committing
# changes to these files.
/src/post_modules/GL/Makefile.in foreign_ident
+/src/post_modules/GL/acconfig.h foreign_ident
/src/post_modules/GL/auto.c.in foreign_ident
/src/post_modules/GL/configure.in foreign_ident
/src/post_modules/GL/top.c foreign_ident
diff --git a/src/post_modules/GL/Makefile.in b/src/post_modules/GL/Makefile.in
index fce3e3a76e..f4e1f7a185 100644
--- a/src/post_modules/GL/Makefile.in
+++ b/src/post_modules/GL/Makefile.in
@@ -1,9 +1,10 @@
-# $Id: Makefile.in,v 1.1 1998/11/02 23:54:33 marcus Exp $
+# $Id: Makefile.in,v 1.2 1999/07/16 20:01:12 marcus Exp $
SRCDIR=@srcdir@
VPATH=@srcdir@:@srcdir@/../..:../..
OBJS=top.o auto.o
MODULE_LDFLAGS=@LDFLAGS@ @X_LIBS@ @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@ @LIBS@
MODULE_CFLAGS=@X_CFLAGS@
+CONFIG_HEADERS=@CONFIG_HEADERS@
@dynamic_module_makefile@
diff --git a/src/post_modules/GL/acconfig.h b/src/post_modules/GL/acconfig.h
new file mode 100644
index 0000000000..4003b95ef6
--- /dev/null
+++ b/src/post_modules/GL/acconfig.h
@@ -0,0 +1 @@
+/* $Id: acconfig.h,v 1.1 1999/07/16 20:01:12 marcus Exp $ */
diff --git a/src/post_modules/GL/auto.c.in b/src/post_modules/GL/auto.c.in
index 2e48e756b4..7061db0356 100644
--- a/src/post_modules/GL/auto.c.in
+++ b/src/post_modules/GL/auto.c.in
@@ -1,11 +1,13 @@
/*
- * $Id: auto.c.in,v 1.4 1998/11/03 01:08:18 marcus Exp $
+ * $Id: auto.c.in,v 1.5 1999/07/16 20:01:26 marcus Exp $
*
*/
#include "global.h"
-RCSID("$Id: auto.c.in,v 1.4 1998/11/03 01:08:18 marcus Exp $");
+#include "config.h"
+
+RCSID("$Id: auto.c.in,v 1.5 1999/07/16 20:01:26 marcus Exp $");
#include "stralloc.h"
#include "pike_macros.h"
#include "object.h"
diff --git a/src/post_modules/GL/configure.in b/src/post_modules/GL/configure.in
index 28b3e33b8f..df0712002f 100755
--- a/src/post_modules/GL/configure.in
+++ b/src/post_modules/GL/configure.in
@@ -1,11 +1,15 @@
-# $Id: configure.in,v 1.1 1998/11/02 23:54:36 marcus Exp $
+# $Id: configure.in,v 1.2 1999/07/16 20:01:12 marcus Exp $
AC_INIT(top.c)
+AC_CONFIG_HEADER(config.h)
AC_MODULE_INIT()
AC_PATH_XTRA()
-AC_CHECK_LIB(GL, glOrtho,,,[$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS])
+AC_CHECK_LIB(GL, glOrtho,,,[$X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS])
+if test x"$ac_cv_lib_GL_glOrtho" != yes; then
+ AC_CHECK_LIB(MesaGL, glOrtho,,,[$X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS])
+fi
AC_CHECK_FUNC(glXChooseVisual)
AC_OUTPUT(Makefile,echo FOO >stamp-h )
diff --git a/src/post_modules/GL/top.c b/src/post_modules/GL/top.c
index b20c4088e4..4ad4bf47e5 100644
--- a/src/post_modules/GL/top.c
+++ b/src/post_modules/GL/top.c
@@ -1,5 +1,5 @@
/*
- * $Id: top.c,v 1.2 1998/11/03 18:08:17 marcus Exp $
+ * $Id: top.c,v 1.3 1999/07/16 20:02:27 marcus Exp $
*
*/
@@ -10,7 +10,9 @@
#include "global.h"
-RCSID("$Id: top.c,v 1.2 1998/11/03 18:08:17 marcus Exp $");
+#include "config.h"
+
+RCSID("$Id: top.c,v 1.3 1999/07/16 20:02:27 marcus Exp $");
#include "stralloc.h"
#include "pike_macros.h"
#include "object.h"
--
GitLab