diff options
| author | Jürgen Schmidt <jsc@apache.org> | 2011-12-08 09:46:29 +0000 |
|---|---|---|
| committer | Jürgen Schmidt <jsc@apache.org> | 2011-12-08 09:46:29 +0000 |
| commit | b0e465bc80d2df4eab0b78983cd6056797e4815d (patch) | |
| tree | e8f288769915b0768a63ccc5ce3795a407d8f7ad /configure.in | |
| parent | 62ec5f1eb484baea80b0fd01aef3c34cbb5bf189 (diff) | |
fix to solve build problems on MacOS in nss, when --disable-build-mozilla is used, means prebuild moz libs
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 47 |
1 files changed, 24 insertions, 23 deletions
diff --git a/configure.in b/configure.in index 842cd3cfb641..ac494d7f8565 100644 --- a/configure.in +++ b/configure.in @@ -971,9 +971,9 @@ case "$build_os" in test_cairo=yes test_kde=yes test_cups=yes - test_randr=yes + test_randr=yes test_freetype=yes - test_gstreamer=yes + test_gstreamer=yes _os=SunOS AC_PATH_PROG( GNUTAR, gtar,,$PATH:/usr/sfw/bin) if test -z "$GNUTAR"; then @@ -1006,10 +1006,10 @@ case "$build_os" in test_kde=yes test_kde4=yes test_cups=yes - test_randr=yes + test_randr=yes test_freetype=yes - test_gstreamer=yes - _os=Linux + test_gstreamer=yes + _os=Linux ;; gnu) test_cups=no @@ -1019,30 +1019,30 @@ case "$build_os" in test_cups=no test_cairo=yes test_freetype=no - test_gstreamer=no + test_gstreamer=no _os=WINNT ;; darwin*) # Mac OS X test_cups=yes test_gtk=yes test_cairo=yes - test_randr=no + test_randr=no test_freetype=no - test_gstreamer=no + test_gstreamer=no _os=Darwin - if test "$enable_systray" = "yes" && test "$enable_gtk" != "no"; then - AC_MSG_WARN([Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray]) - echo "Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >>warn - enable_systray=no - fi + if test "$enable_systray" = "yes" && test "$enable_gtk" != "no"; then + AC_MSG_WARN([Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray]) + echo "Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >>warn + enable_systray=no + fi ;; os2*) test_x=no test_cups=no - test_randr=no + test_randr=no test_gtk=no test_freetype=no - test_gstreamer=no + test_gstreamer=no _os=OS2 ;; freebsd*) @@ -1051,9 +1051,9 @@ case "$build_os" in test_kde=yes test_kde4=yes test_cups=yes - test_randr=yes + test_randr=yes test_freetype=yes - test_gstreamer=yes + test_gstreamer=yes AC_MSG_CHECKING([the FreeBSD operating system release]) if test -n "$with_os_version"; then OSVERSION="$with_os_version" @@ -1077,7 +1077,7 @@ case "$build_os" in ;; osf) test_cups=no - test_randr=no + test_randr=no _os=OSF1 ;; netbsd) @@ -1086,19 +1086,19 @@ case "$build_os" in test_kde=yes test_kde4=yes test_cups=no - test_randr=yes + test_randr=yes test_freetype=yes - test_gstreamer=yes + test_gstreamer=yes PTHREAD_CFLAGS="-pthread" PTHREAD_LIBS="-pthread -lpthread" _os=NetBSD ;; aix*) test_cups=no - test_randr=no + test_randr=no test_freetype=yes - test_gstreamer=yes - PTHREAD_LIBS=-pthread + test_gstreamer=yes + PTHREAD_LIBS=-pthread echo "AIX is an alpha port --- Use at own risk" >> warn _os=AIX ;; @@ -4586,6 +4586,7 @@ else AC_MSG_RESULT([internal]) SYSTEM_MOZILLA=NO BUILD_TYPE="$BUILD_TYPE MOZ" + WITH_MOZILLA=YES if test -z "$with_mozilla_version"; then MOZILLA_VERSION= else |