diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-08-16 15:15:36 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-08-16 15:15:36 +0000 |
| commit | ee1476fe784d047584fc1cc482e031c8daa42d25 (patch) | |
| tree | 01a222c6ed4d284218f418241f2ee524e5fec0a1 | |
| parent | b6ff458329367c2c7c3540d584b47dc0144caa4c (diff) | |
| download | xine-lib-ee1476fe784d047584fc1cc482e031c8daa42d25.tar.gz xine-lib-ee1476fe784d047584fc1cc482e031c8daa42d25.tar.bz2 | |
* use <math.h> instead of "math.h"
* move the ffmpeg test entirely into the AM_PATH_FFMPEG macro
(xine's configure.ac could use some more refactoring similar to this macro)
* some beautification
CVS patchset: 6881
CVS date: 2004/08/16 15:15:36
| -rw-r--r-- | configure.ac | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/configure.ac b/configure.ac index eed70449c..cc85c0234 100644 --- a/configure.ac +++ b/configure.ac @@ -269,7 +269,7 @@ AC_CHECK_DECL(lrintf,[ AC_DEFINE(_ISOC9X_SOURCE,1,[Define this if you are ISO C9X compliant]) ],,[ #define _ISOC9X_SOURCE -#include "math.h" +#include <math.h> ]) AC_CHECK_TYPES(int_fast8_t, [], [LIBFFMPEG_CFLAGS="$LIBFFMPEG_CFLAGS -DEMULATE_FAST_INT"]) @@ -329,23 +329,7 @@ AM_CONDITIONAL(HAVE_MLIB, test x$ac_have_mlib = "xyes") AC_SUBST(MLIB_LIBS) AC_SUBST(MLIB_CFLAGS) -AC_ARG_WITH(external-ffmpeg, - AC_HELP_STRING( - [--with-external-ffmpeg], - [use external ffmpeg library] - ), - [external_ffmpeg="$withval"], - [external_ffmpeg="no"] -) - -if test x"$external_ffmpeg" != "xno"; then - AM_PATH_FFMPEG( - AC_DEFINE(HAVE_FFMPEG, 1, [Define this if you have ffmpeg library]) - ) -else - AC_MSG_RESULT([Use included ffmpeg]) -fi - +AM_PATH_FFMPEG(AC_DEFINE(HAVE_FFMPEG, 1, [Define this if you have ffmpeg library])) AM_CONDITIONAL(HAVE_FFMPEG, test x"$external_ffmpeg_found" = "xyes") @@ -412,14 +396,13 @@ dnl Check for OpenGL & [GLut | GLU] dnl --------------------------------------------- case "$host" in - *darwin*) dnl Use native interface + *darwin*) dnl Use native interface OPENGL_LIBS="-framework Carbon -framework AGL -framework OpenGL -framework AppKit" OPENGL_CFLAGS="-framework Carbon -framework AGL -framework OpenGL -framework AppKit" AC_SUBST(OPENGL_LIBS) AC_SUBST(OPENGL_CFLAGS) ;; - *) - + *) AC_CHECK_LIB(GL, glBegin, [AC_CHECK_HEADER(GL/gl.h, [ ac_have_opengl="yes" @@ -682,6 +665,7 @@ AC_ARG_ENABLE(fb, AC_HELP_STRING([--disable-fb], [do not build linux framebuffer have_fb=$enableval) AM_CONDITIONAL(HAVE_FB, [test x"$have_fb" = "xyes"]) + dnl --------------------------------------------- dnl Check whether to build Mac OS X video output driver dnl --------------------------------------------- @@ -690,6 +674,7 @@ AC_ARG_ENABLE(macosx_video, AC_HELP_STRING([--enable-macosx-video], [enable supp have_macosx_video=$enableval) AM_CONDITIONAL(HAVE_MACOSX_VIDEO, [test x"$have_macosx_video" = "xyes"]) + dnl --------------------------------------------- dnl Check whether to build Mac OS X audio output driver dnl --------------------------------------------- @@ -698,6 +683,7 @@ AC_ARG_ENABLE(coreaudio, AC_HELP_STRING([--enable-coreaudio], [enable support fo have_coreaudio=$enableval) AM_CONDITIONAL(HAVE_COREAUDIO, [test x"$have_coreaudio" = "xyes"]) + dnl --------------------------------------------- dnl Find pkg-config dnl --------------------------------------------- |