[cairo-commit] glitz ChangeLog, 1.1.1.1, 1.2 configure.in, 1.1.1.1, 1.2

[David Reveman]

Committed by: davidr

Update of /cvs/cairo/glitz
In directory pdx:/tmp/cvs-serv14962

Modified Files:
	ChangeLog configure.in 
Log Message:
Fixed misplacement of AM_CONDITIONAL macros

Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/glitz/ChangeLog,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** a/ChangeLog	30 Mar 2004 17:07:18 -0000	1.1.1.1
--- b/ChangeLog	31 Mar 2004 14:55:39 -0000	1.2
***************
*** 1,2 ****
--- 1,6 ----
+ 2004-03-31    <c99drn at cs.umu.se>
+ 
+ 	* configure.in: Fixed misplacement of AM_CONDITIONAL macros.
+ 
  2004-03-30    <c99drn at cs.umu.se>
  

Index: configure.in
===================================================================
RCS file: /cvs/cairo/glitz/configure.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** a/configure.in	30 Mar 2004 17:07:18 -0000	1.1.1.1
--- b/configure.in	31 Mar 2004 14:55:39 -0000	1.2
***************
*** 67,76 ****
    [use_glx=$enableval], [use_glx=yes])
  
- AC_ARG_ENABLE(agl,
-   AC_HELP_STRING([--disable-agl], [Disable glitz's AGL backend]),
-   [use_agl=$enableval], [use_agl=yes])
- 
- dnl ===========================================================================
- 
  AH_TEMPLATE([XTHREADS], [Define if Xlib supports XTHREADS])
  
--- 67,70 ----
***************
*** 107,117 ****
  
      use_glx="yes"
-     AM_CONDITIONAL(GLITZ_BUILD_GLX_BACKEND, true)
    else
      use_glx="no"
-     AM_CONDITIONAL(GLITZ_BUILD_GLX_BACKEND, false)
    fi
  fi
  
  AC_SUBST(GLX_CFLAGS)
  AC_SUBST(GLX_LIBS)
--- 101,115 ----
  
      use_glx="yes"
    else
      use_glx="no"
    fi
  fi
  
+ if test "x$use_glx" = "xyes"; then
+   AM_CONDITIONAL(GLITZ_BUILD_GLX_BACKEND, true)
+ else
+   AM_CONDITIONAL(GLITZ_BUILD_GLX_BACKEND, false)
+ fi
+ 
  AC_SUBST(GLX_CFLAGS)
  AC_SUBST(GLX_LIBS)
***************
*** 119,122 ****
--- 117,124 ----
  dnl ===========================================================================
  
+ AC_ARG_ENABLE(agl,
+   AC_HELP_STRING([--disable-agl], [Disable glitz's AGL backend]),
+   [use_agl=$enableval], [use_agl=yes])
+ 
  AH_TEMPLATE([PTHREADS], [Define if PTHREADS are supported])
  
***************
*** 144,154 ****
      fi
      AC_MSG_RESULT($use_pthreads)
- 
-     AM_CONDITIONAL(GLITZ_BUILD_AGL_BACKEND, true)
-   else
-     AM_CONDITIONAL(GLITZ_BUILD_AGL_BACKEND, false)
    fi
  fi
  
  AC_SUBST(AGL_CFLAGS)
  AC_SUBST(AGL_LIBS)
--- 146,158 ----
      fi
      AC_MSG_RESULT($use_pthreads)
    fi
  fi
  
+ if test "x$use_agl" = "xyes"; then
+   AM_CONDITIONAL(GLITZ_BUILD_AGL_BACKEND, true)
+ else
+   AM_CONDITIONAL(GLITZ_BUILD_AGL_BACKEND, false)
+ fi
+ 
  AC_SUBST(AGL_CFLAGS)
  AC_SUBST(AGL_LIBS)