diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2014-02-28 13:18:35 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2014-02-28 13:18:35 +0100 |
| commit | 58d7fcd0db89cdc62e9362aa6d63c88843f2837d (patch) | |
| tree | c4656b1b871e1fc044c66d06bfa8bfb47e2bedc2 /configure.ac | |
| parent | d9f6727654cad16951b0e8ca85c1c8e1263421bf (diff) | |
| download | fdk-aac-58d7fcd0db89cdc62e9362aa6d63c88843f2837d.tar.gz fdk-aac-58d7fcd0db89cdc62e9362aa6d63c88843f2837d.tar.bz2 fdk-aac-58d7fcd0db89cdc62e9362aa6d63c88843f2837d.zip | |
Add PAD (MOT and Slideshow) encoder from www.csp.it
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index 98f4066..5283420 100644 --- a/configure.ac +++ b/configure.ac @@ -7,15 +7,6 @@ AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([tar-ustar foreign]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -dnl Various options for configure -AC_ARG_ENABLE([example], - [AS_HELP_STRING([--enable-example], - [enable example encoding program (default is no)])], - [example=$enableval], [example=no]) - -dnl Automake conditionals to set -AM_CONDITIONAL(EXAMPLE, test x$example = xyes) - dnl Checks for programs. AC_PROG_CC AC_PROG_CXX @@ -24,15 +15,16 @@ LT_INIT AC_CHECK_LIB([m], [sin]) -# fdk-aac-dabplus-zmq needs ZeroMQ -AC_ARG_ENABLE([zmq], - [AS_HELP_STRING([--enable-zmq], [Enable fdk-aac-dabplus-zmq with ZeroMQ output])] - ) - -AS_IF(test "x$enable_zmq" = "xyes", - AC_CHECK_LIB(zmq, zmq_init, , AC_MSG_ERROR(ZeroMQ libzmq is required))) +AC_CHECK_LIB(zmq, zmq_init, , AC_MSG_ERROR(ZeroMQ libzmq is required)) -AM_CONDITIONAL(HAVE_ZEROMQ_TEST, test "x$enable_zmq" = "xyes") +if pkg-config MagickWand; then + MAGICKWAND_CFLAGS=`pkg-config MagickWand --cflags` + MAGICKWAND_LDADD=`pkg-config MagickWand --libs` + AC_SUBST(MAGICKWAND_CPPFLAGS) + AC_SUBST(MAGICKWAND_LDADD) +else + AC_MSG_ERROR(MagickWand not found) +fi dnl soname version to use dnl goes by ‘current[:revision[:age]]’ with the soname ending up as |