[cairo-commit] libglc/src glc-features.h.in,NONE,1.1 Makefile.am,1.3,1.4 glc.h,1.2,1.3 glc-config.h.in,1.1,NONE

[David Reveman]

Committed by: davidr

Update of /cvs/cairo/libglc/src
In directory pdx:/tmp/cvs-serv9806/src

Modified Files:
	Makefile.am glc.h 
Added Files:
	glc-features.h.in 
Removed Files:
	glc-config.h.in 
Log Message:
Keeping up with cairo

--- NEW FILE: glc-features.h.in ---
(This appears to be a binary file; contents omitted.)

Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/libglc/src/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.am	5 Dec 2003 01:55:31 -0000	1.3
--- Makefile.am	5 Dec 2003 21:57:19 -0000	1.4
***************
*** 1,6 ****
  lib_LTLIBRARIES = libglc.la
! include_HEADERS = glc.h glc-config.h
  
! if HAVE_GLX_BACKEND
  libglc_glx_sources = \
  	glc_glx_surface.c \
--- 1,6 ----
  lib_LTLIBRARIES = libglc.la
! include_HEADERS = glc.h glc-features.h
  
! if LIBGLC_HAS_GLX_BACKEND
  libglc_glx_sources = \
  	glc_glx_surface.c \
***************
*** 31,35 ****
  libglc_la_LDFLAGS = -version-info @VERSION_INFO@
  
! INCLUDES = $(LIBGLC_CFLAGS) $(GL_CFLAGS) $(X_CFLAGS) $(XTHREAD_CFLAGS)
  
! libglc_la_LIBADD = $(LIBGLC_LIBS) $(GL_LIBS) $(X_LIBS) $(XTHREAD_LIBS) -lm
--- 31,35 ----
  libglc_la_LDFLAGS = -version-info @VERSION_INFO@
  
! INCLUDES = $(LIBGLC_CFLAGS) $(GL_CFLAGS) $(X_CFLAGS) $(XTHREADS_CFLAGS)
  
! libglc_la_LIBADD = $(LIBGLC_LIBS) $(GL_LIBS) $(X_LIBS) $(XTHREADS_LIBS) -lm

Index: glc.h
===================================================================
RCS file: /cvs/cairo/libglc/src/glc.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** glc.h	5 Dec 2003 01:55:31 -0000	1.2
--- glc.h	5 Dec 2003 21:57:19 -0000	1.3
***************
*** 48,52 ****
  #endif
  
! #include <glc-config.h>
  
  /* NOTE: Must be manually synchronized with LIBGLC_VERSION in configure.in */
--- 48,52 ----
  #endif
  
! #include <glc-features.h>
  
  /* NOTE: Must be manually synchronized with LIBGLC_VERSION in configure.in */

--- glc-config.h.in DELETED ---