diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2002-02-06 02:09:56 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2002-02-06 02:09:56 +0000 |
| commit | c1830909cfc979f97e45c90ffc0907986786468f (patch) | |
| tree | 284109b9d6663b19114036e2811c09166fbcc2df | |
| parent | 9bacc87676237d97c87ca31b8702ca93789bd7ea (diff) | |
| download | xine-lib-c1830909cfc979f97e45c90ffc0907986786468f.tar.gz xine-lib-c1830909cfc979f97e45c90ffc0907986786468f.tar.bz2 | |
Add missing (temporary) Makefile.am. Don't kill configure process if
pkg-something is missing.
CVS patchset: 1476
CVS date: 2002/02/06 02:09:56
| -rw-r--r-- | configure.in | 25 | ||||
| -rw-r--r-- | doc/hackersguide/Makefile.am | 1 |
2 files changed, 15 insertions, 11 deletions
diff --git a/configure.in b/configure.in index 0a3e92855..1dba9550d 100644 --- a/configure.in +++ b/configure.in @@ -345,22 +345,25 @@ dnl Find pkg-config 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 ***]) + fi -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 AC_SUBST(DIRECTFB_CFLAGS) diff --git a/doc/hackersguide/Makefile.am b/doc/hackersguide/Makefile.am new file mode 100644 index 000000000..223d9281b --- /dev/null +++ b/doc/hackersguide/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = README architecture.fig hackersguide.sgml intro.sgml |