vlc | branch: master | Jean-Baptiste Kempf <j...@videolan.org> | Thu Nov 4 19:31:23 2010 +0100| [7780faa9f6c57e3f7f0c32e7cc1d65e5755bef60] | committer: Jean-Baptiste Kempf
ML: try to unbreak configure when libsqlite3-dev isn't present > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7780faa9f6c57e3f7f0c32e7cc1d65e5755bef60 --- configure.ac | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index dddbf5b..2b901f4 100644 --- a/configure.ac +++ b/configure.ac @@ -4164,13 +4164,19 @@ AM_CONDITIONAL([HAVE_SQLITE], [test "${enable_sqlite}" != "no"]) dnl dnl media library dnl -AC_ARG_ENABLE(media-library, [--enable-media-library media library (default enabled)]) -if test "${enable_media_library}" != "no" -then - test "${enable_sqlite}" != "yes" && AC_MSG_ERROR([SQLite module is required for the media library]) - AC_DEFINE([MEDIA_LIBRARY], 1, [Define if you want to use the VLC media library]) - VLC_ADD_CPPFLAGS([qt4],"-DMEDIA_LIBRARY") - VLC_ADD_PLUGIN([media_library]) +AC_ARG_ENABLE(media-library, [--enable-media-library media library (default auto)]) +if test "${enable_media_library}" != "no"; then + if test "${enable_sqlite}" != "yes"; then + if test "${enable_media_library}" == "yes"; then + AC_MSG_ERROR([SQLite module is required for the media library]) + else + AC_MSG_WARN([SQLite module is required for the media library]) + fi + else + AC_DEFINE([MEDIA_LIBRARY], 1, [Define if you want to use the VLC media library]) + VLC_ADD_CPPFLAGS([qt4],"-DMEDIA_LIBRARY") + VLC_ADD_PLUGIN([media_library]) + fi fi dnl _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
