From 2ec93410616c86a3fd0e4464d34c4b5da77b13d5 Mon Sep 17 00:00:00 2001 From: deva Date: Wed, 16 Nov 2005 11:02:28 +0000 Subject: *** empty log message *** --- configure.in | 96 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 48 insertions(+), 48 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 9ba1c64..2d5721a 100644 --- a/configure.in +++ b/configure.in @@ -70,54 +70,54 @@ dnl ====================== AC_CHECK_HEADER(lame/lame.h, , AC_MSG_ERROR([*** libLAME (libmp3lame) include files not found!])) AC_CHECK_LIB(mp3lame, lame_init, , AC_MSG_ERROR([*** libLAME (libmp3lame) not found!])) -dnl ====================== -dnl Check for mplex library -dnl ====================== -PKG_CHECK_MODULES(MPLEX, mjpegtools >= 1.6.1.93, [ - dnl switch over to c++ to test things - AC_LANG_CPLUSPLUS - OLD_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $MPLEX_CFLAGS" - AC_CHECK_HEADER(interact.hpp, [ - MPLEX_LIBS="$MPLEX_LIBS -lmplex2 -lm" - OLD_LIBS="$LIBS" - LIBS="$LIBS $MPLEX_LIBS" - AC_MSG_CHECKING([for valid mplex objects]) - AC_TRY_RUN([ -#include -#include -#include - -int main (int argc, char *argv[]) -{ - class TestOutputStream : public OutputStream { - public: - TestOutputStream () : OutputStream () { } - void Write (uint8_t *a, unsigned int b) { } - void NextSegment () { } - off_t SegmentSize () { } - void Close () { } - int Open () { } - }; - MultiplexJob *job = new MultiplexJob (); - vector inputs; - job->SetupInputStreams (inputs); - TestOutputStream *out = new TestOutputStream (); - Multiplexor *mux = new Multiplexor(*job, *out); - return 0; -} - ],[ - HAVE_MPLEX="yes" - AC_SUBST(MPLEX_CFLAGS) - AC_SUBST(MPLEX_LIBS) - AC_MSG_RESULT(yes) - ], AC_MSG_RESULT(no)) - #LIBS="$OLD_LIBS" - ]) - #CPPFLAGS="$OLD_CPPFLAGS" - AC_LANG_C - ], HAVE_MPLEX="no") -AC_CHECK_LIB(mplex2, main, , AC_MSG_ERROR([*** libmplex2 not found (part of the mjpegtools package)!])) +#dnl ====================== +#dnl Check for mplex library +#dnl ====================== +#PKG_CHECK_MODULES(MPLEX, mjpegtools >= 1.6.1.93, [ +# dnl switch over to c++ to test things +# AC_LANG_CPLUSPLUS +# OLD_CPPFLAGS="$CPPFLAGS" +# CPPFLAGS="$CPPFLAGS $MPLEX_CFLAGS" +# AC_CHECK_HEADER(interact.hpp, [ +# MPLEX_LIBS="$MPLEX_LIBS -lmplex2 -lm" +# OLD_LIBS="$LIBS" +# LIBS="$LIBS $MPLEX_LIBS" +# AC_MSG_CHECKING([for valid mplex objects]) +# AC_TRY_RUN([ +##include +##include +##include +# +#int main (int argc, char *argv[]) +#{ +# class TestOutputStream : public OutputStream { +# public: +# TestOutputStream () : OutputStream () { } +# void Write (uint8_t *a, unsigned int b) { } +# void NextSegment () { } +# off_t SegmentSize () { } +# void Close () { } +# int Open () { } +# }; +# MultiplexJob *job = new MultiplexJob (); +# vector inputs; +# job->SetupInputStreams (inputs); +# TestOutputStream *out = new TestOutputStream (); +# Multiplexor *mux = new Multiplexor(*job, *out); +# return 0; +#} +# ],[ +# HAVE_MPLEX="yes" +# AC_SUBST(MPLEX_CFLAGS) +# AC_SUBST(MPLEX_LIBS) +# AC_MSG_RESULT(yes) +# ], AC_MSG_RESULT(no)) +# #LIBS="$OLD_LIBS" +# ]) +# #CPPFLAGS="$OLD_CPPFLAGS" +# AC_LANG_C +# ], HAVE_MPLEX="no") +#AC_CHECK_LIB(mplex2, main, , AC_MSG_ERROR([*** libmplex2 not found (part of the mjpegtools package)!])) AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) -- cgit v1.2.3