[cairo-commit] libglc ChangeLog,1.18,1.19 configure.in,1.5,1.6 libglc-glx.pc.in,1.1,1.2

[David Reveman]

Committed by: davidr

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

Modified Files:
	ChangeLog configure.in libglc-glx.pc.in 
Log Message:
Added --disable-glx switch

Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/libglc/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** ChangeLog	13 Dec 2003 02:28:43 -0000	1.18
--- ChangeLog	13 Dec 2003 10:44:41 -0000	1.19
***************
*** 1,4 ****
--- 1,6 ----
  2003-12-13    <c99drn at cs.umu.se>
  
+ 	* configure.in: Added --disable-glx switch.
+ 
  	* configure.in: External slim package is no longer required.
  

Index: configure.in
===================================================================
RCS file: /cvs/cairo/libglc/configure.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** configure.in	13 Dec 2003 02:28:43 -0000	1.5
--- configure.in	13 Dec 2003 10:44:41 -0000	1.6
***************
*** 67,70 ****
--- 67,76 ----
  dnl ===========================================================================
  
+ PKG_CHECK_MODULES(LIBGLC, render >= $RENDER_REQUIRED)
+ AC_SUBST(LIBGLC_CFLAGS)
+ AC_SUBST(LIBGLC_LIBS)
+ 
+ dnl ===========================================================================
+ 
  GL_CFLAGS=""
  GL_LIBS="-lGL"
***************
*** 75,112 ****
  dnl ===========================================================================
  
! PKG_CHECK_MODULES(LIBGLC, 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_FEATURE=LIBGLC_HAS_NO_GLX_BACKEND
  else
    GLX_BACKEND_FEATURE=LIBGLC_HAS_GLX_BACKEND
! fi
! 
! AC_SUBST(GLX_BACKEND_FEATURE)
! 
! AM_CONDITIONAL(LIBGLC_HAS_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])
--- 81,105 ----
  dnl ===========================================================================
  
! AC_ARG_ENABLE(glx,
!   AC_HELP_STRING([--disable-glx], [Disable libglc's GLX backend]),
!   [use_glx=$enableval], [use_glx=yes])
  
! AH_TEMPLATE([XTHREADS], [Define if Xlib supports XTHREADS])
  
! if test "x$use_glx" != "xyes"; then
    GLX_BACKEND_FEATURE=LIBGLC_HAS_NO_GLX_BACKEND
+   AM_CONDITIONAL(LIBGLC_HAS_GLX_BACKEND, false)
  else
    GLX_BACKEND_FEATURE=LIBGLC_HAS_GLX_BACKEND
!   AC_PATH_XTRA
!   GLX_LIBS="$X_LIBS -lX11"
!   GLX_CFLAGS="$X_CFLAGS"
  
!   # Check for XTHREADS
  
    save_LIBS="$LIBS"
    save_CFLAGS="$CFLAGS"
!   CFLAGS="$CFLAGS $GLX_CFLAGS"
!   LIBS="$LIBS $GLX_LIBS"
  
    AC_MSG_CHECKING([for XTHREADS in Xlib])
***************
*** 125,143 ****
    if test "x$xthreads" = "xyes"
    then
!       XTHREADS_CFLAGS=""
!       XTHREADS_LIBS="-lpthread"
        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-features.h
  ])
--- 118,138 ----
    if test "x$xthreads" = "xyes"
    then
!       GLX_LIBS="$GLX_LIBS -lpthread"
        AC_DEFINE(XTHREADS, 1)
    fi
+ 
+   AM_CONDITIONAL(LIBGLC_HAS_GLX_BACKEND, true)
  fi
  
! AC_SUBST(GLX_BACKEND_FEATURE)
! AC_SUBST(GLX_CFLAGS)
! AC_SUBST(GLX_LIBS)
  
  dnl ===========================================================================
  
  AC_OUTPUT([
  Makefile
  src/Makefile
  src/glc-features.h
+ libglc-glx.pc
  ])

Index: libglc-glx.pc.in
===================================================================
RCS file: /cvs/cairo/libglc/libglc-glx.pc.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** libglc-glx.pc.in	5 Dec 2003 01:55:31 -0000	1.1
--- libglc-glx.pc.in	13 Dec 2003 10:44:41 -0000	1.2
***************
*** 7,12 ****
  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@
--- 7,10 ----
  Description: OpenGL compositing library (GLX backend)
  Version: @VERSION@
! Libs: -L${libdir} -lglc -lm @LIBGLC_LIBS@ @GL_LIBS@ @GLX_LIBS@
! Cflags: -I${includedir} @LIBGLC_CFLAGS@ @GL_CFLAGS@ @GLX_CFLAGS@