X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=configure.ac;h=68fed0bbbdacc2c24f4a4c2dab7ea04bfc3ce761;hb=9139d9496058d888d33524d80414600f75f795a1;hp=61365e632a5ad8cd73c1b45917f76b662064983c;hpb=ce82736ddc9b974ed538ddf0ab7fae80fb5fc5d3;p=paraslash.git

diff --git a/configure.ac b/configure.ac
index 61365e63..68fed0bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -410,29 +410,16 @@ 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=],
-	[nsl_lib="-lnsl"]
+	[nsl_ldflags=],
+	[nsl_ldflags="-lnsl"]
 )
-server_ldflags="$server_ldflags $nsl_lib"
-client_ldflags="$client_ldflags $nsl_lib"
-audioc_ldflags="$audioc_ldflags $nsl_lib"
-recv_ldflags="$recv_ldflags $nsl_lib"
-AC_SEARCH_LIBS([inet_ntoa],[nsl],[],[
-	AC_MSG_ERROR([Fatal: Did not find inet_ntoa().])
-],[])
+AC_SUBST(nsl_ldflags)
 ########################################################################### ucred
 AC_MSG_CHECKING(for struct ucred)
 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
@@ -516,19 +503,17 @@ if test ${have_core_audio} = yes; then
 	f2="-framework AudioToolbox"
 	f3="-framework AudioUnit"
 	f4="-framework CoreServices"
-	f="$f1 $f2 $f3 $f4"
+	core_audio_ldflags="$f1 $f2 $f3 $f4"
+	AC_SUBST(core_audio_ldflags)
 
 	audiod_errlist_objs="$audiod_errlist_objs osx_write ipc"
 	audiod_cmdline_objs="$audiod_cmdline_objs osx_write.cmdline"
-	audiod_ldflags="$audiod_ldflags $f"
 
 	play_errlist_objs="$play_errlist_objs osx_write ipc"
 	play_cmdline_objs="$play_cmdline_objs osx_write.cmdline"
-	play_ldflags="$play_ldflags $f"
 
 	write_errlist_objs="$write_errlist_objs osx_write ipc"
 	write_cmdline_objs="$write_cmdline_objs osx_write.cmdline"
-	write_ldflags="$write_ldflags $f"
 	writers="$writers osx"
 	default_writer="OSX_WRITE"
 	AC_DEFINE(HAVE_CORE_AUDIO, 1, define to 1 on Mac Os X)