diff options
author | cls%seawood.org <devnull@localhost> | 2001-06-04 01:09:04 +0000 |
---|---|---|
committer | cls%seawood.org <devnull@localhost> | 2001-06-04 01:09:04 +0000 |
commit | 4533c77bc3b3a9e94dc1aa016d928ae8afc2fa2f (patch) | |
tree | 8b683fe7323543705ad9e5f1921f269a5a0169d1 | |
parent | a7dd8f90dd2ecf4c5868779126fafbe7dcfc259d (diff) | |
download | nspr-hg-STATIC_BUILD_20010523_BRANCH.tar.gz |
Revert previous checkin.STATIC_BUILD_20010523_BRANCH
Remove hooks for static nspr builds
-rwxr-xr-x | configure | 61 | ||||
-rw-r--r-- | configure.in | 12 |
2 files changed, 25 insertions, 48 deletions
@@ -4251,19 +4251,15 @@ EOF esac -if test "$enable_shared" = no; then - MKSHLIB= -fi - if test -z "$SKIP_LIBRARY_CHECKS"; then echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:4262: checking for dlopen" >&5 +echo "configure:4258: checking for dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4267 "configure" +#line 4263 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlopen(); below. */ @@ -4286,7 +4282,7 @@ dlopen(); ; return 0; } EOF -if { (eval echo configure:4290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" else @@ -4305,7 +4301,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:4309: checking for dlopen in -ldl" >&5 +echo "configure:4305: 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 @@ -4313,7 +4309,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 4317 "configure" +#line 4313 "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 @@ -4324,7 +4320,7 @@ int main() { dlopen() ; return 0; } EOF -if { (eval echo configure:4328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4324: \"$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 @@ -4351,7 +4347,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:4355: checking how to run the C preprocessor" >&5 +echo "configure:4351: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -4366,13 +4362,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 4370 "configure" +#line 4366 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4376: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4372: \"$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 : @@ -4383,13 +4379,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 4387 "configure" +#line 4383 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4393: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4389: \"$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 : @@ -4400,13 +4396,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 4404 "configure" +#line 4400 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4410: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4406: \"$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 : @@ -4432,13 +4428,13 @@ echo "$ac_t""$CPP" 1>&6 if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:4436: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:4432: 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 4442 "configure" +#line 4438 "configure" #include "confdefs.h" #include <sgtty.h> Autoconf TIOCGETP @@ -4456,7 +4452,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext <<EOF -#line 4460 "configure" +#line 4456 "configure" #include "confdefs.h" #include <termio.h> Autoconf TCGETA @@ -4480,12 +4476,12 @@ fi for ac_func in lchown strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4484: checking for $ac_func" >&5 +echo "configure:4480: 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 4489 "configure" +#line 4485 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4508,7 +4504,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4508: \"$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 @@ -4539,7 +4535,7 @@ done echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 -echo "configure:4543: checking for pthread_create in -lpthreads" >&5 +echo "configure:4539: checking for pthread_create in -lpthreads" >&5 echo " #include <pthread.h> void *foo(void *v) { int a = 1; } @@ -4561,7 +4557,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:4565: checking for pthread_create in -lpthread" >&5 +echo "configure:4561: checking for pthread_create in -lpthread" >&5 echo " #include <pthread.h> void *foo(void *v) { int a = 1; } @@ -4583,7 +4579,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:4587: checking for pthread_create in -lc_r" >&5 +echo "configure:4583: checking for pthread_create in -lc_r" >&5 echo " #include <pthread.h> void *foo(void *v) { int a = 1; } @@ -4605,7 +4601,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 -echo "configure:4609: checking for pthread_create in -lc" >&5 +echo "configure:4605: checking for pthread_create in -lc" >&5 echo " #include <pthread.h> void *foo(void *v) { int a = 1; } @@ -4755,7 +4751,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:4759: checking whether ${CC-cc} accepts -pthread" >&5 +echo "configure:4755: 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 @@ -4771,7 +4767,7 @@ echo "configure:4759: 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:4775: checking whether ${CC-cc} accepts -pthreads" >&5 +echo "configure:4771: 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 @@ -4934,13 +4930,6 @@ EOF fi fi fi - if test -n "$USE_PTHREADS"; then - OS_LIBS="$OS_LIBS -lpthread -lthread -lposix4 -lsocket -lnsl -ldl" - elif test -n "$USE_USER_PTHREADS"; then - OS_LIBS="$OS_LIBS -lsocket -lnsl -ldl" - else - OS_LIBS="$OS_LIBS -lthread -lposix4 -lsocket -lnsl -ldl" - fi ;; esac diff --git a/configure.in b/configure.in index 5514b376..90b75a70 100644 --- a/configure.in +++ b/configure.in @@ -1546,11 +1546,6 @@ mips-sony-newsos*) esac -dnl Turn off shared libraries if asked to do so. -if test "$enable_shared" = no; then - MKSHLIB= -fi - if test -z "$SKIP_LIBRARY_CHECKS"; then dnl ======================================================== dnl Check for system libraries @@ -1894,13 +1889,6 @@ case "$target" in fi fi fi - if test -n "$USE_PTHREADS"; then - OS_LIBS="$OS_LIBS -lpthread -lthread -lposix4 -lsocket -lnsl -ldl" - elif test -n "$USE_USER_PTHREADS"; then - OS_LIBS="$OS_LIBS -lsocket -lnsl -ldl" - else - OS_LIBS="$OS_LIBS -lthread -lposix4 -lsocket -lnsl -ldl" - fi ;; esac |