+2005-12-07 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
+
+ * configure.ac: add to SOCKET_LIBS the libraries required by
+ socket code (useful for solaris).
+
2005-12-06 Georg Baum <Georg.Baum@post.rwth-aachen.de>
* configure.ac: remove dead gnome stuff
lyx_client_subdir=true
AC_LANG_PUSH(C)
-AC_CHECK_FUNCS(fcntl,, [lyx_client_subdir=false])
+dnl LIBS already contains some X extra libs that may interfere.
+save_LIBS="$LIBS"
+LIBS=
+AC_CHECK_FUNCS(fcntl,
+ [AC_SEARCH_LIBS([gethostbyname], [nsl])
+ AC_SEARCH_LIBS([socket], [socket], [],
+ [AC_CHECK_LIB([socket], [socket], [LIBS="-lsocket -lnsl $LIBS"],
+ [], [-lnsl])])],
+ [lyx_client_subdir=false])
+AC_SUBST(SOCKET_LIBS,$LIBS)
+LIBS="$save_LIBS"
AM_CONDITIONAL(BUILD_CLIENT_SUBDIR, $lyx_client_subdir)
AC_LANG_POP(C)
+2005-12-07 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
+
+ * Makefile.am (OTHERLIBS): add SOCKET_LIBS in case we compile
+ without X support.
+
2005-12-06 Georg Baum <Georg.Baum@post.rwth-aachen.de>
* exporter.C (Export): Don't try to copy a file if it does not exist
BOOST_LIBS = $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_FILESYSTEM)
-OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(AIKSAURUS_LIBS) @LIBS@
+OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(AIKSAURUS_LIBS) @LIBS@ $(SOCKET_LIBS)
bin_PROGRAMS = lyx
noinst_PROGRAMS = $(FRONTENDS_PROGS)
+2005-12-07 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
+
+ * Makefile.am (lyxclient_LDADD): link against SOCKET_LIBS (needed
+ for solaris).
+
2005-07-17 Michael Schmitt <michqel.schmitt@teststep.org>
* debug.C: fix typo
lyxclient_LDADD = \
$(top_builddir)/src/support/libsupport.la \
- $(BOOST_LIBS) $(INTLLIBS)
+ $(BOOST_LIBS) $(INTLLIBS) $(SOCKET_LIBS)
lyxclient_SOURCES = \
boost.C \