[farsight2/master] Only stop on missing libnice if it was explicitely requested by the user

[Olivier Crête]

---
 configure.ac |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 66edd42..da78fad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -148,6 +148,8 @@ AC_SUBST(FS2_TRANSMITTER_PLUGINS_ALL)
 
 FS2_TRANSMITTER_PLUGINS_SELECTED=""
 
+TRANSMITTERS_DEFAULT=yes
+
 AC_ARG_WITH(transmitter-plugins,
     AC_HELP_STRING([--with-transmitter-plugins],
       [comma-separated list of plug-ins to compile]),
@@ -158,11 +160,11 @@ AC_ARG_WITH(transmitter-plugins,
         else
             echo "plug-in $i not recognized, ignoring..."
         fi
-    done],
+    done
+    TRANSMITTERS_DEFAULT=no],
     [FS2_TRANSMITTER_PLUGINS_SELECTED=$FS2_TRANSMITTER_PLUGINS_ALL])
 
 
-
 dnl check for libnice
 if echo $FS2_TRANSMITTER_PLUGINS_SELECTED | grep -qi nice; then
 
@@ -170,8 +172,20 @@ if echo $FS2_TRANSMITTER_PLUGINS_SELECTED | grep -qi nice; then
 
   PKG_CHECK_MODULES(NICE, \
        nice >= $NICE_REQUIRED,
-       USE_NICE=yes,
-       AC_MSG_ERROR([Could not build libnice plugin because libnice is not installed]) )
+       HAVE_NICE=yes,
+       HAVE_NICE=no)
+
+  if test "x$HAVE_NICE" = "xno"; then
+    if test "x$TRANSMITTERS_DEFAULT" = "xyes"; then
+      FS2_TRANSMITTER_PLUGINS_SELECTED="${FS2_TRANSMITTER_PLUGINS_SELECTED/ nice/}"
+      AC_MSG_WARN([Will not build libnice transmitter because libnice is not available])
+    else
+      AC_MSG_ERROR([Can not build requested libnice transmitter because libnice is not installed])
+    fi
+  else
+    USE_NICE=yes
+  fi
+
   AC_SUBST(NICE_CFLAGS)
   AC_SUBST(NICE_LIBS)
 else
-- 
1.5.6.5