Changeset 5814 for pjproject/trunk/aconfigure.ac

Timestamp:

Jun 26, 2018 7:08:24 AM (6 years ago)

Author:

nanang

Message:

Misc (re #2059): Updated configure script to:

• make sure that C++ compiler is available, and
• disable ALSA when ALSA development library is not found.

Thanks Alexander Traud for the feedbacks.

File:

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

pjproject/trunk/aconfigure.ac

@@ -36 +36 @@
 AC_PROG_CXX
 AC_LANG([C])
+
+dnl Make sure C++ compiler works
+AC_LANG_PUSH([C++])
+AC_TRY_LINK([], [], , AC_MSG_ERROR([C++ compiler does not work]))
+AC_LANG_POP([C++])
 
 AC_PROG_RANLIB
@@ -670 +675 @@
 AC_ARG_WITH(external-pa,
     AS_HELP_STRING([--with-external-pa],
-                   [Use external PortAudio development files, not the one in "third_party" directory. When this option is set, make sure that PortAudio is accessible to use (hint: use CFLAGS and LDFLAGS env var to set the include/lib paths)]),
+                   [Use external PortAudio development files. When this option is set, make sure that PortAudio is accessible to use (hint: use CFLAGS and LDFLAGS env var to set the include/lib paths)]),
     [
         if test "x$with_external_pa" != "xno"; then
@@ -720 +725 @@
                 #ac_pa_cflags="$ac_pa_cflags -DPA_OLD_CORE_AUDIO -DMOSX_USE_NON_ATOMIC_FLAG_BITS"
                 #AC_MSG_RESULT([Setting additional PortAudio CFLAGS.. -DPA_OLD_CORE_AUDIO -DMOSX_USE_NON_ATOMIC_FLAG_BITS])
-                ac_pjmedia_snd=pa_old_darwinos
+                #ac_pjmedia_snd=pa_old_darwinos
                 AC_MSG_RESULT([Checking sound device backend... old coreaudio])
         else
@@ -738 +743 @@
         if test "x$ac_external_pa" != "x1"; then
                 dnl # Check if ALSA is available
-                ac_pjmedia_snd=alsa
-                AC_SUBST(ac_pa_use_alsa,1)
                 AC_CHECK_HEADER(alsa/version.h,
-                                [LIBS="$LIBS -lasound"],
-                                [ac_pa_use_alsa=0])
-                AC_MSG_RESULT([Checking sound device backend... unix])
-
-                dnl # Check if OSS is disabled
-                AC_SUBST(ac_pa_use_oss,1)
-                AC_ARG_ENABLE(oss,
-                              AS_HELP_STRING([--disable-oss],
-                                             [Disable OSS audio (default: not disabled)]),
-                              [
-                                if test "$enable_oss" = "no"; then
-                                 [ac_pa_use_oss=0]
-                                 AC_MSG_RESULT([Checking if OSS audio is disabled... yes])
-                                fi
-                              ])
+                                [LIBS="$LIBS -lasound"
+                                 ac_pjmedia_snd=alsa])
+                if test "x$ac_pjmedia_snd" = "xalsa"; then
+                        AC_MSG_RESULT([Checking sound device backend... alsa])
+                else
+                        ac_pjmedia_snd=null
+                        AC_MSG_RESULT([Checking sound device backend... null sound])
+                fi
         fi
         ;;