[cairo-commit] libglc libglc-glx.pc.in,NONE,1.1 ChangeLog,1.9,1.10 Makefile.am,1.1.1.1,1.2 configure.in,1.1.1.1,1.2 acconfig.h,1.1.1.1,NONE libglc.pc.in,1.1.1.1,NONE

[David Reveman]

Committed by: davidr

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

Modified Files:
	ChangeLog Makefile.am configure.in 
Added Files:
	libglc-glx.pc.in 
Removed Files:
	acconfig.h libglc.pc.in 
Log Message:
Added conditional backend building

--- NEW FILE: libglc-glx.pc.in ---
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@

Name: libglc-glx
Description: OpenGL compositing library (GLX backend)
Version: @VERSION@

Requires: slim
Libs: -L${libdir} -lglc -lm @GL_LIBS@ @X_LIBS@ @XTHREADS_LIBS@
Cflags: -I${includedir} @GL_CFLAGS@ @X_CFLAGS@ @XTHREADS_CFLAGS@

Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/libglc/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ChangeLog	4 Dec 2003 19:18:08 -0000	1.9
--- ChangeLog	5 Dec 2003 01:55:31 -0000	1.10
***************
*** 1,2 ****
--- 1,6 ----
+ 2003-12-05    <c99drn at cs.umu.se>
+ 
+ 	* Added conditional backend building.
+ 
  2003-12-04    <c99drn at cs.umu.se>
  

Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/libglc/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile.am	27 Nov 2003 11:45:39 -0000	1.1.1.1
--- Makefile.am	5 Dec 2003 01:55:31 -0000	1.2
***************
*** 1,8 ****
  SUBDIRS = . src
  
  EXTRA_DIST = \
  	COPYING \
! 	libglc.pc.in
  
  pkgconfigdir = $(libdir)/pkgconfig
! pkgconfig_DATA = libglc.pc
--- 1,16 ----
  SUBDIRS = . src
  
+ if HAVE_GLX_BACKEND
+ libglc_glx_extra_dist = libglc-glx.pc.in
+ libglc_glx_data = libglc-glx.pc
+ else
+ libglc_glx_extra_dist =
+ libglc_glx_data =
+ endif
+ 
  EXTRA_DIST = \
  	COPYING \
! 	$(libglc_glx_extra_dist)
  
  pkgconfigdir = $(libdir)/pkgconfig
! pkgconfig_DATA = $(libglc_glx_data)

Index: configure.in
===================================================================
RCS file: /cvs/cairo/libglc/configure.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** configure.in	27 Nov 2003 11:45:39 -0000	1.1.1.1
--- configure.in	5 Dec 2003 01:55:31 -0000	1.2
***************
*** 66,115 ****
  fi
  
! dnl ==========================================================================
  
  # Check for X
  AC_PATH_XTRA
  
! if test "x$no_x" = "xyes"
! then
!     AC_MSG_ERROR([X is required, but it was either disabled or not found.])
  fi
  
  # Check for XTHREADS
  
! save_LIBS="$LIBS"
! save_CFLAGS="$CFLAGS"
! CFLAGS="$CFLAGS $X_CFLAGS"
! LIBS="$LIBS $X_LIBS -lX11"
  
! AC_MSG_CHECKING([for XTHREADS in Xlib])
! AC_TRY_RUN([
!     #include <X11/Xlib.h>
!     int main() { return (!(XInitThreads())); }],
!     [xthreads=yes],
      [xthreads=no],
      [xthreads=yes])
  
! AC_MSG_RESULT($xthreads)
  
! LIBS="$save_LIBS"
! CFLAGS="$save_CFLAGS"
  
! if test "x$xthreads" = "xyes"
! then
!     AC_DEFINE(XTHREADS, 1)
  fi
  
! dnl ===========================================================================
! 
! PKG_CHECK_MODULES(LIBGLC, slim >= $SLIM_REQUIRED render >= $RENDER_REQUIRED)
! AC_SUBST(LIBGLC_CFLAGS)
! AC_SUBST(LIBGLC_LIBS)
  
  dnl ===========================================================================
  
  AC_OUTPUT([
! libglc.pc
  Makefile
  src/Makefile
  ])
--- 66,144 ----
  fi
  
! dnl ===========================================================================
! 
! GL_CFLAGS=""
! GL_LIBS="-lGL"
! 
! AC_SUBST(GL_CFLAGS)
! AC_SUBST(GL_LIBS)
! 
! dnl ===========================================================================
! 
! PKG_CHECK_MODULES(LIBGLC, slim >= $SLIM_REQUIRED render >= $RENDER_REQUIRED)
! AC_SUBST(LIBGLC_CFLAGS)
! AC_SUBST(LIBGLC_LIBS)
! 
! dnl ===========================================================================
  
  # Check for X
  AC_PATH_XTRA
+ X_LIBS="$X_LIBS -lX11"
  
! if test "x$have_x" != "xyes"; then
!   GLX_BACKEND_DEFINE=LIBGLC_HAS_NO_GLX_BACKEND
! else
!   GLX_BACKEND_DEFINE=LIBGLC_HAS_GLX_BACKEND
  fi
  
+ AC_SUBST(GLX_BACKEND_DEFINE)
+ 
+ AM_CONDITIONAL(HAVE_GLX_BACKEND, test x$have_x = xyes)
+ 
+ dnl ===========================================================================
+ 
  # Check for XTHREADS
  
! XTHREADS_CFLAGS=""
! XTHREADS_LIBS=""
  
! AH_TEMPLATE([XTHREADS], [Define if Xlib supports XTHREADS])
! 
! if test "x$have_x" = "xyes"; then
!   save_LIBS="$LIBS"
!   save_CFLAGS="$CFLAGS"
!   CFLAGS="$CFLAGS $X_CFLAGS"
!   LIBS="$LIBS $X_LIBS"
! 
!   AC_MSG_CHECKING([for XTHREADS in Xlib])
!   AC_RUN_IFELSE(
!     [AC_LANG_PROGRAM([[#include <X11/Xlib.h>]],
!       [[return XInitThreads() == 0 ? 0 : 1;]])],
      [xthreads=no],
+     [xthreads=yes],
      [xthreads=yes])
  
!   AC_MSG_RESULT($xthreads)
  
!   LIBS="$save_LIBS"
!   CFLAGS="$save_CFLAGS"
  
!   if test "x$xthreads" = "xyes"
!   then
!       XTHREADS_CFLAGS=""
!       XTHREADS_LIBS="-pthread"
!       AC_DEFINE(XTHREADS, 1)
!   fi
  fi
  
! AC_SUBST(XTHREADS_CFLAGS)
! AC_SUBST(XTHREADS_LIBS)
  
  dnl ===========================================================================
  
  AC_OUTPUT([
! libglc-glx.pc
  Makefile
  src/Makefile
+ src/glc-config.h
  ])

--- acconfig.h DELETED ---

--- libglc.pc.in DELETED ---