configure: Add config options for libosl.

This adds --with-osl-headers and --with-osl-libs to allow linking against
a version of libosl which is not installed at a standard location.

diff --git a/Makefile.in b/Makefile.in
index 05d7b3e016942b128c11a7397455b74376df6873..d8b82e60d61b6c9bcc66dd9d539811505573e411 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -56,6 +56,7 @@ CPPFLAGS += @SSL_CPPFLAGS@
 CPPFLAGS += @ncurses_cppflags@
 CPPFLAGS += @arch_cppflags@
 CPPFLAGS += -I/usr/local/include
+CPPFLAGS += @osl_cppflags@
 
 BINARIES = para_server para_client para_audioc para_recv \
        para_filter para_write para_afh @extra_binaries@

diff --git a/configure.ac b/configure.ac
index 61421b5d111e6f8612deb7ad5528cfd91a9e91d7..2da62d6c781f20a25d79488ed135202ea8ac0bf5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -153,6 +153,22 @@ fade_errlist_objs="fade exec string fd"
 
 ########################################################################### osl
 have_osl=yes
+OLD_CPPFLAGS="$CPPFLAGS"
+OLD_LD_FLAGS="$LDFLAGS"
+OLD_LIBS="$LIBS"
+AC_ARG_WITH(osl_headers, [AC_HELP_STRING(--with-osl-headers=dir,
+       [look for osl.h also in dir])])
+if test -n "$with_osl_headers"; then
+       osl_cppflags="-I$with_osl_headers"
+       CPPFLAGS="$CPPFLAGS $osl_cppflags"
+fi
+AC_ARG_WITH(osl_libs, [AC_HELP_STRING(--with-osl-libs=dir,
+       [look for libosl also in dir])])
+if test -n "$with_osl_lib"; then
+       osl_libs="-L$with_osl_lib"
+       LDFLAGS="$LDFLAGS $osl_libs"
+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
@@ -162,6 +178,11 @@ Install the library with
        (cd osl && make && sudo make install)
        ])
 fi
+AC_SUBST(osl_cppflags)
+server_ldflags="$server_ldflags -L$with_osl_lib"
+CPPFLAGS="$OLD_CPPFLAGS"
+LDFLAGS="$OLD_LDFLAGS"
+LIBS="$OLD_LIBS"
 ########################################################################### ssl
 dnl @synopsis CHECK_SSL
 dnl