From: Andre Noll <maan@systemlinux.org>
Date: Sun, 14 Nov 2010 14:32:45 +0000 (+0100)
Subject: Merge branch 't/server_optional'
X-Git-Tag: v0.4.5~11
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=e9db2928d524cca83bf44252c75286a905cef779;hp=3067991db050ae8b329474892ba0b75296f7382b

Merge branch 't/server_optional'
---

diff --git a/configure.ac b/configure.ac
index a7bd3e1a..f47a56df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -94,7 +94,7 @@ server_command_list afs_command_list audiod_command_list bitstream imdct wma_afh
 wma_common wmadec_filter buffer_tree
 "
 
-executables="server recv filter audioc write client afh audiod"
+executables="recv filter audioc write client afh audiod"
 
 recv_cmdline_objs="add_cmdline(recv http_recv dccp_recv udp_recv)"
 
@@ -257,14 +257,18 @@ fi
 AC_CHECK_HEADER(osl.h, [], have_osl=no)
 AC_CHECK_LIB([osl], [osl_open_table], [], have_osl=no)
 if test "$have_osl" = "no"; then
-	AC_MSG_ERROR([libosl not found, download it at
+	AC_MSG_WARN([libosl not found, can not build para_server.
+Download libosl at
 	http://systemlinux.org/~maan/osl
 or execute
 	git clone git://git.tuebingen.mpg.de/osl
 	])
+else
+	extras="$extras server"
+	executables="$executables server"
+	AC_SUBST(osl_cppflags)
+	server_ldflags="$server_ldflags -L$with_osl_libs"
 fi
-AC_SUBST(osl_cppflags)
-server_ldflags="$server_ldflags -L$with_osl_libs"
 CPPFLAGS="$OLD_CPPFLAGS"
 LDFLAGS="$OLD_LDFLAGS"
 LIBS="$OLD_LIBS"