Changeset 4149 for pjproject/trunk/aconfigure.ac

Timestamp:

Jun 1, 2012 4:27:01 AM (12 years ago)

Author:

ming

Message:

Fixed #1525: Modify configure script to disable autodetection when cross-compiling.

This fix disable autodetection for:

• SDL
• ffmpeg
• SSL
• OpenCORE AMR-NB

File:

• pjproject/trunk/aconfigure.ac (modified) (9 diffs)

pjproject/trunk/aconfigure.ac

@@ -105 +105 @@
         ;;
 esac
+
+AC_SUBST(ac_cross_compile)
+if test "$build" = "$host"; then
+    ac_cross_compile=
+else
+    ac_cross_compile=${host_orig}-
+fi
 
 AC_CHECK_LIB(pthread,pthread_create)
@@ -831 +838 @@
     )
 
+dnl # Do not use default SDL installation if we are cross-compiling
+if test "x$ac_cross_compile" != "x" -a "x$with_sdl" = "xno"; then
+    enable_sdl=no
+fi
+
 dnl # SDL
 AC_ARG_ENABLE(sdl,
@@ -860 +872 @@
               ])
 
+
+AC_ARG_WITH(ffmpeg,
+    AC_HELP_STRING([--with-ffmpeg=DIR],
+                   [Specify alternate FFMPEG prefix]),
+    [],
+    [with_ffmpeg=no]
+    )
+
+dnl # Do not use default ffmpeg installation if we are cross-compiling
+if test "x$ac_cross_compile" != "x" -a "x$with_ffmpeg" = "xno"; then
+    enable_ffmpeg=no
+fi
 
 dnl # FFMPEG stuffs
@@ -984 +1008 @@
               )
 
-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,
@@ -1254 +1270 @@
 dnl #
 
+dnl # SSL alt prefix
+AC_ARG_WITH(ssl,
+    AC_HELP_STRING([--with-ssl=DIR],
+                   [Specify alternate libssl prefix]),
+    [],
+    [with_ssl=no]
+    )
+
+dnl # Do not use default SSL installation if we are cross-compiling
+if test "x$ac_cross_compile" != "x" -a "x$with_ssl" = "xno"; then
+    enable_ssl=no
+fi
+
 dnl # Include SSL support
 AC_SUBST(ac_no_ssl)
@@ -1268 +1297 @@
               [
                 AC_MSG_RESULT([checking for OpenSSL installations..])
+                if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then
+                    CFLAGS="$CFLAGS -I$with_ssl/include"
+                    LDFLAGS="$LDFLAGS -L$with_ssl/lib"
+                    AC_MSG_RESULT([Using SSL prefix... $with_ssl])
+                fi
                 AC_SUBST(openssl_h_present)
                 AC_SUBST(libssl_present)
@@ -1284 +1318 @@
               ])
 
+dnl # opencore-amrnb alt prefix
+AC_ARG_WITH(opencore-amrnb,
+    AC_HELP_STRING([--with-opencore-amrnb=DIR],
+                   [Specify alternate libopencore-amrnb prefix]),
+    [],
+    [with_opencore_amrnb=no]
+    )
+
+dnl # Do not use default opencore-amrnb installation if we are cross-compiling
+if test "x$ac_cross_compile" != "x" -a "x$with_opencore_amrnb" = "xno"; then
+    enable_opencore_amrnb=no
+fi
+
 dnl # Include opencore-amrnb support
 AC_SUBST(ac_no_opencore_amrnb)
@@ -1299 +1346 @@
               [
                 AC_MSG_RESULT([checking for OpenCORE AMR-NB installations..])
+                if test "x$with_opencore_amrnb" != "xno" -a "x$with_opencore_amrnb" != "x"; then
+                    CFLAGS="$CFLAGS -I$with_opencore_amrnb/include"
+                    LDFLAGS="$LDFLAGS -L$with_opencore_amrnb/lib"
+                    AC_MSG_RESULT([Using OpenCORE AMR-NB prefix... $with_opencore_amrnb])
+                fi                
                 AC_SUBST(opencore_amrnb_h_present)
                 AC_SUBST(opencore_amrnb_present)
@@ -1381 +1433 @@
 
 AC_SUBST(target)
-AC_SUBST(ac_cross_compile)
-if test "$build" = "$host"; then
-    ac_cross_compile=
-else
-    ac_cross_compile=${host_orig}-
-fi
 AC_SUBST(ac_linux_poll,select)
 AC_SUBST(ac_host,unix)