From fae0427324269e420d8ea5774f2fab2330acda9d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 24 Feb 2010 12:25:48 +0000 Subject: [PATCH] * ADDITIONAL_NETWORK_LIBS -> LIBS. --- configure.ac | 3 +-- src/libstore/Makefile.am | 3 +-- src/nix-env/Makefile.am | 2 +- src/nix-hash/Makefile.am | 2 +- src/nix-instantiate/Makefile.am | 2 +- src/nix-store/Makefile.am | 2 +- src/nix-worker/Makefile.am | 2 +- 7 files changed, 7 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index d5db92af3..df6508fcb 100644 --- a/configure.ac +++ b/configure.ac @@ -79,8 +79,7 @@ fi # Solaris-specific stuff. if test "$sys_name" = "sunos"; then # Solaris requires -lsocket -lnsl for network functions - ADDITIONAL_NETWORK_LIBS="-lsocket -lnsl" - AC_SUBST(ADDITIONAL_NETWORK_LIBS) + LIBS="-lsocket -lnsl $LIBS" fi AC_PROG_CC diff --git a/src/libstore/Makefile.am b/src/libstore/Makefile.am index b19238e7d..dbfc1474e 100644 --- a/src/libstore/Makefile.am +++ b/src/libstore/Makefile.am @@ -10,8 +10,7 @@ pkginclude_HEADERS = \ globals.hh references.hh pathlocks.hh \ worker-protocol.hh -libstore_la_LIBADD = ../libutil/libutil.la ../boost/format/libformat.la \ - @ADDITIONAL_NETWORK_LIBS@ +libstore_la_LIBADD = ../libutil/libutil.la ../boost/format/libformat.la BUILT_SOURCES = derivations-ast.cc derivations-ast.hh diff --git a/src/nix-env/Makefile.am b/src/nix-env/Makefile.am index 35585602e..07b29c186 100644 --- a/src/nix-env/Makefile.am +++ b/src/nix-env/Makefile.am @@ -3,7 +3,7 @@ bin_PROGRAMS = nix-env nix_env_SOURCES = nix-env.cc profiles.cc profiles.hh help.txt nix_env_LDADD = ../libmain/libmain.la ../libexpr/libexpr.la \ ../libstore/libstore.la ../libutil/libutil.la \ - ../boost/format/libformat.la ${aterm_lib} ${sqlite_lib} @ADDITIONAL_NETWORK_LIBS@ + ../boost/format/libformat.la ${aterm_lib} ${sqlite_lib} nix-env.o: help.txt.hh diff --git a/src/nix-hash/Makefile.am b/src/nix-hash/Makefile.am index 11d2a2d8d..d7c569b68 100644 --- a/src/nix-hash/Makefile.am +++ b/src/nix-hash/Makefile.am @@ -2,7 +2,7 @@ bin_PROGRAMS = nix-hash nix_hash_SOURCES = nix-hash.cc help.txt nix_hash_LDADD = ../libmain/libmain.la ../libstore/libstore.la ../libutil/libutil.la \ - ../boost/format/libformat.la ${aterm_lib} ${sqlite_lib} @ADDITIONAL_NETWORK_LIBS@ + ../boost/format/libformat.la ${aterm_lib} ${sqlite_lib} nix-hash.o: help.txt.hh diff --git a/src/nix-instantiate/Makefile.am b/src/nix-instantiate/Makefile.am index 6b9a95943..f39331805 100644 --- a/src/nix-instantiate/Makefile.am +++ b/src/nix-instantiate/Makefile.am @@ -3,7 +3,7 @@ bin_PROGRAMS = nix-instantiate nix_instantiate_SOURCES = nix-instantiate.cc help.txt nix_instantiate_LDADD = ../libmain/libmain.la ../libexpr/libexpr.la \ ../libstore/libstore.la ../libutil/libutil.la \ - ../boost/format/libformat.la ${aterm_lib} ${sqlite_lib} @ADDITIONAL_NETWORK_LIBS@ + ../boost/format/libformat.la ${aterm_lib} ${sqlite_lib} nix-instantiate.o: help.txt.hh diff --git a/src/nix-store/Makefile.am b/src/nix-store/Makefile.am index d604920dd..0d0d0e033 100644 --- a/src/nix-store/Makefile.am +++ b/src/nix-store/Makefile.am @@ -2,7 +2,7 @@ bin_PROGRAMS = nix-store nix_store_SOURCES = nix-store.cc dotgraph.cc dotgraph.hh help.txt nix_store_LDADD = ../libmain/libmain.la ../libstore/libstore.la ../libutil/libutil.la \ - ../boost/format/libformat.la ${aterm_lib} ${sqlite_lib} @ADDITIONAL_NETWORK_LIBS@ + ../boost/format/libformat.la ${aterm_lib} ${sqlite_lib} nix-store.o: help.txt.hh diff --git a/src/nix-worker/Makefile.am b/src/nix-worker/Makefile.am index a54e5ec21..82bbaf1f7 100644 --- a/src/nix-worker/Makefile.am +++ b/src/nix-worker/Makefile.am @@ -2,7 +2,7 @@ bin_PROGRAMS = nix-worker nix_worker_SOURCES = nix-worker.cc help.txt nix_worker_LDADD = ../libmain/libmain.la ../libstore/libstore.la ../libutil/libutil.la \ - ../boost/format/libformat.la ${aterm_lib} ${sqlite_lib} @ADDITIONAL_NETWORK_LIBS@ + ../boost/format/libformat.la ${aterm_lib} ${sqlite_lib} nix-worker.o: help.txt.hh