[libdv-cvs] CVS: libdv configure.in,1.4,1.5

[Charles 'B. K. <kr...@us...>]

Update of /cvsroot/libdv/libdv
In directory usw-pr-cvs1:/tmp/cvs-serv19884

Modified Files:
	configure.in 
Log Message:
More robust checking for SDL and glib/gtk+

Index: configure.in
===================================================================
RCS file: /cvsroot/libdv/libdv/configure.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** configure.in	2001/01/10 22:31:07	1.4
--- configure.in	2001/01/14 17:17:58	1.5
***************
*** 55,81 ****
  
  dnl Checks for libraries.
! AM_PATH_GLIB(,
! [
! 	AC_DEFINE(HAVE_GLIB)
! 	LIBS="$LIBS $GLIB_LIBS"
! 	CFLAGS="$CFLAGS $GLIB_CFLAGS"
! ],
! [
! 	AC_MSG_ERROR([No glib. Bad. Go get it.])
  ])
! AM_PATH_GTK(,
! [
! 	AC_DEFINE(HAVE_GTK)
! 	LIBS="$LIBS $GTK_LIBS"
! 	CFLAGS="$CFLAGS $GTK_CFLAGS"
  ])
! if $use_sdl; then
!       AM_PATH_SDL(1.1.6,
!       [
!               AC_DEFINE(HAVE_SDL)
!               LIBS="$LIBS $SDL_LIBS"
!               CFLAGS="$CFLAGS $SDL_CFLAGS"
!       ])
! fi
  if $use_xv; then
        AC_CHECK_LIB(Xv,XvQueryAdaptors,)
--- 55,93 ----
  
  dnl Checks for libraries.
! 
! ifdef([AM_PATH_GLIB],[
! 	AM_PATH_GLIB(,
! 	[
! 		AC_DEFINE(HAVE_GLIB)
! 		LIBS="$LIBS $GLIB_LIBS"
! 		CFLAGS="$CFLAGS $GLIB_CFLAGS"
! 	],
! 	[
! 		AC_MSG_ERROR([No glib. Bad.  Get it at:  http://www.gtk.org/.])
! 	])
! ],[
! 	AC_MSG_ERROR([No glib. Bad. Get it at:  http://www.gtk.org/])
  ])
! 
! ifdef([AM_PATH_GTK],[
! 	AM_PATH_GTK(,
! 	[
! 		AC_DEFINE(HAVE_GTK)
! 		LIBS="$LIBS $GTK_LIBS"
! 		CFLAGS="$CFLAGS $GTK_CFLAGS"
! 	])
  ])
! 
! ifdef([AM_PATH_SDL],[
! 	if $use_sdl; then
!       		AM_PATH_SDL(1.1.6,
! 		 [
! 	              AC_DEFINE(HAVE_SDL)
! 	              LIBS="$LIBS $SDL_LIBS"
! 	              CFLAGS="$CFLAGS $SDL_CFLAGS"
! 		 ])
! 	fi
! ])
! 
  if $use_xv; then
        AC_CHECK_LIB(Xv,XvQueryAdaptors,)