[Amizilla-cvs] amizilla/nsprpub configure.in,1.3,1.4 configure,1.6,1.7
Brought to you by:
maxlarsson
Menu
▾
▴
[Amizilla-cvs] amizilla/nsprpub configure.in,1.3,1.4 configure,1.6,1.7
|
From: Jeff S. <jsh...@us...> - 2004-11-21 18:10:46
|
Update of /cvsroot/amizilla/amizilla/nsprpub In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5448 Modified Files: configure.in configure Log Message: Canonicalize the AmigaOS target -- they are different if you are cross-compiling Index: configure =================================================================== RCS file: /cvsroot/amizilla/amizilla/nsprpub/configure,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** configure 11 Oct 2004 18:54:01 -0000 1.6 --- configure 21 Nov 2004 18:09:32 -0000 1.7 *************** *** 2789,2792 **** --- 2789,2795 ---- fi + if test "$OS_ARCH" = "amigaos"; then + OS_ARCH="AmigaOS"; + fi ####################################################################### # Master "Core Components" macros for getting the OS target # *************** *** 2942,2956 **** ac_safe=`echo "sys/atomic_op.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/atomic_op.h""... $ac_c" 1>&6 ! echo "configure:2945: checking for sys/atomic_op.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 2950 "configure" #include "confdefs.h" #include <sys/atomic_op.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:2955: \"$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 --- 2945,2959 ---- ac_safe=`echo "sys/atomic_op.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/atomic_op.h""... $ac_c" 1>&6 ! echo "configure:2948: checking for sys/atomic_op.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 2953 "configure" #include "confdefs.h" #include <sys/atomic_op.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:2958: \"$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 *************** *** 3116,3120 **** MKSHLIB='$(CCC) $(DSO_LDOPTS) -o $@' echo $ac_n "checking for gethostbyaddr in -lbind""... $ac_c" 1>&6 ! echo "configure:3119: checking for gethostbyaddr in -lbind" >&5 ac_lib_var=`echo bind'_'gethostbyaddr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then --- 3119,3123 ---- MKSHLIB='$(CCC) $(DSO_LDOPTS) -o $@' echo $ac_n "checking for gethostbyaddr in -lbind""... $ac_c" 1>&6 ! echo "configure:3122: checking for gethostbyaddr in -lbind" >&5 ac_lib_var=`echo bind'_'gethostbyaddr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then *************** *** 3124,3128 **** LIBS="-lbind $LIBS" cat > conftest.$ac_ext <<EOF ! #line 3127 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ --- 3127,3131 ---- LIBS="-lbind $LIBS" cat > conftest.$ac_ext <<EOF ! #line 3130 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ *************** *** 3135,3139 **** ; return 0; } EOF ! if { (eval echo configure:3138: \"$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" --- 3138,3142 ---- ; return 0; } EOF ! if { (eval echo configure:3141: \"$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" *************** *** 4318,4332 **** ac_safe=`echo "machine/builtins.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for machine/builtins.h""... $ac_c" 1>&6 ! echo "configure:4321: 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 4326 "configure" #include "confdefs.h" #include <machine/builtins.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:4331: \"$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 --- 4321,4335 ---- ac_safe=`echo "machine/builtins.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for machine/builtins.h""... $ac_c" 1>&6 ! echo "configure:4324: 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 4329 "configure" #include "confdefs.h" #include <machine/builtins.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:4334: \"$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 *************** *** 4841,4850 **** echo $ac_n "checking for dlopen""... $ac_c" 1>&6 ! echo "configure:4844: 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 4849 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, --- 4844,4853 ---- echo $ac_n "checking for dlopen""... $ac_c" 1>&6 ! echo "configure:4847: 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 4852 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, *************** *** 4869,4873 **** ; return 0; } EOF ! if { (eval echo configure:4872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" --- 4872,4876 ---- ; return 0; } EOF ! if { (eval echo configure:4875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" *************** *** 4888,4892 **** echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 ! echo "configure:4891: 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 --- 4891,4895 ---- echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 ! echo "configure:4894: 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 *************** *** 4896,4900 **** LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF ! #line 4899 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ --- 4899,4903 ---- LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF ! #line 4902 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ *************** *** 4907,4911 **** ; return 0; } EOF ! if { (eval echo configure:4910: \"$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" --- 4910,4914 ---- ; return 0; } EOF ! if { (eval echo configure:4913: \"$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" *************** *** 4935,4939 **** if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 ! echo "configure:4938: 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 --- 4938,4942 ---- if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 ! echo "configure:4941: 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 *************** *** 4941,4945 **** ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext <<EOF ! #line 4944 "configure" #include "confdefs.h" #include <sgtty.h> --- 4944,4948 ---- ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext <<EOF ! #line 4947 "configure" #include "confdefs.h" #include <sgtty.h> *************** *** 4959,4963 **** if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext <<EOF ! #line 4962 "configure" #include "confdefs.h" #include <termio.h> --- 4962,4966 ---- if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext <<EOF ! #line 4965 "configure" #include "confdefs.h" #include <termio.h> *************** *** 4983,4992 **** do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ! echo "configure:4986: 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 4991 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, --- 4986,4995 ---- do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ! echo "configure:4989: 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 4994 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, *************** *** 5011,5015 **** ; return 0; } EOF ! if { (eval echo configure:5014: \"$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" --- 5014,5018 ---- ; return 0; } EOF ! if { (eval echo configure:5017: \"$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" *************** *** 5050,5054 **** echo $ac_n "checking for +Olit support""... $ac_c" 1>&6 ! echo "configure:5053: 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 --- 5053,5057 ---- echo $ac_n "checking for +Olit support""... $ac_c" 1>&6 ! echo "configure:5056: 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 *************** *** 5084,5088 **** echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 ! echo "configure:5087: checking for pthread_create in -lpthreads" >&5 echo " #include <pthread.h> --- 5087,5091 ---- echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 ! echo "configure:5090: checking for pthread_create in -lpthreads" >&5 echo " #include <pthread.h> *************** *** 5106,5110 **** echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 ! echo "configure:5109: checking for pthread_create in -lpthread" >&5 echo " #include <pthread.h> --- 5109,5113 ---- echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 ! echo "configure:5112: checking for pthread_create in -lpthread" >&5 echo " #include <pthread.h> *************** *** 5128,5132 **** echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 ! echo "configure:5131: checking for pthread_create in -lc_r" >&5 echo " #include <pthread.h> --- 5131,5135 ---- echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 ! echo "configure:5134: checking for pthread_create in -lc_r" >&5 echo " #include <pthread.h> *************** *** 5150,5154 **** echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 ! echo "configure:5153: checking for pthread_create in -lc" >&5 echo " #include <pthread.h> --- 5153,5157 ---- echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 ! echo "configure:5156: checking for pthread_create in -lc" >&5 echo " #include <pthread.h> *************** *** 5302,5306 **** ac_cv_have_dash_pthread=no echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6 ! echo "configure:5305: 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 --- 5305,5309 ---- ac_cv_have_dash_pthread=no echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6 ! echo "configure:5308: 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 *************** *** 5325,5329 **** if test "$ac_cv_have_dash_pthread" = "no"; then echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6 ! echo "configure:5328: 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 --- 5328,5332 ---- if test "$ac_cv_have_dash_pthread" = "no"; then echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6 ! echo "configure:5331: 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 Index: configure.in =================================================================== RCS file: /cvsroot/amizilla/amizilla/nsprpub/configure.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** configure.in 11 Oct 2004 18:54:01 -0000 1.3 --- configure.in 21 Nov 2004 18:09:32 -0000 1.4 *************** *** 563,566 **** --- 563,569 ---- fi + if test "$OS_ARCH" = "amigaos"; then + OS_ARCH="AmigaOS"; + fi ####################################################################### # Master "Core Components" macros for getting the OS target # |