Use Automake for Audacity.

m4/audacity_checklib_ffmpeg.m4

@@ -2,7 +2,7 @@ dnl Todo: Add Audacity / FFmpeg license
 dnl
 dnl Please increment the serial number below whenever you alter this macro
 dnl for the benefit of automatic macro update systems
-# audacity_checklib_ffmpeg.m4 serial 1
+# audacity_checklib_ffmpeg.m4 serial 2
 dnl Check for a copy of ffmpeg, whoose headers we will use for the importer
 AC_DEFUN([AUDACITY_CHECKLIB_FFMPEG], [
    AC_ARG_WITH(ffmpeg,
@@ -11,11 +11,6 @@ AC_DEFUN([AUDACITY_CHECKLIB_FFMPEG], [
                FFMPEG_ARGUMENT=$withval,
                FFMPEG_ARGUMENT="unspecified")
 
-   if false ; then
-      AC_DEFINE(USE_FFMPEG, 1,
-                [Define if ffmpeg (multi-format import and export) support should be enabled])
-   fi
-
    dnl Check for a system copy of ffmpeg to use. For now I'm insiting on a
    dnl current version to make maintenance easier. We need both avcodec and
    dnl avformat, so I'm going to check for both
@@ -30,28 +25,16 @@ AC_DEFUN([AUDACITY_CHECKLIB_FFMPEG], [
                      libavutil_available_system="yes",
                      libavutil_available_system="no")
 
-   FFMPEG_SYSTEM_AVAILABLE="no"
    if test "$avcodec_available_system" = "yes" -a "$avformat_available_system" = "yes" -a "$libavutil_available_system" = "yes"; then
       FFMPEG_SYSTEM_AVAILABLE="yes"
-      FFMPEG_SYSTEM_CXXFLAGS="$AVCODEC_CFLAGS $AVFORMAT_CFLAGS $AVUTIL_CFLAGS"
-      FFMPEG_SYSTEM_CPPSYMBOLS="USE_FFMPEG"
-      if test "x$dynamic_loading" = "xno"; then
-         FFMPEG_SYSTEM_LIBS="$AVCODEC_LIBS $AVFORMAT_LIBS $AVUTIL_LIBS"
-         AC_DEFINE(DISABLE_DYNAMIC_LOADING_FFMPEG, 1, [Use system FFmpeg library and disable dynamic loading of it.])
-      fi
-      dnl build the extra object files needed to use FFmpeg. Paths inside
-      dnl the audacity src/ dir, as this is subsitiuted into src/Makefile.in
-      FFMPEG_SYSTEM_OPTOBJS="import/ImportFFmpeg.o export/ExportFFmpeg.o \
-         export/ExportFFmpegDialogs.o"
       AC_MSG_NOTICE([FFmpeg library available as system library])
-   fi
-   if test "x$FFMPEG_SYSTEM_AVAILABLE" = "xno" ; then
+   else
+      FFMPEG_SYSTEM_AVAILABLE="no"
       AC_MSG_NOTICE([FFmpeg library NOT available as system library])
    fi
 
    dnl see if ffmpeg is available locally, or rather that we have some headers
    dnl in lib-src/ffmpeg/ we can use.
-   FFMPEG_LOCAL_AVAILABLE="no"
    AC_CHECK_FILE(${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h,
                  avcodec_h_found="yes",
                  avcodec_h_found="no")
@@ -60,22 +43,41 @@ AC_DEFUN([AUDACITY_CHECKLIB_FFMPEG], [
                  avformat_h_found="yes",
                  avformat_h_found="no")
 
-   if test "x$avcodec_h_found" = "xyes" ; then
-      if test "x$avformat_h_found" = "xyes" ; then
-         FFMPEG_LOCAL_AVAILABLE="yes"
-         FFMPEG_LOCAL_LIBS=""
-         FFMPEG_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/ffmpeg'
-         FFMPEG_LOCAL_CPPSYMBOLS="USE_FFMPEG"
-         dnl build the extra object files needed to use FFmpeg. Paths inside
-         dnl the audacity src/ dir, as this is subsitiuted into src/Makefile.in
-         FFMPEG_LOCAL_OPTOBJS="import/ImportFFmpeg.o export/ExportFFmpeg.o \
-            export/ExportFFmpegDialogs.o"
-         AC_MSG_NOTICE([FFmpeg headers are available in the local tree])
-      fi
-   fi
-   if test "x$FFMPEG_LOCAL_AVAILABLE" = "xno" ; then
+   if test "$avcodec_h_found" = "yes" -a "$avformat_h_found" = "yes"; then
+      FFMPEG_LOCAL_AVAILABLE="yes"
+      AC_MSG_NOTICE([FFmpeg headers are available in the local tree])
+   else
+      FFMPEG_LOCAL_AVAILABLE="no"
       AC_MSG_NOTICE([ffmpeg library is NOT available in the local tree])
    fi
 
    FFMPEG_MIMETYPES="audio/aac;audio/ac3;audio/mp4;audio/x-ms-wma;video/mpeg;"
 ])
+
+AC_DEFUN([AUDACITY_CONFIG_FFMPEG], [
+   if test "$FFMPEG_USE_LOCAL" = yes; then
+      FFMPEG_CFLAGS='-I$(top_srcdir)/lib-src/ffmpeg'
+      FFMPEG_LIBS=""
+   fi
+   if test "$FFMPEG_USE_SYSTEM" = yes; then
+      FFMPEG_CFLAGS="$AVCODEC_CFLAGS $AVFORMAT_CFLAGS $AVUTIL_CFLAGS"
+      if test "$dynamic_loading" = "no"; then
+         FFMPEG_LIBS="$AVCODEC_LIBS $AVFORMAT_LIBS $AVUTIL_LIBS"
+         AC_DEFINE(DISABLE_DYNAMIC_LOADING_FFMPEG, 1,
+                   [Use system FFmpeg library and disable dynamic loading of it.])
+      else
+         FFMPEG_LIBS=""
+      fi
+   fi
+
+   AC_SUBST([FFMPEG_CFLAGS])
+   AC_SUBST([FFMPEG_LIBS])
+
+   AM_CONDITIONAL([USE_FFMPEG], [test "$FFMPEG_USE_LOCAL" = yes -o "$FFMPEG_USE_SYSTEM" = yes])
+   AM_CONDITIONAL([USE_LOCAL_FFMPEG], [test "$FFMPEG_USE_LOCAL" = yes])
+
+   if test "$FFMPEG_USE_LOCAL" = yes -o "$FFMPEG_USE_SYSTEM" = yes; then
+      AC_DEFINE(USE_FFMPEG, 1,
+                [Define if ffmpeg (multi-format import and export) support should be enabled])
+   fi
+])