diff options
| author | Andreas Oberritter <obi@opendreambox.org> | 2010-10-25 22:29:45 +0000 |
|---|---|---|
| committer | Andreas Oberritter <obi@opendreambox.org> | 2010-11-16 17:09:12 +0100 |
| commit | 62455fd662f08b1f81cbb08ccb2c199cde0b9e97 (patch) | |
| tree | 8120d2e4769d0e6ff4ad81cb7952f9e694cee330 /configure.ac | |
| parent | 30f902c06a7bd3c726aeb08a5424d6a59871615f (diff) | |
| download | enigma2-62455fd662f08b1f81cbb08ccb2c199cde0b9e97.tar.gz enigma2-62455fd662f08b1f81cbb08ccb2c199cde0b9e97.zip | |
clean up build #2
* use swig macros from autoconf archive
* generate and use enigma2_config.h (include from command-line)
* check for dbox/fp.h and dbox/lcd-ks0713.h
* clean up checks for libdreamdvd and lib*gif
* fix some dependencies for generated files and header files
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index 91de157a..b7faa7dc 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,6 @@ AC_INIT([enigma2],[2.8.0],[enigma2-devel@lists.elitedvb.net]) AM_INIT_AUTOMAKE([dist-bzip2 no-define silent-rules]) +AC_CONFIG_HEADERS([enigma2_config.h]) AC_USE_SYSTEM_EXTENSIONS AC_SYS_LARGEFILE @@ -17,36 +18,27 @@ AC_ARG_WITH(libsdl, [[with_sdl=no]] ) -AC_CHECK_HEADER(dreamdvd/ddvdlib.h,have_ddvdlib="yes",have_ddvdlib="no") -if test x"${have_ddvdlib}" = xyes ; then - AC_DEFINE(HAVE_DDVDLIB, 1,[Define if ddvdlib is available]) -else - AC_MSG_NOTICE([ddvdlib not found... dont build dvd plugin]) -fi -AM_CONDITIONAL(HAVE_DDVDLIB, test "$have_ddvdlib" = "yes") +AC_CHECK_HEADERS([dbox/fp.h dbox/lcd-ks0713.h]) AM_PATH_PYTHON AX_PYTHON_DEVEL +AX_PKG_SWIG +AX_SWIG_ENABLE_CXX +AX_SWIG_PYTHON AX_PTHREAD TUXBOX_APPS_DVB PKG_CHECK_MODULES(BASE, [freetype2 fribidi gstreamer-0.10 gstreamer-pbutils-0.10 libdvbsi++ libpng libxml-2.0 sigc++-1.2]) +PKG_CHECK_MODULES(LIBDDVD, libdreamdvd, HAVE_DDVDLIB="yes", HAVE_DDVDLIB="no") +AM_CONDITIONAL(HAVE_DDVDLIB, test "$HAVE_DDVDLIB" = "yes") PKG_CHECK_MODULES(LIBXINE, libxine, HAVE_LIBXINE="yes", HAVE_LIBXINE="no") AC_CHECK_LIB([dl], [dlopen], [LIBDL_LIBS="-ldl"]) AC_SUBST(LIBDL_LIBS) AC_CHECK_LIB([jpeg], [jpeg_set_defaults]) AC_CHECK_LIB([xmlccwrap], [exit]) - -AC_CHECK_HEADERS(gif_lib.h, - AC_CHECK_LIB(ungif,DGifOpen, - [AC_DEFINE(HAVE_LIBUNGIF,1,[Define if you have libgif/libungif including devel headers]) - LIBUNGIF_LIBS="-lungif"], - [AC_CHECK_LIB(gif,DGifOpen, - [AC_DEFINE(HAVE_LIUNBGIF,1) - LIBUNGIF_LIBS="-lgif"])])) -AC_SUBST(LIBUNGIF_LIBS) +AC_CHECK_LIB([ungif], [DGifOpen], , [AC_CHECK_LIB([gif], [DGifOpen])]) if test "$with_sdl" = "yes" ; then PKG_CHECK_MODULES(SDL, sdl) |