Changeset 3533

Timestamp:

Apr 13, 2011 7:13:56 PM (14 years ago)

Author:

bennylp

Message:

Re #1219: added configure option to specify ffmpeg path

Location:

pjproject/branches/projects/2.0-dev

Files:

• aconfigure (modified) (4 diffs)
• aconfigure.ac (modified) (2 diffs)

pjproject/branches/projects/2.0-dev/aconfigure

@@ -730 +730 @@
 enable_sdl
 enable_ffmpeg
+with_ffmpeg
 enable_v4l2
 enable_ipp
@@ -1410 +1411 @@
                           (hint: use CFLAGS and LDFLAGS env var to set the
                           include/lib paths)
+  --with-ffmpeg=DIR       Specify alternate FFMPEG prefix
   --with-ipp=DIR          Specify the Intel IPP location
   --with-ipp-samples=DIR  Specify the Intel IPP samples location
@@ -5922 +5924 @@
 
 
+                FFMPEG_PREFIX=""
+                if test "x$with_ffmpeg" != "xno" -a "x$with_ffmpeg" != "x"; then
+                        FFMPEG_PREFIX=$with_ffmpeg
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using ffmpeg prefix... $FFMPEG_PREFIX" >&5
+$as_echo "Using ffmpeg prefix... $FFMPEG_PREFIX" >&6; }
+                        LIBS="-L$FFMPEG_PREFIX/lib $LIBS"
+                        CFLAGS="-I$FFMPEG_PREFIX/include $CFLAGS"
+                fi
+
                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for avdevice_version in -lavdevice" >&5
 $as_echo_n "checking for avdevice_version in -lavdevice... " >&6; }
@@ -6184 +6195 @@
 
 fi
+
+
+
+# Check whether --with-ffmpeg was given.
+if test "${with_ffmpeg+set}" = set; then :
+  withval=$with_ffmpeg;
+else
+  with_ffmpeg=no
+
+fi
+
 
 

pjproject/branches/projects/2.0-dev/aconfigure.ac

@@ -785 +785 @@
                 AC_SUBST(ac_ffmpeg_ldflags)
 
+                FFMPEG_PREFIX=""
+                if test "x$with_ffmpeg" != "xno" -a "x$with_ffmpeg" != "x"; then
+                        FFMPEG_PREFIX=$with_ffmpeg
+                        AC_MSG_RESULT([Using ffmpeg prefix... $FFMPEG_PREFIX])
+                        LIBS="-L$FFMPEG_PREFIX/lib $LIBS"
+                        LDFLAGS="-L$FFMPEG_PREFIX/lib $LDFLAGS"
+                        CFLAGS="-I$FFMPEG_PREFIX/include $CFLAGS"
+                fi
+
                 AC_CHECK_LIB(avdevice,
                              avdevice_version,
@@ -825 +834 @@
               )
 
+AC_ARG_WITH(ffmpeg,
+    AC_HELP_STRING([--with-ffmpeg=DIR],
+                   [Specify alternate FFMPEG prefix]),
+    [],
+    [with_ffmpeg=no]
+    )
+
+
 dnl # Video for Linux 2
 AC_ARG_ENABLE(v4l2,