Changeset 5779 for pjproject/trunk/aconfigure

Timestamp:

Apr 9, 2018 12:30:48 PM (6 years ago)

Author:

riza

Message:

Re #2059 (misc): Fix some warnings related to use of external Portaudio.
Thanks to Alexander Traud for the report and patch.

File:

• pjproject/trunk/aconfigure (modified) (7 diffs)

pjproject/trunk/aconfigure

@@ -763 +763 @@
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
@@ -888 +889 @@
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
@@ -1140 +1142 @@
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
@@ -1277 +1288 @@
                 datadir sysconfdir sharedstatedir localstatedir includedir \
                 oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-                libdir localedir mandir
+                libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
@@ -1430 +1441 @@
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
@@ -6362 +6374 @@
         ;;
   *)
-                ac_pjmedia_snd=alsa
-        ac_pa_use_alsa=1
-
-        ac_fn_c_check_header_mongrel "$LINENO" "alsa/version.h" "ac_cv_header_alsa_version_h" "$ac_includes_default"
+        if test "x$ac_external_pa" != "x1"; then
+                                ac_pjmedia_snd=alsa
+                ac_pa_use_alsa=1
+
+                ac_fn_c_check_header_mongrel "$LINENO" "alsa/version.h" "ac_cv_header_alsa_version_h" "$ac_includes_default"
 if test "x$ac_cv_header_alsa_version_h" = xyes; then :
   LIBS="$LIBS -lasound"
@@ -6373 +6386 @@
 
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... unix" >&5
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... unix" >&5
 $as_echo "Checking sound device backend... unix" >&6; }
 
-                ac_pa_use_oss=1
-
-        # Check whether --enable-oss was given.
+                                ac_pa_use_oss=1
+
+                # Check whether --enable-oss was given.
 if test "${enable_oss+set}" = set; then :
   enableval=$enable_oss;
-                        if test "$enable_oss" = "no"; then
-                         ac_pa_use_oss=0
-                         { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if OSS audio is disabled... yes" >&5
+                                if test "$enable_oss" = "no"; then
+                                 ac_pa_use_oss=0
+                                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if OSS audio is disabled... yes" >&5
 $as_echo "Checking if OSS audio is disabled... yes" >&6; }
-                        fi
-
-fi
-
+                                fi
+
+fi
+
+        fi
         ;;
  esac