Patchwork [27/81] Move to configure CONFIG_SOLARIS libraries needed always

login
register
mail settings
Submitter Juan Quintela
Date Aug. 3, 2009, 12:46 p.m.
Message ID <0f2daf283de3d378851b04e0dd33bca230760b8c.1249301360.git.quintela@redhat.com>
Download mbox | patch
Permalink /patch/30528/
State Superseded
Headers show

Comments

Juan Quintela - Aug. 3, 2009, 12:46 p.m.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 Makefile        |    4 ----
 Makefile.target |    1 -
 configure       |    1 +
 3 files changed, 1 insertions(+), 5 deletions(-)

Patch

diff --git a/Makefile b/Makefile
index 1362b53..88e13e6 100644
--- a/Makefile
+++ b/Makefile
@@ -27,10 +27,6 @@  else
 DOCS=
 endif

-ifdef CONFIG_SOLARIS
-LIBS+=-lsocket -lnsl -lresolv
-endif
-
 ifdef CONFIG_WIN32
 LIBS+=-lwinmm -lws2_32 -liphlpapi
 endif
diff --git a/Makefile.target b/Makefile.target
index 5d05e71..b77c496 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -52,7 +52,6 @@  ifdef CONFIG_WIN32
 LIBS+=-lwinmm -lws2_32 -liphlpapi
 endif
 ifdef CONFIG_SOLARIS
-LIBS+=-lsocket -lnsl -lresolv
 ifdef CONFIG_NEEDS_LIBSUNMATH
 LIBS+=-lsunmath
 LDFLAGS+=-L/opt/SUNWspro/prod/lib -R/opt/SUNWspro/prod/lib
diff --git a/configure b/configure
index 1d05169..811952c 100755
--- a/configure
+++ b/configure
@@ -321,6 +321,7 @@  SunOS)
   fi
   audio_possible_drivers="oss sdl"
   CFLAGS="-std=gnu99 $CFLAGS"
+  LIBS="-lsocket -lnsl -lresolv $LIBS"
 ;;
 AIX)
   aix="yes"