[cairo-commit] cairo configure.in,1.44,1.45

[Dave Beckett]

Committed by: dajobe

Update of /cvs/cairo/cairo
In directory pdx:/tmp/cvs-serv26455

Modified Files:
	configure.in 
Log Message:
	* configure.in: Move the PNG_CFLAGS/_LIBS substitutes outside
	the conditional, to match what is already done for XCB.
	Do the same for XRENDER_CFLAGS/LIBS.


Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairo/configure.in,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** a/configure.in	20 Mar 2004 16:20:46 -0000	1.44
--- b/configure.in	20 Mar 2004 17:54:20 -0000	1.45
***************
*** 52,55 ****
--- 52,57 ----
  
  AC_SUBST(XLIB_SURFACE_FEATURE)
+ AC_SUBST(XRENDER_CFLAGS)
+ AC_SUBST(XRENDER_LIBS)
  AC_SUBST(XRENDER_REQUIRES)
  
***************
*** 100,106 ****
    PNG_SURFACE_FEATURE=CAIRO_HAS_NO_PNG_SURFACE
    AM_CONDITIONAL(CAIRO_HAS_PNG_SURFACE, false)
-   dnl match what PKG_CHECK_MODULES does for PNG below
-   AC_SUBST(PNG_CFLAGS)
-   AC_SUBST(PNG_LIBS)
  else
    PNG_SURFACE_FEATURE=CAIRO_HAS_PNG_SURFACE
--- 102,105 ----
***************
*** 113,116 ****
--- 112,117 ----
  
  AC_SUBST(PNG_SURFACE_FEATURE)
+ AC_SUBST(PNG_CFLAGS)
+ AC_SUBST(PNG_LIBS)
  AC_SUBST(PNG_REQUIRES)