diff options
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 17647a9..ab6fe98 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -2,6 +2,7 @@ | |||
2 | AC_PREREQ(2.61) | 2 | AC_PREREQ(2.61) |
3 | AC_INIT([libextractor], [0.7.0], [bug-libextractor@gnu.org]) | 3 | AC_INIT([libextractor], [0.7.0], [bug-libextractor@gnu.org]) |
4 | AC_CONFIG_HEADERS([config.h]) | 4 | AC_CONFIG_HEADERS([config.h]) |
5 | AC_CONFIG_MACRO_DIR([m4]) | ||
5 | AH_TOP([#define _GNU_SOURCE 1]) | 6 | AH_TOP([#define _GNU_SOURCE 1]) |
6 | AC_CANONICAL_TARGET | 7 | AC_CANONICAL_TARGET |
7 | AC_CANONICAL_HOST | 8 | AC_CANONICAL_HOST |
@@ -14,8 +15,6 @@ AC_SUBST(LIB_VERSION_CURRENT) | |||
14 | AC_SUBST(LIB_VERSION_REVISION) | 15 | AC_SUBST(LIB_VERSION_REVISION) |
15 | AC_SUBST(LIB_VERSION_AGE) | 16 | AC_SUBST(LIB_VERSION_AGE) |
16 | 17 | ||
17 | LT_CONFIG_LTDL_DIR([libltdl]) | ||
18 | AC_CONFIG_AUX_DIR([libltdl/config]) | ||
19 | AM_INIT_AUTOMAKE([silent-rules]) | 18 | AM_INIT_AUTOMAKE([silent-rules]) |
20 | 19 | ||
21 | # Checks for programs. | 20 | # Checks for programs. |
@@ -30,6 +29,8 @@ AC_PROG_INSTALL | |||
30 | AC_PROG_LN_S | 29 | AC_PROG_LN_S |
31 | AC_PROG_MAKE_SET | 30 | AC_PROG_MAKE_SET |
32 | AC_CANONICAL_HOST | 31 | AC_CANONICAL_HOST |
32 | AC_LIBLTDL_CONVENIENCE | ||
33 | AC_PROG_LIBTOOL | ||
33 | # save LIBS, libtool does a AC_SEARCH_LIBS(dlopen, dl), but plugins | 34 | # save LIBS, libtool does a AC_SEARCH_LIBS(dlopen, dl), but plugins |
34 | # need not have -ldl added | 35 | # need not have -ldl added |
35 | LIBSOLD=$LIBS | 36 | LIBSOLD=$LIBS |
@@ -530,7 +531,6 @@ AC_CHECK_LIB(gsf-1, gsf_init, AC_DEFINE(HAVE_GSF_INIT,1,[gsf_init supported])) | |||
530 | AC_CHECK_PROG([HAVE_ZZUF],[zzuf], 1, 0) | 531 | AC_CHECK_PROG([HAVE_ZZUF],[zzuf], 1, 0) |
531 | AM_CONDITIONAL(HAVE_ZZUF, test 0 != $HAVE_ZZUF) | 532 | AM_CONDITIONAL(HAVE_ZZUF, test 0 != $HAVE_ZZUF) |
532 | 533 | ||
533 | ffmpeg_enabled=0 | ||
534 | AC_MSG_CHECKING([whether to enable the FFmpeg thumbnail extractor]) | 534 | AC_MSG_CHECKING([whether to enable the FFmpeg thumbnail extractor]) |
535 | AC_ARG_ENABLE(ffmpeg, | 535 | AC_ARG_ENABLE(ffmpeg, |
536 | [AC_HELP_STRING([--enable-ffmpeg],[Enable FFmpeg support]) | 536 | [AC_HELP_STRING([--enable-ffmpeg],[Enable FFmpeg support]) |
@@ -543,16 +543,16 @@ AC_ARG_ENABLE(ffmpeg, | |||
543 | ffmpeg_enabled=1 | 543 | ffmpeg_enabled=1 |
544 | ;; | 544 | ;; |
545 | esac], | 545 | esac], |
546 | [ AC_MSG_RESULT(no) | 546 | [ AC_MSG_RESULT(yes) |
547 | ffmpeg_enabled=0]) | 547 | ffmpeg_enabled=1]) |
548 | AM_CONDITIONAL(HAVE_FFMPEG, test x$ffmpeg_enabled != x0) | ||
549 | if test x$ffmpeg_enabled = x1 | 548 | if test x$ffmpeg_enabled = x1 |
550 | then | 549 | then |
551 | AC_CHECK_HEADERS(libavutil/avutil.h ffmpeg/avutil.h) | 550 | ffmpeg_enabled=0 |
552 | AC_CHECK_HEADERS(libavformat/avformat.h ffmpeg/avformat.h) | 551 | AC_CHECK_LIB(swscale, sws_getContext, |
553 | AC_CHECK_HEADERS(libavcodec/avcodec.h ffmpeg/avcodec.h) | 552 | ffmpeg_enabled=1) |
554 | AC_CHECK_HEADERS(libswscale/swscale.h ffmpeg/swscale.h) | 553 | AC_CHECK_HEADERS([libavutil/avutil.h ffmpeg/avutil.h libavformat/avformat.h ffmpeg/avformat.h libavcodec/avcodec.h ffmpeg/avcodec.h libswscale/swscale.h ffmpeg/swscale.h]) |
555 | fi | 554 | fi |
555 | AM_CONDITIONAL(HAVE_FFMPEG, test x$ffmpeg_enabled != x0) | ||
556 | 556 | ||
557 | 557 | ||
558 | LE_INTLINCL="" | 558 | LE_INTLINCL="" |
@@ -658,8 +658,6 @@ fi | |||
658 | if test "x$ffmpeg_enabled" = "x0" | 658 | if test "x$ffmpeg_enabled" = "x0" |
659 | then | 659 | then |
660 | AC_MSG_NOTICE([NOTICE: FFmpeg thumbnailer plugin disabled]) | 660 | AC_MSG_NOTICE([NOTICE: FFmpeg thumbnailer plugin disabled]) |
661 | else | ||
662 | AC_MSG_NOTICE([NOTICE: FFmpeg thumbnailer plugin enabled (security untested)]) | ||
663 | fi | 661 | fi |
664 | 662 | ||
665 | if test "x$without_gtk" = "xtrue" | 663 | if test "x$without_gtk" = "xtrue" |