SOURCES: gle-amfix.patch - link libgle with libGL and libGLU, rely...

[qboosh]

Author: qboosh                       Date: Tue Jul 18 10:01:18 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- link libgle with libGL and libGLU, rely on glut linked properly

---- Files affected:
SOURCES:
   gle-amfix.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/gle-amfix.patch
diff -u SOURCES/gle-amfix.patch:1.1 SOURCES/gle-amfix.patch:1.2
--- SOURCES/gle-amfix.patch:1.1	Sun Mar 23 16:05:47 2003
+++ SOURCES/gle-amfix.patch	Tue Jul 18 12:01:12 2006
@@ -45,14 +45,44 @@
  
  docdir = $(datadir)/doc/gle/examples
  
---- gle-3.1.0.orig/configure.in	Tue Mar 18 05:22:16 2003
-+++ gle-3.1.0/configure.in	Sun Mar 23 15:29:22 2003
-@@ -134,7 +134,7 @@
+--- gle-3.1.0/configure.in.orig	2003-03-18 05:22:16.000000000 +0100
++++ gle-3.1.0/configure.in	2006-07-18 11:48:16.874440000 +0200
+@@ -109,19 +109,6 @@
+         AC_MSG_ERROR([Cannot find required GLU library]),
+         $X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS)
+ 
+-# ----------------------------------------------------------
+-# Newest versions of glut require Xmu, which doesn't show up 
+-# by default in X_LIBS
+-AC_CHECK_LIB(Xmu, XmuLookupStandardColormap,
+-        X_LIBS="-lXmu $X_LIBS",
+-        AC_MSG_ERROR([Cannot find required Xmu library]),
+-        $X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS)
+-
+-AC_CHECK_LIB(Xi, XListInputDevices,
+-        X_LIBS="-lXi -lXext $X_LIBS",
+-        AC_MSG_ERROR([Cannot find required Xi (X11 Input Extension) library]),
+-        $X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS)
+-
+ # latest versions of glut also use Xi the XInput extension
+ AC_CHECK_LIB(glut, glutSwapBuffers,
+         X_LIBS="-lglut $X_LIBS",
+@@ -134,8 +121,6 @@
  #       cc @X_LIBS@ (-lfoo...) @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@
  # (Perhaps X_LIBS should have been called X_LDFLAGS.)
  
 -X_LIBS="-lgle $X_LIBS -lXt -lX11"
-+X_LIBS="$X_LIBS -lXt -lX11"
- 
+-
  AC_OUTPUT(
            Makefile
+           src/Makefile
+--- gle-3.1.0/src/Makefile.am.orig	2003-03-18 05:09:44.000000000 +0100
++++ gle-3.1.0/src/Makefile.am	2006-07-18 11:48:39.024440000 +0200
+@@ -22,6 +22,7 @@
+ 
+ 
+ libgle_la_LDFLAGS = -version-info 4:0:1
++libgle_la_LIBADD = -lGL -lGLU
+ 
+ # make sure we install gle.h into /usr/include/GL/gle.h or thereabouts
+ pkgincludedir = $(includedir)/GL
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/gle-amfix.patch?r1=1.1&r2=1.2&f=u