From: Charles 'B. K. <kr...@us...> - 2001-01-20 21:09:46
|
Update of /cvsroot/libdv/libdv In directory usw-pr-cvs1:/tmp/cvs-serv16944 Modified Files: configure.in Log Message: Learn more about aclocal than I want to know. The ifdefs achieve nothing. I don't know how to avoid errors with AM_PATH_XXX when package XXX is not installed. Index: configure.in =================================================================== RCS file: /cvsroot/libdv/libdv/configure.in,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** configure.in 2001/01/19 01:49:57 1.8 --- configure.in 2001/01/20 21:09:54 1.9 *************** *** 94,126 **** 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" ! ]) ]) if $use_sdl; then ! AC_CHECK_LIB(SDL_Init,SDL,[ ! AM_PATH_SDL(1.1.6,[ AC_DEFINE(HAVE_SDL) LIBS="$LIBS $SDL_LIBS" CFLAGS="$CFLAGS $SDL_CFLAGS" ! ]) ]) fi --- 94,122 ---- 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. Get it at: http://www.gtk.org/. ]) ]) ! AM_PATH_GTK(, ! [ ! AC_DEFINE(HAVE_GTK) ! LIBS="$LIBS $GTK_LIBS" ! CFLAGS="$CFLAGS $GTK_CFLAGS" ]) if $use_sdl; then ! AC_CHECK_LIB(SDL_Init,SDL, ! [ ! AM_PATH_SDL(1.1.6, ! [ AC_DEFINE(HAVE_SDL) LIBS="$LIBS $SDL_LIBS" CFLAGS="$CFLAGS $SDL_CFLAGS" ! ]) ]) fi *************** *** 129,132 **** --- 125,129 ---- AC_CHECK_LIB(Xv,XvQueryAdaptors,) fi + AC_CHECK_LIB(m, sqrt) AC_CHECK_LIB(popt, poptGetContext,, |