diff options
author | wchang0222%aol.com <devnull@localhost> | 2004-01-28 21:06:56 +0000 |
---|---|---|
committer | wchang0222%aol.com <devnull@localhost> | 2004-01-28 21:06:56 +0000 |
commit | 74e1268394b7a504185a16bde4eb35e3539ea2d1 (patch) | |
tree | 674f63add6cc0b5504ac9077825509f60d44d8e8 | |
parent | 4530a6dd13c0918c021631dfa36be6a8e8fdd8d9 (diff) | |
download | nspr-hg-74e1268394b7a504185a16bde4eb35e3539ea2d1.tar.gz |
Bugzilla bug 224161: added support for Mac OS X Panther SDK. We assume
that NEXT_ROOT is set in the environment. The patch is contributed by
Mike Pinkerton <pinkerton@aol.net>. r=wtc.
Modified Files: configure configure.in pr/src/linking/Makefile.in
Tag: NSPRPUB_PRE_4_2_CLIENT_BRANCH
-rwxr-xr-x | configure | 50 | ||||
-rw-r--r-- | configure.in | 6 | ||||
-rw-r--r-- | pr/src/linking/Makefile.in | 2 |
3 files changed, 35 insertions, 23 deletions
@@ -3243,6 +3243,12 @@ EOF EOF fi + + # do the right thing for panther SDK support + if test "NEXT_ROOT"; then + CFLAGS="-I$(NEXT_ROOT)/usr/include $CFLAGS" + CXXFLAGS="-I$(NEXT_ROOT)/usr/include $CXXFLAGS" + fi ;; *-dgux*) @@ -4200,17 +4206,17 @@ EOF _OPTIMIZE_FLAGS="$_OPTIMIZE_FLAGS -Olimit 4000" ac_safe=`echo "machine/builtins.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for machine/builtins.h""... $ac_c" 1>&6 -echo "configure:4204: checking for machine/builtins.h" >&5 +echo "configure:4210: checking for machine/builtins.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4209 "configure" +#line 4215 "configure" #include "confdefs.h" #include <machine/builtins.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4214: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4220: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4731,7 +4737,7 @@ case $target in ;; *) echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:4735: checking for dlopen in -ldl" >&5 +echo "configure:4741: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4739,7 +4745,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 4743 "configure" +#line 4749 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4750,7 +4756,7 @@ int main() { dlopen() ; return 0; } EOF -if { (eval echo configure:4754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4767,17 +4773,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 -echo "configure:4771: checking for dlfcn.h" >&5 +echo "configure:4777: checking for dlfcn.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4776 "configure" +#line 4782 "configure" #include "confdefs.h" #include <dlfcn.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4781: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4787: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4810,13 +4816,13 @@ esac if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:4814: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:4820: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext <<EOF -#line 4820 "configure" +#line 4826 "configure" #include "confdefs.h" #include <sgtty.h> Autoconf TIOCGETP @@ -4834,7 +4840,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext <<EOF -#line 4838 "configure" +#line 4844 "configure" #include "confdefs.h" #include <termio.h> Autoconf TCGETA @@ -4858,12 +4864,12 @@ fi for ac_func in lchown strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4862: checking for $ac_func" >&5 +echo "configure:4868: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4867 "configure" +#line 4873 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4886,7 +4892,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4925,7 +4931,7 @@ hpux*) if test -z "$GNU_CC"; then echo $ac_n "checking for +Olit support""... $ac_c" 1>&6 -echo "configure:4929: checking for +Olit support" >&5 +echo "configure:4935: checking for +Olit support" >&5 if eval "test \"`echo '$''{'ac_cv_hpux_usable_olit_option'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4959,7 +4965,7 @@ esac echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 -echo "configure:4963: checking for pthread_create in -lpthreads" >&5 +echo "configure:4969: checking for pthread_create in -lpthreads" >&5 echo " #include <pthread.h> void *foo(void *v) { return v; } @@ -4981,7 +4987,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:4985: checking for pthread_create in -lpthread" >&5 +echo "configure:4991: checking for pthread_create in -lpthread" >&5 echo " #include <pthread.h> void *foo(void *v) { return v; } @@ -5003,7 +5009,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:5007: checking for pthread_create in -lc_r" >&5 +echo "configure:5013: checking for pthread_create in -lc_r" >&5 echo " #include <pthread.h> void *foo(void *v) { return v; } @@ -5025,7 +5031,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 -echo "configure:5029: checking for pthread_create in -lc" >&5 +echo "configure:5035: checking for pthread_create in -lc" >&5 echo " #include <pthread.h> void *foo(void *v) { return v; } @@ -5177,7 +5183,7 @@ if test -n "$USE_PTHREADS"; then rm -f conftest* ac_cv_have_dash_pthread=no echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6 -echo "configure:5181: checking whether ${CC-cc} accepts -pthread" >&5 +echo "configure:5187: checking whether ${CC-cc} accepts -pthread" >&5 echo 'int main() { return 0; }' | cat > conftest.c ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1 if test $? -eq 0; then @@ -5200,7 +5206,7 @@ echo "configure:5181: checking whether ${CC-cc} accepts -pthread" >&5 ac_cv_have_dash_pthreads=no if test "$ac_cv_have_dash_pthread" = "no"; then echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6 -echo "configure:5204: checking whether ${CC-cc} accepts -pthreads" >&5 +echo "configure:5210: checking whether ${CC-cc} accepts -pthreads" >&5 echo 'int main() { return 0; }' | cat > conftest.c ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1 if test $? -eq 0; then diff --git a/configure.in b/configure.in index fa822579..30e22dfe 100644 --- a/configure.in +++ b/configure.in @@ -893,6 +893,12 @@ case "$target" in MACOS_DEPLOYMENT_TARGET=`printf "%02d%02d%02d" "$MACOS_VERSION_MAJOR" "$MACOS_VERSION_MINOR" "$MACOS_VERSION_MICRO"` AC_DEFINE_UNQUOTED(MACOS_DEPLOYMENT_TARGET, $MACOS_DEPLOYMENT_TARGET) fi + + # do the right thing for panther SDK support + if test "NEXT_ROOT"; then + CFLAGS="-I$(NEXT_ROOT)/usr/include $CFLAGS" + CXXFLAGS="-I$(NEXT_ROOT)/usr/include $CXXFLAGS" + fi ;; *-dgux*) diff --git a/pr/src/linking/Makefile.in b/pr/src/linking/Makefile.in index d997ccba..1e66c460 100644 --- a/pr/src/linking/Makefile.in +++ b/pr/src/linking/Makefile.in @@ -65,7 +65,7 @@ endif # On Mac OS X use flat #includes. ifeq ($(OS_TARGET),MacOSX) -INCLUDES += -I/Developer/Headers/FlatCarbon +INCLUDES += -I$(NEXT_ROOT)/Developer/Headers/FlatCarbon endif DEFINES += -D_NSPR_BUILD_ |