build: ldflags conversion: libosl.

Straight-forward transformation.

diff --git a/Makefile.in b/Makefile.in
index e92e0eb534388d21e0cc9e2d6ad3fd1cc8eaa58f..1e158ec998f994641a52e0a545c8784e198e8ec2 100644 (file)
--- 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@
 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")
 
 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_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 \
 
 para_audiod \
 para_filter \

diff --git a/configure.ac b/configure.ac
index d7ec1c6e22b4c91e838e5c0257b24f1653356821..48b75ec5804dbb0603bd7d9b5d7b65aaf5bad272 100644 (file)
--- 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)
 
 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
        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
        git clone git://git.tuebingen.mpg.de/osl
        ])
 fi

-AC_SUBST(osl_cppflags)

 CPPFLAGS="$OLD_CPPFLAGS"
 LDFLAGS="$OLD_LDFLAGS"
 LIBS="$OLD_LIBS"
 CPPFLAGS="$OLD_CPPFLAGS"
 LDFLAGS="$OLD_LDFLAGS"
 LIBS="$OLD_LIBS"


@@ -1147,7 +1150,6 @@ if test \( "$have_openssl" = "yes" -o "$have_gcrypt" = "yes" \) \
                version
                ggo
        "
                version
                ggo
        "

-       server_ldflags="$server_ldflags $osl_libs -losl"

 else
        build_server="no"
 fi
 else
        build_server="no"
 fi