* no longer link every fucking binary against libdl, libm,

libpthread.
This commit is contained in:
Jamie Wilkinson 2002-04-06 05:56:23 +00:00
parent 0bd2f30658
commit 2e21941abd
3 changed files with 8 additions and 6 deletions

View file

@ -26,7 +26,7 @@ AC_PROG_RANLIB
#AC_PROG_LIBTOOL #AC_PROG_LIBTOOL
# Checks for libraries. # Checks for libraries.
AC_CHECK_LIB(GL, glBegin) #AC_CHECK_LIB(GL, glBegin)
# FIXME: Replace `main' with a function in `-lX11': # FIXME: Replace `main' with a function in `-lX11':
#AC_CHECK_LIB(X11, [main]) #AC_CHECK_LIB(X11, [main])
# FIXME: Replace `main' with a function in `-lXext': # FIXME: Replace `main' with a function in `-lXext':
@ -35,12 +35,12 @@ AC_CHECK_LIB(GL, glBegin)
#AC_CHECK_LIB([Xxf86dga], [main]) #AC_CHECK_LIB([Xxf86dga], [main])
# FIXME: Replace `main' with a function in `-lXxf86vm': # FIXME: Replace `main' with a function in `-lXxf86vm':
#AC_CHECK_LIB([Xxf86vm], [main]) #AC_CHECK_LIB([Xxf86vm], [main])
AC_CHECK_LIB(dl, dlopen) #AC_CHECK_LIB(dl, dlopen)
AC_CHECK_LIB(m, sin) #AC_CHECK_LIB(m, sin)
# FIXME: Replace `main' with a function in `-lossaudio': # FIXME: Replace `main' with a function in `-lossaudio':
#AC_CHECK_LIB([ossaudio], [main]) #AC_CHECK_LIB([ossaudio], [main])
# FIXME: Replace `main' with a function in `-lpthread': # FIXME: Replace `main' with a function in `-lpthread':
AC_CHECK_LIB([pthread], [main]) #AC_CHECK_LIB([pthread], [main])
# FIXME: Replace `main' with a function in `-lvga': # FIXME: Replace `main' with a function in `-lvga':
#AC_CHECK_LIB([vga], [main]) #AC_CHECK_LIB([vga], [main])

View file

@ -1,4 +1,4 @@
# $Id$ # $Id$
SUBDIRS = baseq2 ctf #SUBDIRS = baseq2 ctf
#SUBDIRS = baseq2 ctf xatrix rogue SUBDIRS = baseq2 ctf xatrix rogue

View file

@ -97,6 +97,8 @@ ref_softx_so_SOURCES = $(REF_SOFT_COMMON) rw_x11.c
AM_CFLAGS = -Wall -Werror -pipe AM_CFLAGS = -Wall -Werror -pipe
AM_CPPFLAGS = -I../game AM_CPPFLAGS = -I../game
quake2_LDFLAGS = -lm -ldl -lpthread
ref_glx_so_CFLAGS = -fPIC -I/usr/X11R6/include ref_glx_so_CFLAGS = -fPIC -I/usr/X11R6/include
ref_glx_so_LDFLAGS = -shared -L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm ref_glx_so_LDFLAGS = -shared -L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm