anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixing linking on solaris

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10650 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2005-12-09 13:42:23 +00:00
parent a29f509e1b
commit 7b890a1ecc
6 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
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

12
configure.ac
View File

@ -289,7 +289,17 @@ LYX_CHECK_SPELL_ENGINES
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)

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
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

2
src/Makefile.am
View File

@ -27,7 +27,7 @@ LYX_POST_LIBS = frontends/controllers/libcontrollers.la \
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)

5
src/client/ChangeLog
View File

@ -1,3 +1,8 @@
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

2
src/client/Makefile.am
View File

@ -16,7 +16,7 @@ BOOST_LIBS = $(BOOST_REGEX) $(BOOST_FILESYSTEM)
lyxclient_LDADD = \
$(top_builddir)/src/support/libsupport.la \
$(BOOST_LIBS) $(INTLLIBS)
$(BOOST_LIBS) $(INTLLIBS) $(SOCKET_LIBS)
lyxclient_SOURCES = \
boost.C \