From: Daniel Caujolle-B. <f1...@us...> - 2002-02-06 02:09:59
|
Update of /cvsroot/xine/xine-lib In directory usw-pr-cvs1:/tmp/cvs-serv29837 Modified Files: configure.in Log Message: Add missing (temporary) Makefile.am. Don't kill configure process if pkg-something is missing. Index: configure.in =================================================================== RCS file: /cvsroot/xine/xine-lib/configure.in,v retrieving revision 1.142 retrieving revision 1.143 diff -u -r1.142 -r1.143 --- configure.in 2002/02/05 18:17:21 1.142 +++ configure.in 2002/02/06 02:09:56 1.143 @@ -345,22 +345,25 @@ dnl AC_PATH_PROG(PKG_CONFIG, pkg-config, no) if test x$PKG_CONFIG = xno ; then - AC_MSG_ERROR([*** pkg-config not found. See http://pkgconfig.sourceforge.net]) -fi + echo "*** pkg-config not found. See http://pkgconfig.sourceforge.net" + echo "*** All of DIRECTFB dependent parts will be disabled" +else dnl dnl Check for DirectFB dnl -DIRECTFB_REQUIRED_VERSION=0.9.9 + DIRECTFB_REQUIRED_VERSION=0.9.9 -AC_MSG_CHECKING(for DirectFB) -if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb ; then - AC_MSG_RESULT(found) - DIRECTFB_CFLAGS=`$PKG_CONFIG --cflags directfb` - DIRECTFB_LIBS=`$PKG_CONFIG --libs directfb` - have_directfb="yes" -else - AC_MSG_RESULT([*** All of DIRECTFB dependent parts will be disabled ***]) + AC_MSG_CHECKING(for DirectFB) + if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb ; then + AC_MSG_RESULT(found) + DIRECTFB_CFLAGS=`$PKG_CONFIG --cflags directfb` + DIRECTFB_LIBS=`$PKG_CONFIG --libs directfb` + have_directfb="yes" + else + AC_MSG_RESULT([*** All of DIRECTFB dependent parts will be disabled ***]) + fi + fi AC_SUBST(DIRECTFB_CFLAGS) |