From: Andre Noll <maan@systemlinux.org>
Date: Thu, 9 Jul 2009 14:14:19 +0000 (+0200)
Subject: Merge commit 'meins/next' into next
X-Git-Tag: v0.4.0~54
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=a37e903213215dd36b11bbde4ea98e1d4590a472;hp=516425bb4bd508e036169a8829e1ad04e7a099cd

Merge commit 'meins/next' into next
---

diff --git a/Makefile.in b/Makefile.in
index 05d7b3e0..d8b82e60 100644
--- 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/command.c b/command.c
index afa1e667..8fdb839a 100644
--- a/command.c
+++ b/command.c
@@ -778,7 +778,7 @@ __noreturn void handle_connect(int fd, const char *peername)
 		numbytes = 256;
 		get_random_bytes_or_die((unsigned char *)buf, numbytes);
 	}
-	PARA_DEBUG_LOG("sending %zu byte challenge + rc4 keys (%u bytes)\n",
+	PARA_DEBUG_LOG("sending %u byte challenge + rc4 keys (%zu bytes)\n",
 		CHALLENGE_SIZE, numbytes);
 	ret = send_bin_buffer(fd, buf, numbytes);
 	if (ret < 0)
@@ -788,7 +788,7 @@ __noreturn void handle_connect(int fd, const char *peername)
 	if (ret < 0)
 		goto net_err;
 	numbytes = ret;
-	PARA_DEBUG_LOG("received %zu bytes challenge response\n", ret);
+	PARA_DEBUG_LOG("received %d bytes challenge response\n", ret);
 	ret = -E_BAD_USER;
 	if (!u)
 		goto net_err;
diff --git a/configure.ac b/configure.ac
index 61421b5d..2da62d6c 100644
--- 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