[cairo-commit] libglc ChangeLog,1.11,1.12 Makefile.am,1.2,1.3 autogen.sh,1.1.1.1,1.2 configure.in,1.2,1.3

[David Reveman]

Committed by: davidr

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

Modified Files:
	ChangeLog Makefile.am autogen.sh configure.in 
Log Message:
Keeping up with cairo

Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/libglc/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ChangeLog	5 Dec 2003 15:22:16 -0000	1.11
--- ChangeLog	5 Dec 2003 21:57:19 -0000	1.12
***************
*** 1,4 ****
--- 1,6 ----
  2003-12-05    <c99drn at cs.umu.se>
  
+ 	* configure.in: Keeping up with cairo.
+ 
  	* src/glcint.h: Added glc_intersect_region function.
  

Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/libglc/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.am	5 Dec 2003 01:55:31 -0000	1.2
--- Makefile.am	5 Dec 2003 21:57:19 -0000	1.3
***************
*** 1,5 ****
  SUBDIRS = . src
  
! if HAVE_GLX_BACKEND
  libglc_glx_extra_dist = libglc-glx.pc.in
  libglc_glx_data = libglc-glx.pc
--- 1,5 ----
  SUBDIRS = . src
  
! if LIBGLC_HAS_GLX_BACKEND
  libglc_glx_extra_dist = libglc-glx.pc.in
  libglc_glx_data = libglc-glx.pc

Index: autogen.sh
===================================================================
RCS file: /cvs/cairo/libglc/autogen.sh,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** autogen.sh	27 Nov 2003 11:45:39 -0000	1.1.1.1
--- autogen.sh	5 Dec 2003 21:57:19 -0000	1.2
***************
*** 4,7 ****
--- 4,15 ----
  set -e
  
+ LIBTOOLIZE=${LIBTOOLIZE-libtoolize}
+ LIBTOOLIZE_FLAGS="--copy --force"
+ ACLOCAL=${ACLOCAL-aclocal}
+ AUTOHEADER=${AUTOHEADER-autoheader}
+ AUTOMAKE=${AUTOMAKE-automake}
+ AUTOMAKE_FLAGS="--add-missing"
+ AUTOCONF=${AUTOCONF-autoconf}
+ 
  ARGV0=$0
  
***************
*** 33,45 ****
  }
  
! do_cmd libtoolize --force --copy
  
! do_cmd aclocal ${ACLOCAL_FLAGS}
  
! do_cmd autoheader
  
! do_cmd automake --add-missing --copy
  
! do_cmd autoconf
  
  do_cmd ./configure --enable-maintainer-mode ${1+"$@"} && echo "Now type \`make' to compile" || exit 1
--- 41,53 ----
  }
  
! do_cmd $LIBTOOLIZE $LIBTOOLIZE_FLAGS
  
! do_cmd $ACLOCAL $ACLOCAL_FLAGS
  
! do_cmd $AUTOHEADER
  
! do_cmd $AUTOMAKE $AUTOMAKE_FLAGS
  
! do_cmd $AUTOCONF
  
  do_cmd ./configure --enable-maintainer-mode ${1+"$@"} && echo "Now type \`make' to compile" || exit 1

Index: configure.in
===================================================================
RCS file: /cvs/cairo/libglc/configure.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** configure.in	5 Dec 2003 01:55:31 -0000	1.2
--- configure.in	5 Dec 2003 21:57:19 -0000	1.3
***************
*** 87,98 ****
  
  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 ===========================================================================
--- 87,98 ----
  
  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 ===========================================================================
***************
*** 141,144 ****
  Makefile
  src/Makefile
! src/glc-config.h
  ])
--- 141,144 ----
  Makefile
  src/Makefile
! src/glc-features.h
  ])