diff options
| author | ted.mielczarek%gmail.com <devnull@localhost> | 2011-12-13 19:18:10 +0000 |
|---|---|---|
| committer | ted.mielczarek%gmail.com <devnull@localhost> | 2011-12-13 19:18:10 +0000 |
| commit | a1538f83379848c9966afa825f374575034d272d (patch) | |
| tree | 9089671190d6efdcdbbdf15c2bf69df9f98f3bc3 | |
| parent | c0c947d3a33e5df27e4852132eb7737c23527458 (diff) | |
| download | nspr-hg-a1538f83379848c9966afa825f374575034d272d.tar.gz | |
bug 687380 - Do not generate NSPR pgk/linux and pkg/solaris Makefiles on platforms where they will not be used. Patch by Ed Morley <bmo@edmorley.co.uk>, r=tedNSPR_4_9_BETA5
| -rwxr-xr-x | configure | 90 | ||||
| -rw-r--r-- | configure.in | 93 |
2 files changed, 106 insertions, 77 deletions
@@ -6670,52 +6670,68 @@ fi MAKEFILES=" -Makefile -config/Makefile -config/autoconf.mk -config/nsprincl.mk -config/nsprincl.sh -config/nspr-config -lib/Makefile -lib/ds/Makefile -lib/libc/Makefile -lib/libc/include/Makefile -lib/libc/src/Makefile -lib/tests/Makefile -pkg/Makefile -pkg/linux/Makefile -pkg/solaris/Makefile -pkg/solaris/SUNWpr/Makefile -pkg/solaris/SUNWprd/Makefile -pr/Makefile -pr/include/Makefile -pr/include/md/Makefile -pr/include/obsolete/Makefile -pr/include/private/Makefile -pr/src/Makefile -pr/src/io/Makefile -pr/src/linking/Makefile -pr/src/malloc/Makefile -pr/src/md/Makefile -pr/src/md/${PR_MD_ARCH_DIR}/Makefile -pr/src/memory/Makefile -pr/src/misc/Makefile -pr/src/threads/Makefile -pr/tests/Makefile -pr/tests/dll/Makefile + Makefile + config/Makefile + config/autoconf.mk + config/nsprincl.mk + config/nsprincl.sh + config/nspr-config + lib/Makefile + lib/ds/Makefile + lib/libc/Makefile + lib/libc/include/Makefile + lib/libc/src/Makefile + lib/tests/Makefile + pkg/Makefile + pr/Makefile + pr/include/Makefile + pr/include/md/Makefile + pr/include/obsolete/Makefile + pr/include/private/Makefile + pr/src/Makefile + pr/src/io/Makefile + pr/src/linking/Makefile + pr/src/malloc/Makefile + pr/src/md/Makefile + pr/src/md/${PR_MD_ARCH_DIR}/Makefile + pr/src/memory/Makefile + pr/src/misc/Makefile + pr/src/threads/Makefile + pr/tests/Makefile + pr/tests/dll/Makefile " +if test "$OS_TARGET" = "Linux"; then + MAKEFILES="$MAKEFILES + pkg/linux/Makefile + " +elif test "$OS_TARGET" = "SunOS"; then + MAKEFILES="$MAKEFILES + pkg/solaris/Makefile + pkg/solaris/SUNWpr/Makefile + pkg/solaris/SUNWprd/Makefile + " +fi if test -z "$USE_PTHREADS" && test -z "$USE_BTHREADS"; then - MAKEFILES="$MAKEFILES pr/src/threads/combined/Makefile" + MAKEFILES="$MAKEFILES + pr/src/threads/combined/Makefile + " elif test -n "$USE_PTHREADS"; then - MAKEFILES="$MAKEFILES pr/src/pthreads/Makefile" + MAKEFILES="$MAKEFILES + pr/src/pthreads/Makefile + " elif test -n "$USE_BTHREADS"; then - MAKEFILES="$MAKEFILES pr/src/bthreads/Makefile" + MAKEFILES="$MAKEFILES + pr/src/bthreads/Makefile + " fi if test -n "$USE_CPLUS"; then - MAKEFILES="$MAKEFILES pr/src/cplus/Makefile pr/src/cplus/tests/Makefile" + MAKEFILES="$MAKEFILES + pr/src/cplus/Makefile + pr/src/cplus/tests/Makefile + " fi echo $MAKEFILES > unallmakefiles diff --git a/configure.in b/configure.in index ecf9d73f..1e408f1d 100644 --- a/configure.in +++ b/configure.in @@ -3342,55 +3342,68 @@ dnl ======================================================== dnl Generate output files. dnl ======================================================== MAKEFILES=" -Makefile -config/Makefile -config/autoconf.mk -config/nsprincl.mk -config/nsprincl.sh -config/nspr-config -lib/Makefile -lib/ds/Makefile -lib/libc/Makefile -lib/libc/include/Makefile -lib/libc/src/Makefile -lib/tests/Makefile -pkg/Makefile -pkg/linux/Makefile -pkg/solaris/Makefile -pkg/solaris/SUNWpr/Makefile -pkg/solaris/SUNWprd/Makefile -pr/Makefile -pr/include/Makefile -pr/include/md/Makefile -pr/include/obsolete/Makefile -pr/include/private/Makefile -pr/src/Makefile -pr/src/io/Makefile -pr/src/linking/Makefile -pr/src/malloc/Makefile -pr/src/md/Makefile -pr/src/md/${PR_MD_ARCH_DIR}/Makefile -pr/src/memory/Makefile -pr/src/misc/Makefile -pr/src/threads/Makefile -pr/tests/Makefile -pr/tests/dll/Makefile + Makefile + config/Makefile + config/autoconf.mk + config/nsprincl.mk + config/nsprincl.sh + config/nspr-config + lib/Makefile + lib/ds/Makefile + lib/libc/Makefile + lib/libc/include/Makefile + lib/libc/src/Makefile + lib/tests/Makefile + pkg/Makefile + pr/Makefile + pr/include/Makefile + pr/include/md/Makefile + pr/include/obsolete/Makefile + pr/include/private/Makefile + pr/src/Makefile + pr/src/io/Makefile + pr/src/linking/Makefile + pr/src/malloc/Makefile + pr/src/md/Makefile + pr/src/md/${PR_MD_ARCH_DIR}/Makefile + pr/src/memory/Makefile + pr/src/misc/Makefile + pr/src/threads/Makefile + pr/tests/Makefile + pr/tests/dll/Makefile " -dnl lib/tests/Makefile -dnl pr/tests/w16gui/Makefile -dnl tools/Makefile +if test "$OS_TARGET" = "Linux"; then + MAKEFILES="$MAKEFILES + pkg/linux/Makefile + " +elif test "$OS_TARGET" = "SunOS"; then + MAKEFILES="$MAKEFILES + pkg/solaris/Makefile + pkg/solaris/SUNWpr/Makefile + pkg/solaris/SUNWprd/Makefile + " +fi if test -z "$USE_PTHREADS" && test -z "$USE_BTHREADS"; then - MAKEFILES="$MAKEFILES pr/src/threads/combined/Makefile" + MAKEFILES="$MAKEFILES + pr/src/threads/combined/Makefile + " elif test -n "$USE_PTHREADS"; then - MAKEFILES="$MAKEFILES pr/src/pthreads/Makefile" + MAKEFILES="$MAKEFILES + pr/src/pthreads/Makefile + " elif test -n "$USE_BTHREADS"; then - MAKEFILES="$MAKEFILES pr/src/bthreads/Makefile" + MAKEFILES="$MAKEFILES + pr/src/bthreads/Makefile + " fi if test -n "$USE_CPLUS"; then - MAKEFILES="$MAKEFILES pr/src/cplus/Makefile pr/src/cplus/tests/Makefile" + MAKEFILES="$MAKEFILES + pr/src/cplus/Makefile + pr/src/cplus/tests/Makefile + " fi echo $MAKEFILES > unallmakefiles |