Kaydet (Commit) c6c16736 authored tarafından Sebastian Spaeth's avatar Sebastian Spaeth

Pull some common options as defaults and only change them if needed

üst 813eb5d9
...@@ -1544,14 +1544,16 @@ dnl The following is a list of supported systems. ...@@ -1544,14 +1544,16 @@ dnl The following is a list of supported systems.
dnl Sequential to keep the logic very simple dnl Sequential to keep the logic very simple
dnl These values may be checked and reset later. dnl These values may be checked and reset later.
dnl =================================================================== dnl ===================================================================
#defaults unless the os test overrides this:
test_cairo=yes
test_randr=yes
case "$build_os" in case "$build_os" in
solaris*) solaris*)
test_gtk=yes test_gtk=yes
test_cairo=yes
build_gstreamer=yes build_gstreamer=yes
test_kde=yes test_kde=yes
test_cups=yes test_cups=yes
test_randr=yes
test_freetype=yes test_freetype=yes
_os=SunOS _os=SunOS
AC_PATH_PROG( GNUTAR, gtar,,$PATH:/usr/sfw/bin) AC_PATH_PROG( GNUTAR, gtar,,$PATH:/usr/sfw/bin)
...@@ -1581,30 +1583,29 @@ case "$build_os" in ...@@ -1581,30 +1583,29 @@ case "$build_os" in
;; ;;
linux-gnu*|k*bsd*-gnu*) linux-gnu*|k*bsd*-gnu*)
test_gtk=yes test_gtk=yes
test_cairo=yes
build_gstreamer=yes build_gstreamer=yes
test_kde=yes test_kde=yes
test_kde4=yes test_kde4=yes
test_cups=yes test_cups=yes
test_randr=yes
test_freetype=yes test_freetype=yes
test_unix_quickstarter=yes test_unix_quickstarter=yes
_os=Linux _os=Linux
;; ;;
gnu) gnu)
test_randr=no
test_cairo=no
test_cups=no test_cups=no
_os=GNU _os=GNU
;; ;;
cygwin*) # Windows cygwin*) # Windows
test_cups=no test_cups=no
test_cairo=yes test_randr=no
test_freetype=no test_freetype=no
_os=WINNT _os=WINNT
;; ;;
darwin*) # Mac OS X darwin*) # Mac OS X
test_cups=yes test_cups=yes
test_gtk=yes test_gtk=yes
test_cairo=yes
test_randr=no test_randr=no
test_freetype=no test_freetype=no
_os=Darwin _os=Darwin
...@@ -1615,21 +1616,19 @@ case "$build_os" in ...@@ -1615,21 +1616,19 @@ case "$build_os" in
fi fi
;; ;;
os2*) os2*)
test_x=no
test_cups=no test_cups=no
test_randr=no test_randr=no
test_gtk=no test_gtk=no
test_cairo=no
test_freetype=no test_freetype=no
_os=OS2 _os=OS2
;; ;;
freebsd*) freebsd*)
test_gtk=yes test_gtk=yes
test_cairo=yes
build_gstreamer=yes build_gstreamer=yes
test_kde=yes test_kde=yes
test_kde4=yes test_kde4=yes
test_cups=yes test_cups=yes
test_randr=yes
test_freetype=yes test_freetype=yes
AC_MSG_CHECKING([the FreeBSD operating system release]) AC_MSG_CHECKING([the FreeBSD operating system release])
if test -n "$with_os_version"; then if test -n "$with_os_version"; then
...@@ -1654,17 +1653,16 @@ case "$build_os" in ...@@ -1654,17 +1653,16 @@ case "$build_os" in
;; ;;
osf) osf)
test_cups=no test_cups=no
test_cairo=no
test_randr=no test_randr=no
_os=OSF1 _os=OSF1
;; ;;
*netbsd*) *netbsd*)
test_gtk=yes test_gtk=yes
test_cairo=yes
build_gstreamer=yes build_gstreamer=yes
test_kde=yes test_kde=yes
test_kde4=yes test_kde4=yes
test_cups=yes test_cups=yes
test_randr=yes
test_freetype=yes test_freetype=yes
PTHREAD_CFLAGS="-pthread" PTHREAD_CFLAGS="-pthread"
PTHREAD_LIBS="-pthread -lpthread" PTHREAD_LIBS="-pthread -lpthread"
...@@ -1673,18 +1671,16 @@ case "$build_os" in ...@@ -1673,18 +1671,16 @@ case "$build_os" in
aix*) aix*)
test_cups=no test_cups=no
test_randr=no test_randr=no
test_cairo=no
test_freetype=yes test_freetype=yes
PTHREAD_LIBS=-pthread PTHREAD_LIBS=-pthread
_os=AIX _os=AIX
;; ;;
openbsd*) openbsd*)
test_x=yes
test_gtk=yes test_gtk=yes
build_cairo=yes
test_kde=yes test_kde=yes
test_cups=yes test_cups=yes
test_freetype=yes test_freetype=yes
test_randr=yes
PTHREAD_CFLAGS="-pthread -D_THREAD_SAFE" PTHREAD_CFLAGS="-pthread -D_THREAD_SAFE"
PTHREAD_LIBS="-pthread" PTHREAD_LIBS="-pthread"
_os=OpenBSD _os=OpenBSD
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment