From: Andre Noll <maan@systemlinux.org>
Date: Fri, 13 Sep 2013 06:28:55 +0000 (+0000)
Subject: build: ldflags conversion: libosl.
X-Git-Tag: v0.5.1~1^2~34
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=52ac85177056d375e79d1df838d40a35b78a3e55;ds=sidebyside

build: ldflags conversion: libosl.

Straight-forward transformation.
---

diff --git a/Makefile.in b/Makefile.in
index e92e0eb5..1e158ec9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,6 +35,7 @@ alsa_ldflags := @alsa_ldflags@
 ao_ldflags := @ao_ldflags@
 readline_ldflags := @readline_ldflags@
 samplerate_ldflags := @samplerate_ldflags@
+osl_ldflags := @osl_ldflags@
 
 build_date := $(shell date)
 uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
@@ -271,6 +272,7 @@ endif
 para_recv para_afh para_play para_server: LDFLAGS += $(id3tag_ldflags)
 para_write para_play para_audiod: LDFLAGS += $(ao_ldflags)
 para_client para_audioc para_play : LDFLAGS += $(readline_ldflags)
+para_server: LDFLAGS += $(osl_ldflags)
 
 para_audiod \
 para_filter \
diff --git a/configure.ac b/configure.ac
index d7ec1c6e..48b75ec5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -287,7 +287,11 @@ 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
+if test "$have_osl" = "yes"; then
+	AC_SUBST(osl_cppflags)
+	osl_ldflags="$osl_libs -losl"
+	AC_SUBST(osl_ldflags)
+else
 	AC_MSG_WARN([libosl not found, can not build para_server.
 Download libosl at
 	http://systemlinux.org/~maan/osl
@@ -295,7 +299,6 @@ or execute
 	git clone git://git.tuebingen.mpg.de/osl
 	])
 fi
-AC_SUBST(osl_cppflags)
 CPPFLAGS="$OLD_CPPFLAGS"
 LDFLAGS="$OLD_LDFLAGS"
 LIBS="$OLD_LIBS"
@@ -1147,7 +1150,6 @@ if test \( "$have_openssl" = "yes" -o "$have_gcrypt" = "yes" \) \
 		version
 		ggo
 	"
-	server_ldflags="$server_ldflags $osl_libs -losl"
 else
 	build_server="no"
 fi