SOURCES: nurbs++-link.patch - drop /usr/X11R6 paths and explicit l...

[qboosh]

Author: qboosh                       Date: Sat Apr 15 18:20:00 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- drop /usr/X11R6 paths and explicit linking with libraries not used directly (or at all)

---- Files affected:
SOURCES:
   nurbs++-link.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SOURCES/nurbs++-link.patch
diff -u SOURCES/nurbs++-link.patch:1.4 SOURCES/nurbs++-link.patch:1.5
--- SOURCES/nurbs++-link.patch:1.4	Tue Feb 18 00:28:10 2003
+++ SOURCES/nurbs++-link.patch	Sat Apr 15 20:19:55 2006
@@ -6,7 +6,7 @@
              GL_LFLAGS="-L${ac_cv_with_gl_lib}"
          fi
 -	GL_LIBS="-lGLU -lGL $X_PRE_LIBS -lXext -lm"
-+	GL_LIBS="-L/usr/X11R6/lib -lGLU -lGL $X_PRE_LIBS -lXext -lm"
++	GL_LIBS="-lGLU -lGL"
          AC_SUBST(GL_LIBS)
  	AC_SUBST(GL_LFLAGS)
      ],
@@ -15,7 +15,7 @@
              GL_LFLAGS="-L${ac_cv_with_gl_lib}"
          fi
 -	GL_LIBS="-lMesaGLU -lMesaGL -lXext -lm"
-+	GL_LIBS="-L/usr/X11R6/lib -lMesaGLU -lMesaGL -lXext -lm"
++	GL_LIBS="-lMesaGLU -lMesaGL"
  	AC_SUBST(GL_LFLAGS)
          AC_SUBST(GL_LIBS)
      ],
@@ -50,3 +50,13 @@
  libnurbsd_la_LDFLAGS = $(ldflags)
 -
 +libnurbsd_la_LIBADD = ../matrix/libmatrix.la ../image/libmatrixI.la ../numerical/libmatrixN.la
+--- nurbs++-3.0.11/examples/image/Makefile.am.orig	2002-05-22 19:15:54.000000000 +0200
++++ nurbs++-3.0.11/examples/image/Makefile.am	2006-04-14 20:35:45.731096250 +0200
+@@ -1,5 +1,5 @@
+-MAGICK_INCLUDE =  $(X_CFLAGS) @magick_include@
+-MAGICK_LIB = $(X_PRE_LIBS) @magick_lib@ $(X_LIBS) -lXt -lX11
++MAGICK_INCLUDE =  @magick_include@
++MAGICK_LIB = @magick_lib@
+ 
+ LAPACKLIBS = @lapack_libs@
+ COMPLEXLIB = @complex_lib@
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/nurbs++-link.patch?r1=1.4&r2=1.5&f=u