X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=9ceed415c8155e2f666cfd2165c54a9e2c42ac3f;hp=d7ec1c6e22b4c91e838e5c0257b24f1653356821;hb=51642118c156044133720d7b36e971fcb99b1e45;hpb=37083ef61b5d9d8406995de57e4b6319f46436a5

diff --git a/configure.ac b/configure.ac
index d7ec1c6e..9ceed415 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"
@@ -350,10 +353,8 @@ if test "$check_openssl" = "yes"; then
 	if test "$have_openssl" = "yes"; then
 		AC_DEFINE(HAVE_OPENSSL, 1, [define to 1 to turn on openssl support])
 		AC_SUBST(openssl_cppflags)
-		openssl_libs="$openssl_libs -lssl -lcrypto"
-		server_ldflags="$server_ldflags $openssl_libs"
-		client_ldflags="$client_ldflags $openssl_libs"
-		audiod_ldflags="$audiod_ldflags $openssl_libs"
+		openssl_ldflags="$openssl_libs -lssl -lcrypto"
+		AC_SUBST(openssl_ldflags)
 
 		server_errlist_objs="$server_errlist_objs crypt"
 		client_errlist_objs="$client_errlist_objs crypt"
@@ -392,10 +393,8 @@ if test "$check_gcrypt" = "yes"; then
 	if test "$have_gcrypt" = "yes"; then
 		AC_DEFINE(HAVE_GCRYPT, 1, [define to 1 to turn on gcrypt support])
 		AC_SUBST(gcrypt_cppflags)
-		gcrypt_libs="$gcrypt_libs -lgcrypt"
-		server_ldflags="$server_ldflags $gcrypt_libs"
-		client_ldflags="$client_ldflags $gcrypt_libs"
-		audiod_ldflags="$audiod_ldflags $gcrypt_libs"
+		gcrypt_ldflags="$gcrypt_libs -lgcrypt"
+		AC_SUBST(gcrypt_ldflags)
 
 		server_errlist_objs="$server_errlist_objs gcrypt"
 		client_errlist_objs="$client_errlist_objs gcrypt"
@@ -411,17 +410,10 @@ else
 fi
 ########################################################################### libsocket
 AC_CHECK_LIB([c], [socket],
-	[socket_lib=],
-	[socket_lib="-lsocket"]
+	[socket_ldlflags=],
+	[socket_ldflags="-lsocket"]
 )
-server_ldflags="$server_ldflags $socket_lib"
-client_ldflags="$client_ldflags $socket_lib"
-audioc_ldflags="$audioc_ldflags $socket_lib"
-audiod_ldflags="$audiod_ldflags $socket_lib"
-recv_ldflags="$recv_ldflags $socket_lib"
-AC_SEARCH_LIBS([connect],[socket],[],[
-	AC_MSG_ERROR([Fatal: Did not find connect().])
-],[])
+AC_SUBST(socket_ldflags)
 ########################################################################### libnsl
 AC_CHECK_LIB([c], [gethostbyname],
 	[nsl_lib=],
@@ -1147,7 +1139,6 @@ if test \( "$have_openssl" = "yes" -o "$have_gcrypt" = "yes" \) \
 		version
 		ggo
 	"
-	server_ldflags="$server_ldflags $osl_libs -losl"
 else
 	build_server="no"
 fi