define SYS_LIBS to hold system dependant libraries that may needed. and add
it to libraries list where needed. Update ChangeLog for previous changes too
This commit is contained in:
parent
82cbd2ee0d
commit
d921173833
13
ChangeLog
13
ChangeLog
|
@ -1,4 +1,17 @@
|
|||
2006-03-04 Matthieu Herrb <matthieu.herrb@laas.fr>
|
||||
* configure.ac:
|
||||
define SYS_LIBS to hold system dependant libraries that may needed.
|
||||
* GL/glx/indirect_dispatch_swap.c:
|
||||
* GL/glx/indirect_util.c:
|
||||
Definitions for bswapxx() macros on OpenBSD.
|
||||
* hw/xfree86/os-support/bsd/Makefile.am:
|
||||
Don't hard-code -DUSE_DEV_IO here. configure generates the proper
|
||||
OS specific values here.
|
||||
* hw/xfree86/utils/ioport/Makefile.am:
|
||||
* hw/xfree86/utils/pcitweak/Makefile.am:
|
||||
* hw/xfree86/utils/scanpci/Makefile.am:
|
||||
* hw/xfree86/utils/xorgcfg/Makefile.am:
|
||||
Add ${SYS_LIBS} to libraries list
|
||||
* cfb/Makefile.am.inc:
|
||||
Fix build with non GNU make.
|
||||
|
||||
|
|
12
configure.ac
12
configure.ac
|
@ -188,7 +188,9 @@ case $host_cpu in
|
|||
*linux*) DEFAULT_INT10=vm86 ;;
|
||||
*freebsd*) AC_DEFINE(USE_DEV_IO) ;;
|
||||
*netbsd*) AC_DEFINE(USE_I386_IOPL) ;;
|
||||
*openbsd*) AC_DEFINE(USE_I386_IOPL) ;;
|
||||
*openbsd*) AC_DEFINE(USE_I386_IOPL)
|
||||
SYS_LIBS=-li386
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
powerpc*)
|
||||
|
@ -208,7 +210,9 @@ case $host_cpu in
|
|||
case $host_os in
|
||||
*freebsd*) AC_DEFINE(USE_DEV_IO, 1, [BSD /dev/io]) ;;
|
||||
*netbsd*) AC_DEFINE(USE_I386_IOPL, 1, [BSD i386 iopl]) ;;
|
||||
*openbsd*) AC_DEFINE(USE_AMD64_IOPL, 1, [BSD AMD64 iopl]) ;;
|
||||
*openbsd*) AC_DEFINE(USE_AMD64_IOPL, 1, [BSD AMD64 iopl])
|
||||
SYS_LIBS=-lamd64
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
|
@ -810,9 +814,9 @@ PKG_CHECK_MODULES([XSERVERCFLAGS], [$REQUIRED_MODULES $REQUIRED_LIBS])
|
|||
PKG_CHECK_MODULES([XSERVERLIBS], [$REQUIRED_LIBS])
|
||||
|
||||
XSERVER_CFLAGS="${XSERVERCFLAGS_CFLAGS}"
|
||||
XSERVER_LIBS="${XSERVERLIBS_LIBS} -lm -lz"
|
||||
XSERVER_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} -lm -lz"
|
||||
AC_SUBST([XSERVER_LIBS])
|
||||
|
||||
AC_SUBST([SYS_LIBS])
|
||||
|
||||
dnl Imake defines SVR4 on SVR4 systems, and many files check for it, so
|
||||
dnl we need to replicate that here until those can all be fixed
|
||||
|
|
|
@ -36,7 +36,9 @@ INCLUDES = $(XORG_INCS) -I$(DUMMYLIB_SRCDIR)
|
|||
ioport_CFLAGS = $(XORG_CFLAGS)
|
||||
ioport_LDADD = \
|
||||
../../os-support/libxorgos.la \
|
||||
../../dummylib/libdummy-nonserver.a
|
||||
../../dummylib/libdummy-nonserver.a \
|
||||
${SYS_LIBS}
|
||||
|
||||
|
||||
ioport_SOURCES = \
|
||||
ioport.c
|
||||
|
|
|
@ -36,7 +36,8 @@ INCLUDES = $(XORG_INCS) -I$(DUMMYLIB_SRCDIR)
|
|||
pcitweak_CFLAGS = $(XORG_CFLAGS)
|
||||
pcitweak_LDADD = \
|
||||
../../os-support/libxorgos.la \
|
||||
../../dummylib/libdummy-nonserver.a
|
||||
../../dummylib/libdummy-nonserver.a \
|
||||
${SYS_LIBS}
|
||||
|
||||
pcitweak_SOURCES = \
|
||||
pcitweak.c
|
||||
|
|
|
@ -38,7 +38,8 @@ scanpci_CFLAGS = $(XORG_CFLAGS)
|
|||
scanpci_LDADD = \
|
||||
../../scanpci/libscanpci.la \
|
||||
../../os-support/libxorgos.la \
|
||||
../../dummylib/libdummy-nonserver.a
|
||||
../../dummylib/libdummy-nonserver.a \
|
||||
${SYS_LIBS}
|
||||
|
||||
scanpci_SOURCES = \
|
||||
scanpci.c
|
||||
|
|
|
@ -37,7 +37,8 @@ xorgcfg_CFLAGS = @SERVER_DEFINES@ $(XORG_CFLAGS) $(CURSESDEFINES) \
|
|||
$(XORGCFG_DEP_CFLAGS) -DXKB_RULES_DIR=\"$(XKB_BASE_DIRECTORY)/rules\" \
|
||||
-DPROJECT_ROOT=\"$(PROJECTROOT)\" -DOPTIONSPATH=\"$(OPTIONSPATH)\"
|
||||
xorgcfg_LDADD = $(XORGCFG_DEP_LIBS) ../../parser/libxf86config.a $(LOADERLIB) \
|
||||
../../os-support/libxorgos.la ../../dummylib/libdummy-nonserver.a
|
||||
../../os-support/libxorgos.la ../../dummylib/libdummy-nonserver.a \
|
||||
${SYS_LIBS}
|
||||
|
||||
#if DoLoadableServer
|
||||
LDSRCS = \
|
||||
|
|
Loading…
Reference in New Issue
Block a user