FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync he configure script with that one from FLightGear by splitting the LIBS cariable into a base_LIBS, opengl_LIBS, network_LIBS and thread_LIBS variable

Browse Source
This commit is contained in:
ehofman 2003-07-10 10:02:10 +00:00
parent 4c78e887e1
commit 12ab6872ec
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
configure.ac
View File

@ -134,8 +134,6 @@ esac
dnl Checks for libraries. dnl Checks for libraries.
AC_SEARCH_LIBS(cos, m)
dnl Thread related checks dnl Thread related checks
AC_CHECK_HEADER(pthread.h) AC_CHECK_HEADER(pthread.h)
AC_CHECK_LIB(pthread, pthread_exit) AC_CHECK_LIB(pthread, pthread_exit)
@ -166,10 +164,22 @@ fi
AM_CONDITIONAL(HAVE_THREADS, test "x$ac_cv_lib_pthread_pthread_exit" = "xyes" -a "x$ac_cv_header_pthread_h" = "xyes") AM_CONDITIONAL(HAVE_THREADS, test "x$ac_cv_lib_pthread_pthread_exit" = "xyes" -a "x$ac_cv_header_pthread_h" = "xyes")
thread_LIBS="$LIBS"
LIBS=""
dnl search for network related libraries
AC_SEARCH_LIBS(inet_addr, xnet) AC_SEARCH_LIBS(inet_addr, xnet)
AC_SEARCH_LIBS(socket, socket) AC_SEARCH_LIBS(socket, socket)
network_LIBS="$LIBS"
LIBS=""
dnl check for some default libraries
AC_SEARCH_LIBS(cos, m)
base_LIBS="$LIBS"
LIBS=""
dnl check for glut location dnl check for glut location
AC_CHECK_HEADER(GL/glut.h) AC_CHECK_HEADER(GL/glut.h)
if test "x$ac_cv_header_GL_glut_h" = "xyes"; then if test "x$ac_cv_header_GL_glut_h" = "xyes"; then
@ -184,9 +194,6 @@ else
fi fi
fi fi
base_LIBS="$LIBS"
LIBS=""
dnl check for OpenGL related libraries dnl check for OpenGL related libraries
case "${host}" in case "${host}" in
*-*-cygwin* | *-*-mingw32*) *-*-cygwin* | *-*-mingw32*)
@ -252,6 +259,8 @@ LIBS="$base_LIBS"
AC_SUBST(base_LIBS) AC_SUBST(base_LIBS)
AC_SUBST(opengl_LIBS) AC_SUBST(opengl_LIBS)
AC_SUBST(thread_LIBS)
AC_SUBST(network_LIBS)
dnl Check for MS Windows environment dnl Check for MS Windows environment
AC_CHECK_HEADER(windows.h) AC_CHECK_HEADER(windows.h)

9
simgear/io/Makefile.am
View File

@ -32,7 +32,8 @@ tcp_server_LDADD = \
$(top_builddir)/simgear/bucket/libsgbucket.a \ $(top_builddir)/simgear/bucket/libsgbucket.a \
$(top_builddir)/simgear/misc/libsgmisc.a \ $(top_builddir)/simgear/misc/libsgmisc.a \
$(top_builddir)/simgear/xml/libsgxml.a \ $(top_builddir)/simgear/xml/libsgxml.a \
-lplibnet -lplibul -lz -lplibnet -lplibul -lz \
$(network_LIBS)
tcp_client_SOURCES = tcp_client.cxx tcp_client_SOURCES = tcp_client.cxx
@ -42,7 +43,8 @@ tcp_client_LDADD = \
$(top_builddir)/simgear/bucket/libsgbucket.a \ $(top_builddir)/simgear/bucket/libsgbucket.a \
$(top_builddir)/simgear/misc/libsgmisc.a \ $(top_builddir)/simgear/misc/libsgmisc.a \
$(top_builddir)/simgear/xml/libsgxml.a \ $(top_builddir)/simgear/xml/libsgxml.a \
-lplibnet -lplibul -lz -lplibnet -lplibul -lz \
$(network_LIBS)
socktest_SOURCES = socktest.cxx socktest_SOURCES = socktest.cxx
@ -52,7 +54,8 @@ socktest_LDADD = \
$(top_builddir)/simgear/debug/libsgdebug.a \ $(top_builddir)/simgear/debug/libsgdebug.a \
$(top_builddir)/simgear/misc/libsgmisc.a \ $(top_builddir)/simgear/misc/libsgmisc.a \
$(top_builddir)/simgear/xml/libsgxml.a \ $(top_builddir)/simgear/xml/libsgxml.a \
-lplibnet -lplibul -lz -lplibnet -lplibul -lz \
$(network_LIBS)
lowtest_SOURCES = lowtest.cxx lowtest_SOURCES = lowtest.cxx