# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1043554726 0
# Node ID 3270d3536e125dd5d080ca04b4b2a1166c2e15e3
# Parent  fff9c1292fa17bff7da1ad47b20d9a49e269f99b
[gaim-migrate @ 4691]
paco-paco got gaim to compile on solaris :-)

(23:18:49) Paco-Paco: Fixes getopt handling and libsocket detection on Solaris

committer: Tailor Script <tailor@pidgin.im>

diff -r fff9c1292fa1 -r 3270d3536e12 configure.ac
--- a/configure.ac	Sun Jan 26 03:52:58 2003 +0000
+++ b/configure.ac	Sun Jan 26 04:18:46 2003 +0000
@@ -34,7 +34,7 @@
 dnl Checks for library functions.
 AC_TYPE_SIGNAL
 AC_FUNC_STRFTIME
-AC_CHECK_FUNCS(socket strdup strstr atexit getaddrinfo)
+AC_CHECK_FUNCS(strdup strstr atexit getaddrinfo)
 dnl Checks for getopt in standard library
 AC_CHECK_FUNCS(getopt_long , ,
 AC_LIBOBJ(getopt)
@@ -344,6 +344,7 @@
 dnl checks for jabber
 dnl AC_CHECK_SIZEOF(short)
 AC_CHECK_FUNCS(snprintf connect)
+AC_CHECK_LIB(socket, socket)
 AC_CHECK_LIB(nsl, gethostent)
 
 dnl checks for zephyr
diff -r fff9c1292fa1 -r 3270d3536e12 configure.in
--- a/configure.in	Sun Jan 26 03:52:58 2003 +0000
+++ b/configure.in	Sun Jan 26 04:18:46 2003 +0000
@@ -34,7 +34,7 @@
 dnl Checks for library functions.
 AC_TYPE_SIGNAL
 AC_FUNC_STRFTIME
-AC_CHECK_FUNCS(socket strdup strstr atexit getaddrinfo)
+AC_CHECK_FUNCS(strdup strstr atexit getaddrinfo)
 
 dnl Checks for getopt in standard library
 AC_CHECK_FUNCS(getopt_long , , [LIBOBJS="$LIBOBJS getopt.o getopt1.o"] ) 
@@ -327,6 +327,7 @@
 dnl checks for jabber
 dnl AC_CHECK_SIZEOF(short)
 AC_CHECK_FUNCS(snprintf connect)
+AC_CHECK_LIB(socket, socket)
 AC_CHECK_LIB(nsl, gethostent)
 
 dnl checks for zephyr
diff -r fff9c1292fa1 -r 3270d3536e12 src/Makefile.am
--- a/src/Makefile.am	Sun Jan 26 03:52:58 2003 +0000
+++ b/src/Makefile.am	Sun Jan 26 04:18:46 2003 +0000
@@ -57,6 +57,7 @@
 gaim_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS)
 gaim_LDFLAGS = -export-dynamic
 gaim_LDADD = \
+	@LIBOBJS@ \
 	$(GTK_LIBS) \
 	$(SOUND_LIBS) \
 	$(STATIC_LINK_LIBS) \
@@ -67,7 +68,8 @@
 	$(GTKSPELL_LIBS)
 
 gaim_remote_SOURCES = gaim-remote.c socket.c
-gaim_remote_LDADD = $(GLIB_LIBS)
+gaim_remote_DEPENDENCIES = @LIBOBJS@
+gaim_remote_LDADD = @LIBOBJS@ $(GLIB_LIBS)
 
 AM_CPPFLAGS = \
 	$(PERL_CFLAGS) \