frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Check for vsnprintf 

- Don't build the Xorg DDX on darwin
- Workaround for gcc defining __ppc__ but not __powerpc__
This commit is contained in:
Adam Jackson 2005-08-04 18:45:46 +00:00
parent 13bec87f45
commit e62be6d272
3 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2005-08-04 Adam Jackson <ajax@freedesktop.org>
* configure.ac:
* GL/mesa/main/Makefile.am:
- Check for vsnprintf
- Don't build the Xorg DDX on darwin
- Workaround for gcc defining __ppc__ but not __powerpc__
2005-08-02 Keith Packard <keithp@keithp.com> 2005-08-02 Keith Packard <keithp@keithp.com>
* hw/xwin/Makefile.am: * hw/xwin/Makefile.am:

6
GL/mesa/main/Makefile.am
View File

@ -12,6 +12,10 @@ INCLUDES = -I@MESA_SOURCE@/include \
-I$(srcdir)/../tnl \ -I$(srcdir)/../tnl \
-I$(srcdir)/.. -I$(srcdir)/..
if NEED_VSNPRINTF
VSNPRINTF_SOURCES = vsnprintf.c
endif
nodist_libmain_la_SOURCES = accum.c \ nodist_libmain_la_SOURCES = accum.c \
api_arrayelt.c \ api_arrayelt.c \
api_loopback.c \ api_loopback.c \
@ -67,5 +71,5 @@ nodist_libmain_la_SOURCES = accum.c \
texstate.c \ texstate.c \
texstore.c \ texstore.c \
varray.c \ varray.c \
vsnprintf.c \ $(VSNPRINTF_SOURCES) \
vtxfmt.c vtxfmt.c

18
configure.ac
View File

@ -68,9 +68,11 @@ AC_TYPE_PID_T
# Checks for library functions. # Checks for library functions.
AC_FUNC_VPRINTF AC_FUNC_VPRINTF
AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr strtol getopt getopt_long walkcontext]) AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr strtol getopt getopt_long vsnprintf walkcontext])
AC_FUNC_ALLOCA AC_FUNC_ALLOCA
AM_CONDITIONAL(NEED_VSNPRINTF, [test x$HAVE_VSNPRINTF = xno])
# Find the math libary # Find the math libary
AC_CHECK_LIB(m, sqrt) AC_CHECK_LIB(m, sqrt)
@ -248,6 +250,7 @@ if test x$XORG = xauto; then
XORG="yes" XORG="yes"
case $host_os in case $host_os in
cygwin*) XORG="no" ;; cygwin*) XORG="no" ;;
darwin*) XORG="no" ;;
esac esac
fi fi
AC_MSG_RESULT([$XORG]) AC_MSG_RESULT([$XORG])
@ -714,8 +717,8 @@ IAM64
XORG_OS="unknown" XORG_OS="unknown"
XORG_OS_SUBDIR="unknown" XORG_OS_SUBDIR="unknown"
AC_MSG_ERROR([Your OS is unknown. Xorg currently only supports Linux, \ AC_MSG_ERROR([Your OS is unknown. Xorg currently only supports Linux, \
Free/Open/NetBSD, and Solaris. If you are interested in porting Xorg \ Free/Open/NetBSD, Solaris, and OS X. If you are interested in porting \
to your platform, please email xorg@lists.freedesktop.org.]) Xorg to your platform, please email xorg@lists.freedesktop.org.])
;; ;;
esac esac
if test x$XORG_OS_PCI = x ; then if test x$XORG_OS_PCI = x ; then
@ -785,7 +788,14 @@ dnl _*_SOURCE on Solaris restricts to the standards, and removes non-standard
dnl functions which X uses dnl functions which X uses
case $host_os in case $host_os in
cygwin*) ;; cygwin*) ;;
solaris*);; solaris*) ;;
darwin*)
echo $host_cpu
case $host_cpu in
powerpc*)
CFLAGS="$CFLAGS -D__powerpc__" ;; # eew
esac
;;
*) *)
AC_DEFINE(_POSIX_SOURCE,500,[POSIX-compliant source]) AC_DEFINE(_POSIX_SOURCE,500,[POSIX-compliant source])
AC_DEFINE(_XOPEN_SOURCE,1,[X/Open-compliant source]) AC_DEFINE(_XOPEN_SOURCE,1,[X/Open-compliant source])