Index: /rat/trunk/configure.in =================================================================== --- /rat/trunk/configure.in (revision 3000) +++ /rat/trunk/configure.in (revision 3001) @@ -187,6 +187,41 @@ AC_SUBST(AU_LIB) -# X +# X +#------------------------------------------------------------------------------ +# Use autoconf inbuilt X location. Works v. nicely. Substitution of X vars +# comes after broken X11 header check and attempted fix. +#------------------------------------------------------------------------------ AC_PATH_XTRA + +#------------------------------------------------------------------------------ +# Check if X headers are broken. GCC 2.95 and up reject headers that don't +# have omit types, X11 headers have implicit int declarations on some systems +# (e.g. Solaris). +#------------------------------------------------------------------------------ +AC_CACHE_CHECK(whether X11 headers are broken, x11_cv_broken_headers, [ + SAVED_CFLAGS=$CFLAGS + CFLAGS="$X_CFLAGS $CFLAGS" + AC_TRY_COMPILE([#include + #include ], + return 0, + x11_cv_broken_headers=no, + x11_cv_broken_headers=yes) + CFLAGS=$SAVED_CFLAGS + ]); +#------------------------------------------------------------------------------ +# Attempt to make local fixed copies of headers. +#------------------------------------------------------------------------------ +if test $x11_cv_broken_headers=yes ; then + if test ! -d ./X11 ; then + mkdir ./X11 + for header in Xlib.h Xutil.h + do + cat $x_includes/X11/$header | sed 's/^\(extern\) \([[A-Za-z0-9]]*($\)/\1 int \2/' > X11/$header + echo "creating ./X11/$header" + done + fi + X_CFLAGS="-I. $X_CFLAGS" +fi + AC_SUBST(X_CFLAGS) AC_SUBST(X_LIBS) @@ -194,19 +229,4 @@ AC_SUBST(X_PRE_LIBS) -#------------------------------------------------------------------------------ -# Check if X headers are broken. GCC 2.95 and up reject headers that don't -# have omit types, X11 headers have implicit int declarations on some systems -# (e.g. Solaris). -#------------------------------------------------------------------------------ -AC_MSG_CHECKING(whether X11 headers are broken) -SAVED_CFLAGS=$CFLAGS -CFLAGS="$X_CFLAGS $CFLAGS" -AC_TRY_COMPILE([#include -#include ], - return 0, - AC_MSG_RESULT(no), - AC_MSG_RESULT(yes)) -CFLAGS=$SAVED_CFLAGS - # TCL/TK #------------------------------------------------------------------------------ @@ -214,5 +234,6 @@ # Expect a source installation to have headers in TCL8_HOME/generic and libs in # TCL8_HOME/unix. A full installation should have headers in -# ROOT/include/tcl8.0, or ROOT/include, and have libraries be in ROOT/lib +# INSTDIR/include/tcl8.0, or INSTDIR/include, and have libraries be in +# INSTDIR/lib. #------------------------------------------------------------------------------ PARENT=`echo $PWD | sed -e 's%/[[^/]]*$%%'` Index: /rat/trunk/Makefile.in =================================================================== --- /rat/trunk/Makefile.in (revision 2996) +++ /rat/trunk/Makefile.in (revision 3001) @@ -6,5 +6,5 @@ DEFS = @DEFS@ -CFLAGS = @CFLAGS@ @X_CFLAGS@ $(DEFS) +CFLAGS = @X_CFLAGS@ @CFLAGS@ $(DEFS) LIBS = @LIBS@ @MATHLIBS@ LDLIBS = @@ -94,5 +94,5 @@ .c.o: - $(CC) $(INCLUDE) $(CFLAGS) -c $< + $(CC) $(CFLAGS) $(INCLUDE) -c $< $(TCL_OBJS): $(TCL_SRCS) @@ -132,5 +132,5 @@ distclean: clean - -rm -f config.cache config.log config.status config.h Makefile + -rm -rf config.cache config.log config.status config.h Makefile X11 etags: Index: /rat/trunk/configure =================================================================== --- /rat/trunk/configure (revision 3000) +++ /rat/trunk/configure (revision 3001) @@ -1361,6 +1361,5 @@ #------------------------------------------------------------------------------ # GCC-specific warning flags: Set these early so all tests use arguments that -# application build will. X11 header broken check is not valid without the -# GCC options. +# application builds with. #------------------------------------------------------------------------------ if test "$GCC" = yes @@ -1378,15 +1377,15 @@ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1381: checking for $ac_hdr" >&5 +echo "configure:1380: checking for $ac_hdr" >&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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1391: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1390: \"$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 @@ -1418,15 +1417,15 @@ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1421: checking for $ac_hdr" >&5 +echo "configure:1420: checking for $ac_hdr" >&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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1431: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1430: \"$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 @@ -1457,7 +1456,7 @@ # Check for missing declarations echo $ac_n "checking for kill declaration""... $ac_c" 1>&6 -echo "configure:1460: checking for kill declaration" >&5 +echo "configure:1459: checking for kill declaration" >&5 cat > conftest.$ac_ext < @@ -1480,7 +1479,7 @@ echo $ac_n "checking for gettimeofday declaration""... $ac_c" 1>&6 -echo "configure:1483: checking for gettimeofday declaration" >&5 +echo "configure:1482: checking for gettimeofday declaration" >&5 cat > conftest.$ac_ext < @@ -1506,5 +1505,5 @@ echo $ac_n "checking for library containing socket""... $ac_c" 1>&6 -echo "configure:1509: checking for library containing socket" >&5 +echo "configure:1508: checking for library containing socket" >&5 if eval "test \"`echo '$''{'ac_cv_search_socket'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1513,5 +1512,5 @@ ac_cv_search_socket="no" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_socket="none required" @@ -1535,5 +1534,5 @@ LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_socket="-l$i" @@ -1568,5 +1567,5 @@ echo $ac_n "checking for library containing inet_addr""... $ac_c" 1>&6 -echo "configure:1571: checking for library containing inet_addr" >&5 +echo "configure:1570: checking for library containing inet_addr" >&5 if eval "test \"`echo '$''{'ac_cv_search_inet_addr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1575,5 +1574,5 @@ ac_cv_search_inet_addr="no" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_inet_addr="none required" @@ -1597,5 +1596,5 @@ LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_inet_addr="-l$i" @@ -1630,5 +1629,5 @@ echo $ac_n "checking for library containing dlopen""... $ac_c" 1>&6 -echo "configure:1633: checking for library containing dlopen" >&5 +echo "configure:1632: checking for library containing dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_search_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1637,5 +1636,5 @@ ac_cv_search_dlopen="no" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_dlopen="none required" @@ -1659,5 +1658,5 @@ LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_dlopen="-l$i" @@ -1692,10 +1691,10 @@ echo $ac_n "checking for sin""... $ac_c" 1>&6 -echo "configure:1695: checking for sin" >&5 +echo "configure:1694: checking for sin" >&5 if eval "test \"`echo '$''{'ac_cv_func_sin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_sin=yes" @@ -1741,5 +1740,5 @@ echo $ac_n "checking for main in -lieee""... $ac_c" 1>&6 -echo "configure:1744: checking for main in -lieee" >&5 +echo "configure:1743: checking for main in -lieee" >&5 ac_lib_var=`echo ieee'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then @@ -1749,5 +1748,5 @@ LIBS="-lieee $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1758: \"$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" @@ -1782,10 +1781,10 @@ echo $ac_n "checking for int8_t""... $ac_c" 1>&6 -echo "configure:1785: checking for int8_t" >&5 +echo "configure:1784: checking for int8_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_int8_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -1815,10 +1814,10 @@ echo $ac_n "checking for int16_t""... $ac_c" 1>&6 -echo "configure:1818: checking for int16_t" >&5 +echo "configure:1817: checking for int16_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_int16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -1848,10 +1847,10 @@ echo $ac_n "checking for int32_t""... $ac_c" 1>&6 -echo "configure:1851: checking for int32_t" >&5 +echo "configure:1850: checking for int32_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_int32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -1881,10 +1880,10 @@ echo $ac_n "checking for int64_t""... $ac_c" 1>&6 -echo "configure:1884: checking for int64_t" >&5 +echo "configure:1883: checking for int64_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_int64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -1916,10 +1915,10 @@ # Some systems have these in , just to be difficult... echo $ac_n "checking for uint8_t in ""... $ac_c" 1>&6 -echo "configure:1919: checking for uint8_t in " >&5 +echo "configure:1918: checking for uint8_t in " >&5 if eval "test \"`echo '$''{'ucl_cv_uint8_t_in_stdint_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -1941,10 +1940,10 @@ then echo $ac_n "checking for uint8_t""... $ac_c" 1>&6 -echo "configure:1944: checking for uint8_t" >&5 +echo "configure:1943: checking for uint8_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_uint8_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -1976,10 +1975,10 @@ echo $ac_n "checking for uint16_t in ""... $ac_c" 1>&6 -echo "configure:1979: checking for uint16_t in " >&5 +echo "configure:1978: checking for uint16_t in " >&5 if eval "test \"`echo '$''{'ucl_cv_uint16_t_in_stdint_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -2001,10 +2000,10 @@ then echo $ac_n "checking for uint16_t""... $ac_c" 1>&6 -echo "configure:2004: checking for uint16_t" >&5 +echo "configure:2003: checking for uint16_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_uint16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -2036,10 +2035,10 @@ echo $ac_n "checking for uint32_t in ""... $ac_c" 1>&6 -echo "configure:2039: checking for uint32_t in " >&5 +echo "configure:2038: checking for uint32_t in " >&5 if eval "test \"`echo '$''{'ucl_cv_uint32_t_in_stdint_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -2061,10 +2060,10 @@ then echo $ac_n "checking for uint32_t""... $ac_c" 1>&6 -echo "configure:2064: checking for uint32_t" >&5 +echo "configure:2063: checking for uint32_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_uint32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -2120,10 +2119,10 @@ EXTRA_OBJ= echo $ac_n "checking for usleep""... $ac_c" 1>&6 -echo "configure:2123: checking for usleep" >&5 +echo "configure:2122: checking for usleep" >&5 if eval "test \"`echo '$''{'ac_cv_func_usleep'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_usleep=yes" @@ -2206,15 +2205,15 @@ ac_safe=`echo "$O1KHOME/include/oti_audio_device.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $O1KHOME/include/oti_audio_device.h""... $ac_c" 1>&6 -echo "configure:2209: checking for $O1KHOME/include/oti_audio_device.h" >&5 +echo "configure:2208: checking for $O1KHOME/include/oti_audio_device.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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2219: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2218: \"$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 @@ -2257,15 +2256,15 @@ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2260: checking for $ac_hdr" >&5 +echo "configure:2259: checking for $ac_hdr" >&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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2270: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2269: \"$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 @@ -2329,5 +2328,9 @@ -# X +# X +#------------------------------------------------------------------------------ +# Use autoconf inbuilt X location. Works v. nicely. Substitution of X vars +# comes after broken X11 header check and attempted fix. +#------------------------------------------------------------------------------ # If we find X, set shell vars x_includes and x_libraries to the # paths, otherwise set no_x=yes. @@ -2335,5 +2338,5 @@ # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:2338: checking for X" >&5 +echo "configure:2341: checking for X" >&5 # Check whether --with-x or --without-x was given. @@ -2397,10 +2400,10 @@ # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2405: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2408: \"$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 @@ -2471,5 +2474,5 @@ LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" @@ -2584,8 +2587,8 @@ "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:2587: checking whether -R must be followed by a space" >&5 +echo "configure:2590: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes @@ -2610,5 +2613,5 @@ LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes @@ -2649,5 +2652,5 @@ # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:2652: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:2655: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then @@ -2657,5 +2660,5 @@ LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2674: \"$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" @@ -2690,5 +2693,5 @@ if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:2693: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:2696: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then @@ -2698,5 +2701,5 @@ LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2715: \"$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" @@ -2738,10 +2741,10 @@ # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:2741: checking for gethostbyname" >&5 +echo "configure:2744: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" @@ -2787,5 +2790,5 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:2790: checking for gethostbyname in -lnsl" >&5 +echo "configure:2793: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then @@ -2795,5 +2798,5 @@ LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2812: \"$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" @@ -2836,10 +2839,10 @@ # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:2839: checking for connect" >&5 +echo "configure:2842: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" @@ -2885,5 +2888,5 @@ if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:2888: checking for connect in -lsocket" >&5 +echo "configure:2891: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then @@ -2893,5 +2896,5 @@ LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2910: \"$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" @@ -2928,10 +2931,10 @@ # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:2931: checking for remove" >&5 +echo "configure:2934: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" @@ -2977,5 +2980,5 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:2980: checking for remove in -lposix" >&5 +echo "configure:2983: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then @@ -2985,5 +2988,5 @@ LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3002: \"$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" @@ -3020,10 +3023,10 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:3023: checking for shmat" >&5 +echo "configure:3026: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" @@ -3069,5 +3072,5 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:3072: checking for shmat in -lipc" >&5 +echo "configure:3075: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then @@ -3077,5 +3080,5 @@ LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3094: \"$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" @@ -3121,5 +3124,5 @@ # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:3124: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:3127: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then @@ -3129,5 +3132,5 @@ LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3146: \"$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" @@ -3163,8 +3166,4 @@ fi - - - - @@ -3174,34 +3173,63 @@ # (e.g. Solaris). #------------------------------------------------------------------------------ -echo $ac_n "checking broken X11 headers""... $ac_c" 1>&6 -echo "configure:3178: checking broken X11 headers" >&5 -SAVED_CFLAGS=$CFLAGS -CFLAGS="$X_CFLAGS $CFLAGS" -cat > conftest.$ac_ext <&6 +echo "configure:3177: checking whether X11 headers are broken" >&5 +if eval "test \"`echo '$''{'x11_cv_broken_headers'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + SAVED_CFLAGS=$CFLAGS + CFLAGS="$X_CFLAGS $CFLAGS" + cat > conftest.$ac_ext < -#include + #include int main() { return 0 ; return 0; } EOF -if { (eval echo configure:3190: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""no" 1>&6 -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - echo "$ac_t""yes" 1>&6 -fi -rm -f conftest* -CFLAGS=$SAVED_CFLAGS +if { (eval echo configure:3193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + x11_cv_broken_headers=no +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + x11_cv_broken_headers=yes +fi +rm -f conftest* + CFLAGS=$SAVED_CFLAGS + +fi + +echo "$ac_t""$x11_cv_broken_headers" 1>&6; +#------------------------------------------------------------------------------ +# Attempt to make local copies of headers. +#------------------------------------------------------------------------------ +if test $x11_cv_broken_headers=yes ; then + if test ! -d ./X11 ; then + mkdir ./X11 + for header in Xlib.h Xutil.h + do + cat $x_includes/X11/$header | sed 's/^\(extern\) \([A-Za-z0-9]*($\)/\1 int \2/' > X11/$header + echo "creating ./X11/$header" + done + fi + X_CFLAGS="-I. $X_CFLAGS" +fi + + + + + # TCL/TK -#------------------------------------------------------------------------------# We could be dealing with a source installation or a full installation. +#------------------------------------------------------------------------------ +# We could be dealing with a source installation or a full installation. # Expect a source installation to have headers in TCL8_HOME/generic and libs in # TCL8_HOME/unix. A full installation should have headers in -# ROOT/include/tcl8.0 or ROOT/include. Libraries should be in ROOT/lib +# INSTDIR/include/tcl8.0, or INSTDIR/include, and have libraries be in +# INSTDIR/lib. #------------------------------------------------------------------------------ PARENT=`echo $PWD | sed -e 's%/[^/]*$%%'` @@ -3212,6 +3240,6 @@ if test "${with_tcl+set}" = set; then withval="$with_tcl" - TCL_INC=$withval - TCL_LIB=$withval + TCL_INC=$withval + TCL_LIB=$withval fi @@ -3228,15 +3256,15 @@ ac_safe=`echo "${TCL_INC}/tcl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ${TCL_INC}/tcl.h""... $ac_c" 1>&6 -echo "configure:3231: checking for ${TCL_INC}/tcl.h" >&5 +echo "configure:3259: checking for ${TCL_INC}/tcl.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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3241: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3269: \"$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 @@ -3284,5 +3312,5 @@ echo $ac_n "checking for library containing Tcl_Init""... $ac_c" 1>&6 -echo "configure:3287: checking for library containing Tcl_Init" >&5 +echo "configure:3315: checking for library containing Tcl_Init" >&5 if eval "test \"`echo '$''{'ac_cv_search_Tcl_Init'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3291,5 +3319,5 @@ ac_cv_search_Tcl_Init="no" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_Tcl_Init="none required" @@ -3313,5 +3341,5 @@ LIBS="-l$i -L${TCL_LIB} ${SAVED_LIBS} -lm $ac_func_search_save_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_Tcl_Init="-l$i" @@ -3362,6 +3390,6 @@ if test "${with_tk+set}" = set; then withval="$with_tk" - TK_INC=$withval - TK_LIB=$withval + TK_INC=$withval + TK_LIB=$withval fi @@ -3374,5 +3402,5 @@ do echo $ac_n "checking for $i/tk.h""... $ac_c" 1>&6 -echo "configure:3377: checking for $i/tk.h" >&5 +echo "configure:3405: checking for $i/tk.h" >&5 if test -r $i/tk.h ; then TK_INC=-I$i @@ -3406,5 +3434,5 @@ echo $ac_n "checking for library containing Tk_Init""... $ac_c" 1>&6 -echo "configure:3409: checking for library containing Tk_Init" >&5 +echo "configure:3437: checking for library containing Tk_Init" >&5 if eval "test \"`echo '$''{'ac_cv_search_Tk_Init'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3413,5 +3441,5 @@ ac_cv_search_Tk_Init="no" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_Tk_Init="none required" @@ -3435,5 +3463,5 @@ LIBS="-l$i -L${TK_LIB} ${TCL_LIB} $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS ${SAVED_LIBS} -lm $ac_func_search_save_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_Tk_Init="-l$i" @@ -3501,15 +3529,15 @@ ac_safe=`echo "$h/mbus.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $h/mbus.h""... $ac_c" 1>&6 -echo "configure:3504: checking for $h/mbus.h" >&5 +echo "configure:3532: checking for $h/mbus.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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3514: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3542: \"$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 @@ -3554,5 +3582,5 @@ echo $ac_n "checking for mbus_init in -lcommon""... $ac_c" 1>&6 -echo "configure:3557: checking for mbus_init in -lcommon" >&5 +echo "configure:3585: checking for mbus_init in -lcommon" >&5 ac_lib_var=`echo common'_'mbus_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then @@ -3562,5 +3590,5 @@ LIBS="-lcommon -L${COMMON_LIB} $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3604: \"$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" @@ -3670,5 +3698,5 @@ #----------------------------------------------------------------------------- echo $ac_n "checking signed arithmetic shift right""... $ac_c" 1>&6 -echo "configure:3673: checking signed arithmetic shift right" >&5 +echo "configure:3701: checking signed arithmetic shift right" >&5 if eval "test \"`echo '$''{'gsm_cv_sasr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3678,9 +3706,9 @@ else cat > conftest.$ac_ext <> 1) != -1;} EOF -if { (eval echo configure:3685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then gsm_cv_sasr=yes