Browse Source

Added test for librt, since linux needs it and OSX doesn't have it.

Frank Zago 13 years ago
parent
commit
f7ac873303
4 changed files with 116 additions and 121 deletions
  1. 111 119
      configure
  2. 3 0
      configure.ac
  3. 1 1
      server/Makefile.am
  4. 1 1
      server/Makefile.in

File diff suppressed because it is too large
+ 111 - 119
configure


+ 3 - 0
configure.ac

@@ -53,6 +53,9 @@ AX_BOOST_THREAD
 AX_BOOST_IOSTREAMS
 AX_BOOST_PROGRAM_OPTIONS
 
+# Check whether librt is necessary
+AC_CHECK_LIB(rt, shm_open)
+
 # Check for SDL - Will accept 1.2 and 1.3
 AM_PATH_SDL("1.2.0", :, AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]))
 

+ 1 - 1
server/Makefile.am

@@ -3,7 +3,7 @@ BUILT_SOURCES = StdInc.h.gch
 StdInc.h.gch: StdInc.h
 	$(CXXCOMPILE) -c $<
 
-vcmiserver_LDADD = $(top_builddir)/lib/libvcmi.la @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ -lrt -lpthread
+vcmiserver_LDADD = $(top_builddir)/lib/libvcmi.la @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ -lpthread
 vcmiserver_CXXFLAGS = @SDL_CFLAGS@
 vcmiserver_LDFLAGS = -L$(top_builddir)/lib
 vcmiserver_SOURCES = \

+ 1 - 1
server/Makefile.in

@@ -251,7 +251,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 BUILT_SOURCES = StdInc.h.gch
-vcmiserver_LDADD = $(top_builddir)/lib/libvcmi.la @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ -lrt -lpthread
+vcmiserver_LDADD = $(top_builddir)/lib/libvcmi.la @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ -lpthread
 vcmiserver_CXXFLAGS = @SDL_CFLAGS@
 vcmiserver_LDFLAGS = -L$(top_builddir)/lib
 vcmiserver_SOURCES = \

Some files were not shown because too many files changed in this diff