Changeset 3001

Show
Ignore:
Timestamp:
12/05/99 22:28:41 (14 years ago)
Author:
ucacoxh
Message:

- configure now fixes broken X headers with a simple sed hack. Really

not sure this is a good idea. Had to re-organize order of flags in
Makefile.in too.

Location:
rat/trunk
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • rat/trunk/Makefile.in

    r2996 r3001  
    66 
    77DEFS    = @DEFS@ 
    8 CFLAGS  = @CFLAGS@ @X_CFLAGS@ $(DEFS) 
     8CFLAGS  = @X_CFLAGS@ @CFLAGS@ $(DEFS) 
    99LIBS    = @LIBS@ @MATHLIBS@ 
    1010LDLIBS  =  
     
    9494 
    9595.c.o: 
    96         $(CC) $(INCLUDE) $(CFLAGS) -c $< 
     96        $(CC) $(CFLAGS) $(INCLUDE) -c $< 
    9797 
    9898$(TCL_OBJS): $(TCL_SRCS) 
     
    132132 
    133133distclean: clean 
    134         -rm -f config.cache config.log config.status config.h Makefile 
     134        -rm -rf config.cache config.log config.status config.h Makefile X11 
    135135 
    136136etags: 
  • rat/trunk/configure

    r3000 r3001  
    13611361#------------------------------------------------------------------------------ 
    13621362# GCC-specific warning flags:  Set these early so all tests use arguments that 
    1363 # application build will.  X11 header broken check is not valid without the 
    1364 # GCC options. 
     1363# application builds with.  
    13651364#------------------------------------------------------------------------------ 
    13661365if test "$GCC" = yes 
     
    13781377ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 
    13791378echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 
    1380 echo "configure:1381: checking for $ac_hdr" >&5 
     1379echo "configure:1380: checking for $ac_hdr" >&5 
    13811380if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 
    13821381  echo $ac_n "(cached) $ac_c" 1>&6 
    13831382else 
    13841383  cat > conftest.$ac_ext <<EOF 
    1385 #line 1386 "configure" 
     1384#line 1385 "configure" 
    13861385#include "confdefs.h" 
    13871386#include <$ac_hdr> 
    13881387EOF 
    13891388ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 
    1390 { (eval echo configure:1391: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 
     1389{ (eval echo configure:1390: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 
    13911390ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 
    13921391if test -z "$ac_err"; then 
     
    14181417ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 
    14191418echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 
    1420 echo "configure:1421: checking for $ac_hdr" >&5 
     1419echo "configure:1420: checking for $ac_hdr" >&5 
    14211420if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 
    14221421  echo $ac_n "(cached) $ac_c" 1>&6 
    14231422else 
    14241423  cat > conftest.$ac_ext <<EOF 
    1425 #line 1426 "configure" 
     1424#line 1425 "configure" 
    14261425#include "confdefs.h" 
    14271426#include <$ac_hdr> 
    14281427EOF 
    14291428ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 
    1430 { (eval echo configure:1431: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 
     1429{ (eval echo configure:1430: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 
    14311430ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 
    14321431if test -z "$ac_err"; then 
     
    14571456# Check for missing declarations 
    14581457echo $ac_n "checking for kill declaration""... $ac_c" 1>&6 
    1459 echo "configure:1460: checking for kill declaration" >&5 
     1458echo "configure:1459: checking for kill declaration" >&5 
    14601459cat > conftest.$ac_ext <<EOF 
    1461 #line 1462 "configure" 
     1460#line 1461 "configure" 
    14621461#include "confdefs.h" 
    14631462#include <signal.h> 
     
    14801479 
    14811480echo $ac_n "checking for gettimeofday declaration""... $ac_c" 1>&6 
    1482 echo "configure:1483: checking for gettimeofday declaration" >&5 
     1481echo "configure:1482: checking for gettimeofday declaration" >&5 
    14831482cat > conftest.$ac_ext <<EOF 
    1484 #line 1485 "configure" 
     1483#line 1484 "configure" 
    14851484#include "confdefs.h" 
    14861485#include <sys/time.h> 
     
    15061505 
    15071506echo $ac_n "checking for library containing socket""... $ac_c" 1>&6 
    1508 echo "configure:1509: checking for library containing socket" >&5 
     1507echo "configure:1508: checking for library containing socket" >&5 
    15091508if eval "test \"`echo '$''{'ac_cv_search_socket'+set}'`\" = set"; then 
    15101509  echo $ac_n "(cached) $ac_c" 1>&6 
     
    15131512ac_cv_search_socket="no" 
    15141513cat > conftest.$ac_ext <<EOF 
    1515 #line 1516 "configure" 
     1514#line 1515 "configure" 
    15161515#include "confdefs.h" 
    15171516/* Override any gcc2 internal prototype to avoid an error.  */ 
     
    15241523; return 0; } 
    15251524EOF 
    1526 if { (eval echo configure:1527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
     1525if { (eval echo configure:1526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
    15271526  rm -rf conftest* 
    15281527  ac_cv_search_socket="none required" 
     
    15351534LIBS="-l$i  $ac_func_search_save_LIBS" 
    15361535cat > conftest.$ac_ext <<EOF 
    1537 #line 1538 "configure" 
     1536#line 1537 "configure" 
    15381537#include "confdefs.h" 
    15391538/* Override any gcc2 internal prototype to avoid an error.  */ 
     
    15461545; return 0; } 
    15471546EOF 
    1548 if { (eval echo configure:1549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
     1547if { (eval echo configure:1548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
    15491548  rm -rf conftest* 
    15501549  ac_cv_search_socket="-l$i" 
     
    15681567 
    15691568echo $ac_n "checking for library containing inet_addr""... $ac_c" 1>&6 
    1570 echo "configure:1571: checking for library containing inet_addr" >&5 
     1569echo "configure:1570: checking for library containing inet_addr" >&5 
    15711570if eval "test \"`echo '$''{'ac_cv_search_inet_addr'+set}'`\" = set"; then 
    15721571  echo $ac_n "(cached) $ac_c" 1>&6 
     
    15751574ac_cv_search_inet_addr="no" 
    15761575cat > conftest.$ac_ext <<EOF 
    1577 #line 1578 "configure" 
     1576#line 1577 "configure" 
    15781577#include "confdefs.h" 
    15791578/* Override any gcc2 internal prototype to avoid an error.  */ 
     
    15861585; return 0; } 
    15871586EOF 
    1588 if { (eval echo configure:1589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
     1587if { (eval echo configure:1588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
    15891588  rm -rf conftest* 
    15901589  ac_cv_search_inet_addr="none required" 
     
    15971596LIBS="-l$i  $ac_func_search_save_LIBS" 
    15981597cat > conftest.$ac_ext <<EOF 
    1599 #line 1600 "configure" 
     1598#line 1599 "configure" 
    16001599#include "confdefs.h" 
    16011600/* Override any gcc2 internal prototype to avoid an error.  */ 
     
    16081607; return 0; } 
    16091608EOF 
    1610 if { (eval echo configure:1611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
     1609if { (eval echo configure:1610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
    16111610  rm -rf conftest* 
    16121611  ac_cv_search_inet_addr="-l$i" 
     
    16301629 
    16311630echo $ac_n "checking for library containing dlopen""... $ac_c" 1>&6 
    1632 echo "configure:1633: checking for library containing dlopen" >&5 
     1631echo "configure:1632: checking for library containing dlopen" >&5 
    16331632if eval "test \"`echo '$''{'ac_cv_search_dlopen'+set}'`\" = set"; then 
    16341633  echo $ac_n "(cached) $ac_c" 1>&6 
     
    16371636ac_cv_search_dlopen="no" 
    16381637cat > conftest.$ac_ext <<EOF 
    1639 #line 1640 "configure" 
     1638#line 1639 "configure" 
    16401639#include "confdefs.h" 
    16411640/* Override any gcc2 internal prototype to avoid an error.  */ 
     
    16481647; return 0; } 
    16491648EOF 
    1650 if { (eval echo configure:1651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
     1649if { (eval echo configure:1650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
    16511650  rm -rf conftest* 
    16521651  ac_cv_search_dlopen="none required" 
     
    16591658LIBS="-l$i  $ac_func_search_save_LIBS" 
    16601659cat > conftest.$ac_ext <<EOF 
    1661 #line 1662 "configure" 
     1660#line 1661 "configure" 
    16621661#include "confdefs.h" 
    16631662/* Override any gcc2 internal prototype to avoid an error.  */ 
     
    16701669; return 0; } 
    16711670EOF 
    1672 if { (eval echo configure:1673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
     1671if { (eval echo configure:1672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
    16731672  rm -rf conftest* 
    16741673  ac_cv_search_dlopen="-l$i" 
     
    16921691 
    16931692echo $ac_n "checking for sin""... $ac_c" 1>&6 
    1694 echo "configure:1695: checking for sin" >&5 
     1693echo "configure:1694: checking for sin" >&5 
    16951694if eval "test \"`echo '$''{'ac_cv_func_sin'+set}'`\" = set"; then 
    16961695  echo $ac_n "(cached) $ac_c" 1>&6 
    16971696else 
    16981697  cat > conftest.$ac_ext <<EOF 
    1699 #line 1700 "configure" 
     1698#line 1699 "configure" 
    17001699#include "confdefs.h" 
    17011700/* System header to define __stub macros and hopefully few prototypes, 
     
    17201719; return 0; } 
    17211720EOF 
    1722 if { (eval echo configure:1723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
     1721if { (eval echo configure:1722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
    17231722  rm -rf conftest* 
    17241723  eval "ac_cv_func_sin=yes" 
     
    17411740 
    17421741echo $ac_n "checking for main in -lieee""... $ac_c" 1>&6 
    1743 echo "configure:1744: checking for main in -lieee" >&5 
     1742echo "configure:1743: checking for main in -lieee" >&5 
    17441743ac_lib_var=`echo ieee'_'main | sed 'y%./+-%__p_%'` 
    17451744if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 
     
    17491748LIBS="-lieee  $LIBS" 
    17501749cat > conftest.$ac_ext <<EOF 
    1751 #line 1752 "configure" 
     1750#line 1751 "configure" 
    17521751#include "confdefs.h" 
    17531752 
     
    17561755; return 0; } 
    17571756EOF 
    1758 if { (eval echo configure:1759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
     1757if { (eval echo configure:1758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
    17591758  rm -rf conftest* 
    17601759  eval "ac_cv_lib_$ac_lib_var=yes" 
     
    17821781 
    17831782echo $ac_n "checking for int8_t""... $ac_c" 1>&6 
    1784 echo "configure:1785: checking for int8_t" >&5 
     1783echo "configure:1784: checking for int8_t" >&5 
    17851784if eval "test \"`echo '$''{'ac_cv_type_int8_t'+set}'`\" = set"; then 
    17861785  echo $ac_n "(cached) $ac_c" 1>&6 
    17871786else 
    17881787  cat > conftest.$ac_ext <<EOF 
    1789 #line 1790 "configure" 
     1788#line 1789 "configure" 
    17901789#include "confdefs.h" 
    17911790#include <sys/types.h> 
     
    18151814 
    18161815echo $ac_n "checking for int16_t""... $ac_c" 1>&6 
    1817 echo "configure:1818: checking for int16_t" >&5 
     1816echo "configure:1817: checking for int16_t" >&5 
    18181817if eval "test \"`echo '$''{'ac_cv_type_int16_t'+set}'`\" = set"; then 
    18191818  echo $ac_n "(cached) $ac_c" 1>&6 
    18201819else 
    18211820  cat > conftest.$ac_ext <<EOF 
    1822 #line 1823 "configure" 
     1821#line 1822 "configure" 
    18231822#include "confdefs.h" 
    18241823#include <sys/types.h> 
     
    18481847 
    18491848echo $ac_n "checking for int32_t""... $ac_c" 1>&6 
    1850 echo "configure:1851: checking for int32_t" >&5 
     1849echo "configure:1850: checking for int32_t" >&5 
    18511850if eval "test \"`echo '$''{'ac_cv_type_int32_t'+set}'`\" = set"; then 
    18521851  echo $ac_n "(cached) $ac_c" 1>&6 
    18531852else 
    18541853  cat > conftest.$ac_ext <<EOF 
    1855 #line 1856 "configure" 
     1854#line 1855 "configure" 
    18561855#include "confdefs.h" 
    18571856#include <sys/types.h> 
     
    18811880 
    18821881echo $ac_n "checking for int64_t""... $ac_c" 1>&6 
    1883 echo "configure:1884: checking for int64_t" >&5 
     1882echo "configure:1883: checking for int64_t" >&5 
    18841883if eval "test \"`echo '$''{'ac_cv_type_int64_t'+set}'`\" = set"; then 
    18851884  echo $ac_n "(cached) $ac_c" 1>&6 
    18861885else 
    18871886  cat > conftest.$ac_ext <<EOF 
    1888 #line 1889 "configure" 
     1887#line 1888 "configure" 
    18891888#include "confdefs.h" 
    18901889#include <sys/types.h> 
     
    19161915# Some systems have these in <stdint.h>, just to be difficult... 
    19171916echo $ac_n "checking for uint8_t in <stdint.h>""... $ac_c" 1>&6 
    1918 echo "configure:1919: checking for uint8_t in <stdint.h>" >&5 
     1917echo "configure:1918: checking for uint8_t in <stdint.h>" >&5 
    19191918if eval "test \"`echo '$''{'ucl_cv_uint8_t_in_stdint_h'+set}'`\" = set"; then 
    19201919  echo $ac_n "(cached) $ac_c" 1>&6 
    19211920else 
    19221921  cat > conftest.$ac_ext <<EOF 
    1923 #line 1924 "configure" 
     1922#line 1923 "configure" 
    19241923#include "confdefs.h" 
    19251924#include <stdint.h> 
     
    19411940then 
    19421941         echo $ac_n "checking for uint8_t""... $ac_c" 1>&6 
    1943 echo "configure:1944: checking for uint8_t" >&5 
     1942echo "configure:1943: checking for uint8_t" >&5 
    19441943if eval "test \"`echo '$''{'ac_cv_type_uint8_t'+set}'`\" = set"; then 
    19451944  echo $ac_n "(cached) $ac_c" 1>&6 
    19461945else 
    19471946  cat > conftest.$ac_ext <<EOF 
    1948 #line 1949 "configure" 
     1947#line 1948 "configure" 
    19491948#include "confdefs.h" 
    19501949#include <sys/types.h> 
     
    19761975 
    19771976echo $ac_n "checking for uint16_t in <stdint.h>""... $ac_c" 1>&6 
    1978 echo "configure:1979: checking for uint16_t in <stdint.h>" >&5 
     1977echo "configure:1978: checking for uint16_t in <stdint.h>" >&5 
    19791978if eval "test \"`echo '$''{'ucl_cv_uint16_t_in_stdint_h'+set}'`\" = set"; then 
    19801979  echo $ac_n "(cached) $ac_c" 1>&6 
    19811980else 
    19821981  cat > conftest.$ac_ext <<EOF 
    1983 #line 1984 "configure" 
     1982#line 1983 "configure" 
    19841983#include "confdefs.h" 
    19851984#include <stdint.h> 
     
    20012000then 
    20022001         echo $ac_n "checking for uint16_t""... $ac_c" 1>&6 
    2003 echo "configure:2004: checking for uint16_t" >&5 
     2002echo "configure:2003: checking for uint16_t" >&5 
    20042003if eval "test \"`echo '$''{'ac_cv_type_uint16_t'+set}'`\" = set"; then 
    20052004  echo $ac_n "(cached) $ac_c" 1>&6 
    20062005else 
    20072006  cat > conftest.$ac_ext <<EOF 
    2008 #line 2009 "configure" 
     2007#line 2008 "configure" 
    20092008#include "confdefs.h" 
    20102009#include <sys/types.h> 
     
    20362035 
    20372036echo $ac_n "checking for uint32_t in <stdint.h>""... $ac_c" 1>&6 
    2038 echo "configure:2039: checking for uint32_t in <stdint.h>" >&5 
     2037echo "configure:2038: checking for uint32_t in <stdint.h>" >&5 
    20392038if eval "test \"`echo '$''{'ucl_cv_uint32_t_in_stdint_h'+set}'`\" = set"; then 
    20402039  echo $ac_n "(cached) $ac_c" 1>&6 
    20412040else 
    20422041  cat > conftest.$ac_ext <<EOF 
    2043 #line 2044 "configure" 
     2042#line 2043 "configure" 
    20442043#include "confdefs.h" 
    20452044#include <stdint.h> 
     
    20612060then 
    20622061         echo $ac_n "checking for uint32_t""... $ac_c" 1>&6 
    2063 echo "configure:2064: checking for uint32_t" >&5 
     2062echo "configure:2063: checking for uint32_t" >&5 
    20642063if eval "test \"`echo '$''{'ac_cv_type_uint32_t'+set}'`\" = set"; then 
    20652064  echo $ac_n "(cached) $ac_c" 1>&6 
    20662065else 
    20672066  cat > conftest.$ac_ext <<EOF 
    2068 #line 2069 "configure" 
     2067#line 2068 "configure" 
    20692068#include "confdefs.h" 
    20702069#include <sys/types.h> 
     
    21202119EXTRA_OBJ= 
    21212120echo $ac_n "checking for usleep""... $ac_c" 1>&6 
    2122 echo "configure:2123: checking for usleep" >&5 
     2121echo "configure:2122: checking for usleep" >&5 
    21232122if eval "test \"`echo '$''{'ac_cv_func_usleep'+set}'`\" = set"; then 
    21242123  echo $ac_n "(cached) $ac_c" 1>&6 
    21252124else 
    21262125  cat > conftest.$ac_ext <<EOF 
    2127 #line 2128 "configure" 
     2126#line 2127 "configure" 
    21282127#include "confdefs.h" 
    21292128/* System header to define __stub macros and hopefully few prototypes, 
     
    21482147; return 0; } 
    21492148EOF 
    2150 if { (eval echo configure:2151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
     2149if { (eval echo configure:2150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
    21512150  rm -rf conftest* 
    21522151  eval "ac_cv_func_usleep=yes" 
     
    22062205        ac_safe=`echo "$O1KHOME/include/oti_audio_device.h" | sed 'y%./+-%__p_%'` 
    22072206echo $ac_n "checking for $O1KHOME/include/oti_audio_device.h""... $ac_c" 1>&6 
    2208 echo "configure:2209: checking for $O1KHOME/include/oti_audio_device.h" >&5 
     2207echo "configure:2208: checking for $O1KHOME/include/oti_audio_device.h" >&5 
    22092208if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 
    22102209  echo $ac_n "(cached) $ac_c" 1>&6 
    22112210else 
    22122211  cat > conftest.$ac_ext <<EOF 
    2213 #line 2214 "configure" 
     2212#line 2213 "configure" 
    22142213#include "confdefs.h" 
    22152214#include <$O1KHOME/include/oti_audio_device.h> 
    22162215EOF 
    22172216ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 
    2218 { (eval echo configure:2219: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 
     2217{ (eval echo configure:2218: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 
    22192218ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 
    22202219if test -z "$ac_err"; then 
     
    22572256ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 
    22582257echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 
    2259 echo "configure:2260: checking for $ac_hdr" >&5 
     2258echo "configure:2259: checking for $ac_hdr" >&5 
    22602259if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 
    22612260  echo $ac_n "(cached) $ac_c" 1>&6 
    22622261else 
    22632262  cat > conftest.$ac_ext <<EOF 
    2264 #line 2265 "configure" 
     2263#line 2264 "configure" 
    22652264#include "confdefs.h" 
    22662265#include <$ac_hdr> 
    22672266EOF 
    22682267ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 
    2269 { (eval echo configure:2270: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 
     2268{ (eval echo configure:2269: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 
    22702269ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 
    22712270if test -z "$ac_err"; then 
     
    23292328 
    23302329 
    2331 # X 
     2330# X  
     2331#------------------------------------------------------------------------------ 
     2332# Use autoconf inbuilt X location.  Works v. nicely.  Substitution of X vars 
     2333# comes after broken X11 header check and attempted fix. 
     2334#------------------------------------------------------------------------------ 
    23322335# If we find X, set shell vars x_includes and x_libraries to the 
    23332336# paths, otherwise set no_x=yes. 
     
    23352338# --without-x overrides everything else, but does not touch the cache. 
    23362339echo $ac_n "checking for X""... $ac_c" 1>&6 
    2337 echo "configure:2338: checking for X" >&5 
     2340echo "configure:2341: checking for X" >&5 
    23382341 
    23392342# Check whether --with-x or --without-x was given. 
     
    23972400  # First, try using that file with no special directory specified. 
    23982401cat > conftest.$ac_ext <<EOF 
    2399 #line 2400 "configure" 
     2402#line 2403 "configure" 
    24002403#include "confdefs.h" 
    24012404#include <$x_direct_test_include> 
    24022405EOF 
    24032406ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 
    2404 { (eval echo configure:2405: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 
     2407{ (eval echo configure:2408: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 
    24052408ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 
    24062409if test -z "$ac_err"; then 
     
    24712474  LIBS="-l$x_direct_test_library $LIBS" 
    24722475cat > conftest.$ac_ext <<EOF 
    2473 #line 2474 "configure" 
     2476#line 2477 "configure" 
    24742477#include "confdefs.h" 
    24752478 
     
    24782481; return 0; } 
    24792482EOF 
    2480 if { (eval echo configure:2481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
     2483if { (eval echo configure:2484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
    24812484  rm -rf conftest* 
    24822485  LIBS="$ac_save_LIBS" 
     
    25842587    "SunOS 5"*) 
    25852588      echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 
    2586 echo "configure:2587: checking whether -R must be followed by a space" >&5 
     2589echo "configure:2590: checking whether -R must be followed by a space" >&5 
    25872590      ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" 
    25882591      cat > conftest.$ac_ext <<EOF 
    2589 #line 2590 "configure" 
     2592#line 2593 "configure" 
    25902593#include "confdefs.h" 
    25912594 
     
    25942597; return 0; } 
    25952598EOF 
    2596 if { (eval echo configure:2597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
     2599if { (eval echo configure:2600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
    25972600  rm -rf conftest* 
    25982601  ac_R_nospace=yes 
     
    26102613        LIBS="$ac_xsave_LIBS -R $x_libraries" 
    26112614        cat > conftest.$ac_ext <<EOF 
    2612 #line 2613 "configure" 
     2615#line 2616 "configure" 
    26132616#include "confdefs.h" 
    26142617 
     
    26172620; return 0; } 
    26182621EOF 
    2619 if { (eval echo configure:2620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
     2622if { (eval echo configure:2623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
    26202623  rm -rf conftest* 
    26212624  ac_R_space=yes 
     
    26492652    # the Alpha needs dnet_stub (dnet does not exist). 
    26502653    echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 
    2651 echo "configure:2652: checking for dnet_ntoa in -ldnet" >&5 
     2654echo "configure:2655: checking for dnet_ntoa in -ldnet" >&5 
    26522655ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` 
    26532656if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 
     
    26572660LIBS="-ldnet  $LIBS" 
    26582661cat > conftest.$ac_ext <<EOF 
    2659 #line 2660 "configure" 
     2662#line 2663 "configure" 
    26602663#include "confdefs.h" 
    26612664/* Override any gcc2 internal prototype to avoid an error.  */ 
     
    26682671; return 0; } 
    26692672EOF 
    2670 if { (eval echo configure:2671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
     2673if { (eval echo configure:2674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
    26712674  rm -rf conftest* 
    26722675  eval "ac_cv_lib_$ac_lib_var=yes" 
     
    26902693    if test $ac_cv_lib_dnet_dnet_ntoa = no; then 
    26912694      echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 
    2692 echo "configure:2693: checking for dnet_ntoa in -ldnet_stub" >&5 
     2695echo "configure:2696: checking for dnet_ntoa in -ldnet_stub" >&5 
    26932696ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` 
    26942697if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 
     
    26982701LIBS="-ldnet_stub  $LIBS" 
    26992702cat > conftest.$ac_ext <<EOF 
    2700 #line 2701 "configure" 
     2703#line 2704 "configure" 
    27012704#include "confdefs.h" 
    27022705/* Override any gcc2 internal prototype to avoid an error.  */ 
     
    27092712; return 0; } 
    27102713EOF 
    2711 if { (eval echo configure:2712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
     2714if { (eval echo configure:2715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
    27122715  rm -rf conftest* 
    27132716  eval "ac_cv_lib_$ac_lib_var=yes" 
     
    27382741    # on Irix 5.2, according to dickey@clark.net. 
    27392742    echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 
    2740 echo "configure:2741: checking for gethostbyname" >&5 
     2743echo "configure:2744: checking for gethostbyname" >&5 
    27412744if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then 
    27422745  echo $ac_n "(cached) $ac_c" 1>&6 
    27432746else 
    27442747  cat > conftest.$ac_ext <<EOF 
    2745 #line 2746 "configure" 
     2748#line 2749 "configure" 
    27462749#include "confdefs.h" 
    27472750/* System header to define __stub macros and hopefully few prototypes, 
     
    27662769; return 0; } 
    27672770EOF 
    2768 if { (eval echo configure:2769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
     2771if { (eval echo configure:2772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
    27692772  rm -rf conftest* 
    27702773  eval "ac_cv_func_gethostbyname=yes" 
     
    27872790    if test $ac_cv_func_gethostbyname = no; then 
    27882791      echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 
    2789 echo "configure:2790: checking for gethostbyname in -lnsl" >&5 
     2792echo "configure:2793: checking for gethostbyname in -lnsl" >&5 
    27902793ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` 
    27912794if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 
     
    27952798LIBS="-lnsl  $LIBS" 
    27962799cat > conftest.$ac_ext <<EOF 
    2797 #line 2798 "configure" 
     2800#line 2801 "configure" 
    27982801#include "confdefs.h" 
    27992802/* Override any gcc2 internal prototype to avoid an error.  */ 
     
    28062809; return 0; } 
    28072810EOF 
    2808 if { (eval echo configure:2809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
     2811if { (eval echo configure:2812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
    28092812  rm -rf conftest* 
    28102813  eval "ac_cv_lib_$ac_lib_var=yes" 
     
    28362839    # We assume that if connect needs -lnsl, so does gethostbyname. 
    28372840    echo $ac_n "checking for connect""... $ac_c" 1>&6 
    2838 echo "configure:2839: checking for connect" >&5 
     2841echo "configure:2842: checking for connect" >&5 
    28392842if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then 
    28402843  echo $ac_n "(cached) $ac_c" 1>&6 
    28412844else 
    28422845  cat > conftest.$ac_ext <<EOF 
    2843 #line 2844 "configure" 
     2846#line 2847 "configure" 
    28442847#include "confdefs.h" 
    28452848/* System header to define __stub macros and hopefully few prototypes, 
     
    28642867; return 0; } 
    28652868EOF 
    2866 if { (eval echo configure:2867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
     2869if { (eval echo configure:2870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
    28672870  rm -rf conftest* 
    28682871  eval "ac_cv_func_connect=yes" 
     
    28852888    if test $ac_cv_func_connect = no; then 
    28862889      echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 
    2887 echo "configure:2888: checking for connect in -lsocket" >&5 
     2890echo "configure:2891: checking for connect in -lsocket" >&5 
    28882891ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` 
    28892892if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 
     
    28932896LIBS="-lsocket $X_EXTRA_LIBS $LIBS" 
    28942897cat > conftest.$ac_ext <<EOF 
    2895 #line 2896 "configure" 
     2898#line 2899 "configure" 
    28962899#include "confdefs.h" 
    28972900/* Override any gcc2 internal prototype to avoid an error.  */ 
     
    29042907; return 0; } 
    29052908EOF 
    2906 if { (eval echo configure:2907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
     2909if { (eval echo configure:2910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
    29072910  rm -rf conftest* 
    29082911  eval "ac_cv_lib_$ac_lib_var=yes" 
     
    29282931    # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. 
    29292932    echo $ac_n "checking for remove""... $ac_c" 1>&6 
    2930 echo "configure:2931: checking for remove" >&5 
     2933echo "configure:2934: checking for remove" >&5 
    29312934if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then 
    29322935  echo $ac_n "(cached) $ac_c" 1>&6 
    29332936else 
    29342937  cat > conftest.$ac_ext <<EOF 
    2935 #line 2936 "configure" 
     2938#line 2939 "configure" 
    29362939#include "confdefs.h" 
    29372940/* System header to define __stub macros and hopefully few prototypes, 
     
    29562959; return 0; } 
    29572960EOF 
    2958 if { (eval echo configure:2959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
     2961if { (eval echo configure:2962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
    29592962  rm -rf conftest* 
    29602963  eval "ac_cv_func_remove=yes" 
     
    29772980    if test $ac_cv_func_remove = no; then 
    29782981      echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 
    2979 echo "configure:2980: checking for remove in -lposix" >&5 
     2982echo "configure:2983: checking for remove in -lposix" >&5 
    29802983ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` 
    29812984if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 
     
    29852988LIBS="-lposix  $LIBS" 
    29862989cat > conftest.$ac_ext <<EOF 
    2987 #line 2988 "configure" 
     2990#line 2991 "configure" 
    29882991#include "confdefs.h" 
    29892992/* Override any gcc2 internal prototype to avoid an error.  */ 
     
    29962999; return 0; } 
    29973000EOF 
    2998 if { (eval echo configure:2999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
     3001if { (eval echo configure:3002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
    29993002  rm -rf conftest* 
    30003003  eval "ac_cv_lib_$ac_lib_var=yes" 
     
    30203023    # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. 
    30213024    echo $ac_n "checking for shmat""... $ac_c" 1>&6 
    3022 echo "configure:3023: checking for shmat" >&5 
     3025echo "configure:3026: checking for shmat" >&5 
    30233026if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then 
    30243027  echo $ac_n "(cached) $ac_c" 1>&6 
    30253028else 
    30263029  cat > conftest.$ac_ext <<EOF 
    3027 #line 3028 "configure" 
     3030#line 3031 "configure" 
    30283031#include "confdefs.h" 
    30293032/* System header to define __stub macros and hopefully few prototypes, 
     
    30483051; return 0; } 
    30493052EOF 
    3050 if { (eval echo configure:3051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
     3053if { (eval echo configure:3054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
    30513054  rm -rf conftest* 
    30523055  eval "ac_cv_func_shmat=yes" 
     
    30693072    if test $ac_cv_func_shmat = no; then 
    30703073      echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 
    3071 echo "configure:3072: checking for shmat in -lipc" >&5 
     3074echo "configure:3075: checking for shmat in -lipc" >&5 
    30723075ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` 
    30733076if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 
     
    30773080LIBS="-lipc  $LIBS" 
    30783081cat > conftest.$ac_ext <<EOF 
    3079 #line 3080 "configure" 
     3082#line 3083 "configure" 
    30803083#include "confdefs.h" 
    30813084/* Override any gcc2 internal prototype to avoid an error.  */ 
     
    30883091; return 0; } 
    30893092EOF 
    3090 if { (eval echo configure:3091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
     3093if { (eval echo configure:3094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
    30913094  rm -rf conftest* 
    30923095  eval "ac_cv_lib_$ac_lib_var=yes" 
     
    31213124  #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu. 
    31223125  echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 
    3123 echo "configure:3124: checking for IceConnectionNumber in -lICE" >&5 
     3126echo "configure:3127: checking for IceConnectionNumber in -lICE" >&5 
    31243127ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` 
    31253128if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 
     
    31293132LIBS="-lICE $X_EXTRA_LIBS $LIBS" 
    31303133cat > conftest.$ac_ext <<EOF 
    3131 #line 3132 "configure" 
     3134#line 3135 "configure" 
    31323135#include "confdefs.h" 
    31333136/* Override any gcc2 internal prototype to avoid an error.  */ 
     
    31403143; return 0; } 
    31413144EOF 
    3142 if { (eval echo configure:3143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
     3145if { (eval echo configure:3146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
    31433146  rm -rf conftest* 
    31443147  eval "ac_cv_lib_$ac_lib_var=yes" 
     
    31633166 
    31643167fi 
    3165  
    3166  
    3167  
    3168  
    31693168 
    31703169 
     
    31743173# (e.g. Solaris). 
    31753174#------------------------------------------------------------------------------ 
    3176 echo $ac_n "checking broken X11 headers""... $ac_c" 1>&6 
    3177 echo "configure:3178: checking broken X11 headers" >&5 
    3178 SAVED_CFLAGS=$CFLAGS 
    3179 CFLAGS="$X_CFLAGS $CFLAGS" 
    3180 cat > conftest.$ac_ext <<EOF 
    3181 #line 3182 "configure" 
     3175echo $ac_n "checking whether X11 headers are broken""... $ac_c" 1>&6 
     3176echo "configure:3177: checking whether X11 headers are broken" >&5 
     3177if eval "test \"`echo '$''{'x11_cv_broken_headers'+set}'`\" = set"; then 
     3178  echo $ac_n "(cached) $ac_c" 1>&6 
     3179else 
     3180   
     3181                SAVED_CFLAGS=$CFLAGS 
     3182                CFLAGS="$X_CFLAGS $CFLAGS" 
     3183                cat > conftest.$ac_ext <<EOF 
     3184#line 3185 "configure" 
    31823185#include "confdefs.h" 
    31833186#include <X11/Xlib.h> 
    3184 #include <X11/Xutil.h> 
     3187                #include <X11/Xutil.h> 
    31853188int main() { 
    31863189return 0 
    31873190; return 0; } 
    31883191EOF 
    3189 if { (eval echo configure:3190: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 
    3190   rm -rf conftest* 
    3191   echo "$ac_t""no" 1>&6 
    3192 else 
    3193   echo "configure: failed program was:" >&5 
    3194   cat conftest.$ac_ext >&5 
    3195   rm -rf conftest* 
    3196   echo "$ac_t""yes" 1>&6 
    3197 fi 
    3198 rm -f conftest* 
    3199 CFLAGS=$SAVED_CFLAGS 
     3192if { (eval echo configure:3193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 
     3193  rm -rf conftest* 
     3194  x11_cv_broken_headers=no 
     3195else 
     3196  echo "configure: failed program was:" >&5 
     3197  cat conftest.$ac_ext >&5 
     3198  rm -rf conftest* 
     3199  x11_cv_broken_headers=yes 
     3200fi 
     3201rm -f conftest* 
     3202                CFLAGS=$SAVED_CFLAGS 
     3203         
     3204fi 
     3205 
     3206echo "$ac_t""$x11_cv_broken_headers" 1>&6; 
     3207#------------------------------------------------------------------------------ 
     3208# Attempt to make local copies of headers. 
     3209#------------------------------------------------------------------------------ 
     3210if test $x11_cv_broken_headers=yes ; then 
     3211        if test ! -d ./X11 ; then 
     3212                mkdir ./X11 
     3213                for header in Xlib.h Xutil.h 
     3214                do 
     3215                        cat $x_includes/X11/$header | sed 's/^\(extern\) \([A-Za-z0-9]*($\)/\1 int \2/' > X11/$header 
     3216                        echo "creating ./X11/$header" 
     3217                done 
     3218        fi 
     3219        X_CFLAGS="-I. $X_CFLAGS" 
     3220fi 
     3221 
     3222 
     3223 
     3224 
     3225 
    32003226 
    32013227# TCL/TK  
    3202 #------------------------------------------------------------------------------# We could be dealing with a source installation or a full installation. 
     3228#------------------------------------------------------------------------------ 
     3229# We could be dealing with a source installation or a full installation. 
    32033230# Expect a source installation to have headers in TCL8_HOME/generic and libs in 
    32043231# TCL8_HOME/unix.  A full installation should have headers in  
    3205 # ROOT/include/tcl8.0 or ROOT/include.  Libraries should be in ROOT/lib 
     3232# INSTDIR/include/tcl8.0, or INSTDIR/include, and have libraries be in  
     3233# INSTDIR/lib. 
    32063234#------------------------------------------------------------------------------ 
    32073235PARENT=`echo $PWD | sed -e 's%/[^/]*$%%'` 
     
    32123240if test "${with_tcl+set}" = set; then 
    32133241  withval="$with_tcl" 
    3214    TCL_INC=$withval 
    3215           TCL_LIB=$withval 
     3242  TCL_INC=$withval 
     3243         TCL_LIB=$withval 
    32163244fi 
    32173245 
     
    32283256ac_safe=`echo "${TCL_INC}/tcl.h" | sed 'y%./+-%__p_%'` 
    32293257echo $ac_n "checking for ${TCL_INC}/tcl.h""... $ac_c" 1>&6 
    3230 echo "configure:3231: checking for ${TCL_INC}/tcl.h" >&5 
     3258echo "configure:3259: checking for ${TCL_INC}/tcl.h" >&5 
    32313259if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 
    32323260  echo $ac_n "(cached) $ac_c" 1>&6 
    32333261else 
    32343262  cat > conftest.$ac_ext <<EOF 
    3235 #line 3236 "configure" 
     3263#line 3264 "configure" 
    32363264#include "confdefs.h" 
    32373265#include <${TCL_INC}/tcl.h> 
    32383266EOF 
    32393267ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 
    3240 { (eval echo configure:3241: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 
     3268{ (eval echo configure:3269: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 
    32413269ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 
    32423270if test -z "$ac_err"; then 
     
    32843312 
    32853313echo $ac_n "checking for library containing Tcl_Init""... $ac_c" 1>&6 
    3286 echo "configure:3287: checking for library containing Tcl_Init" >&5 
     3314echo "configure:3315: checking for library containing Tcl_Init" >&5 
    32873315if eval "test \"`echo '$''{'ac_cv_search_Tcl_Init'+set}'`\" = set"; then 
    32883316  echo $ac_n "(cached) $ac_c" 1>&6 
     
    32913319ac_cv_search_Tcl_Init="no" 
    32923320cat > conftest.$ac_ext <<EOF 
    3293 #line 3294 "configure" 
     3321#line 3322 "configure" 
    32943322#include "confdefs.h" 
    32953323/* Override any gcc2 internal prototype to avoid an error.  */ 
     
    33023330; return 0; } 
    33033331EOF 
    3304 if { (eval echo configure:3305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
     3332if { (eval echo configure:3333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
    33053333  rm -rf conftest* 
    33063334  ac_cv_search_Tcl_Init="none required" 
     
    33133341LIBS="-l$i -L${TCL_LIB} ${SAVED_LIBS} -lm $ac_func_search_save_LIBS" 
    33143342cat > conftest.$ac_ext <<EOF 
    3315 #line 3316 "configure" 
     3343#line 3344 "configure" 
    33163344#include "confdefs.h" 
    33173345/* Override any gcc2 internal prototype to avoid an error.  */ 
     
    33243352; return 0; } 
    33253353EOF 
    3326 if { (eval echo configure:3327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
     3354if { (eval echo configure:3355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
    33273355  rm -rf conftest* 
    33283356  ac_cv_search_Tcl_Init="-l$i" 
     
    33623390if test "${with_tk+set}" = set; then 
    33633391  withval="$with_tk" 
    3364    TK_INC=$withval 
    3365           TK_LIB=$withval 
     3392  TK_INC=$withval 
     3393         TK_LIB=$withval 
    33663394fi 
    33673395 
     
    33743402do 
    33753403        echo $ac_n "checking for $i/tk.h""... $ac_c" 1>&6 
    3376 echo "configure:3377: checking for $i/tk.h" >&5 
     3404echo "configure:3405: checking for $i/tk.h" >&5 
    33773405        if test -r $i/tk.h ; then 
    33783406                TK_INC=-I$i 
     
    34063434 
    34073435echo $ac_n "checking for library containing Tk_Init""... $ac_c" 1>&6 
    3408 echo "configure:3409: checking for library containing Tk_Init" >&5 
     3436echo "configure:3437: checking for library containing Tk_Init" >&5 
    34093437if eval "test \"`echo '$''{'ac_cv_search_Tk_Init'+set}'`\" = set"; then 
    34103438  echo $ac_n "(cached) $ac_c" 1>&6 
     
    34133441ac_cv_search_Tk_Init="no" 
    34143442cat > conftest.$ac_ext <<EOF 
    3415 #line 3416 "configure" 
     3443#line 3444 "configure" 
    34163444#include "confdefs.h" 
    34173445/* Override any gcc2 internal prototype to avoid an error.  */ 
     
    34243452; return 0; } 
    34253453EOF 
    3426 if { (eval echo configure:3427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
     3454if { (eval echo configure:3455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
    34273455  rm -rf conftest* 
    34283456  ac_cv_search_Tk_Init="none required" 
     
    34353463LIBS="-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" 
    34363464cat > conftest.$ac_ext <<EOF 
    3437 #line 3438 "configure" 
     3465#line 3466 "configure" 
    34383466#include "confdefs.h" 
    34393467/* Override any gcc2 internal prototype to avoid an error.  */ 
     
    34463474; return 0; } 
    34473475EOF 
    3448 if { (eval echo configure:3449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
     3476if { (eval echo configure:3477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
    34493477  rm -rf conftest* 
    34503478  ac_cv_search_Tk_Init="-l$i" 
     
    35013529ac_safe=`echo "$h/mbus.h" | sed 'y%./+-%__p_%'` 
    35023530echo $ac_n "checking for $h/mbus.h""... $ac_c" 1>&6 
    3503 echo "configure:3504: checking for $h/mbus.h" >&5 
     3531echo "configure:3532: checking for $h/mbus.h" >&5 
    35043532if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 
    35053533  echo $ac_n "(cached) $ac_c" 1>&6 
    35063534else 
    35073535  cat > conftest.$ac_ext <<EOF 
    3508 #line 3509 "configure" 
     3536#line 3537 "configure" 
    35093537#include "confdefs.h" 
    35103538#include <$h/mbus.h> 
    35113539EOF 
    35123540ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 
    3513 { (eval echo configure:3514: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 
     3541{ (eval echo configure:3542: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 
    35143542ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 
    35153543if test -z "$ac_err"; then 
     
    35543582 
    35553583echo $ac_n "checking for mbus_init in -lcommon""... $ac_c" 1>&6 
    3556 echo "configure:3557: checking for mbus_init in -lcommon" >&5 
     3584echo "configure:3585: checking for mbus_init in -lcommon" >&5 
    35573585ac_lib_var=`echo common'_'mbus_init | sed 'y%./+-%__p_%'` 
    35583586if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 
     
    35623590LIBS="-lcommon -L${COMMON_LIB} $LIBS" 
    35633591cat > conftest.$ac_ext <<EOF 
    3564 #line 3565 "configure" 
     3592#line 3593 "configure" 
    35653593#include "confdefs.h" 
    35663594/* Override any gcc2 internal prototype to avoid an error.  */ 
     
    35733601; return 0; } 
    35743602EOF 
    3575 if { (eval echo configure:3576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
     3603if { (eval echo configure:3604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 
    35763604  rm -rf conftest* 
    35773605  eval "ac_cv_lib_$ac_lib_var=yes" 
     
    36703698#----------------------------------------------------------------------------- 
    36713699echo $ac_n "checking signed arithmetic shift right""... $ac_c" 1>&6 
    3672 echo "configure:3673: checking signed arithmetic shift right" >&5 
     3700echo "configure:3701: checking signed arithmetic shift right" >&5 
    36733701if eval "test \"`echo '$''{'gsm_cv_sasr'+set}'`\" = set"; then 
    36743702  echo $ac_n "(cached) $ac_c" 1>&6 
     
    36783706else 
    36793707  cat > conftest.$ac_ext <<EOF 
    3680 #line 3681 "configure" 
     3708#line 3709 "configure" 
    36813709#include "confdefs.h" 
    36823710int main() { return (-1 >> 1) != -1;} 
    36833711EOF 
    3684 if { (eval echo configure:3685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 
     3712if { (eval echo configure:3713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 
    36853713then 
    36863714  gsm_cv_sasr=yes 
  • rat/trunk/configure.in

    r3000 r3001  
    187187AC_SUBST(AU_LIB) 
    188188 
    189 # X 
     189# X  
     190#------------------------------------------------------------------------------ 
     191# Use autoconf inbuilt X location.  Works v. nicely.  Substitution of X vars 
     192# comes after broken X11 header check and attempted fix. 
     193#------------------------------------------------------------------------------ 
    190194AC_PATH_XTRA 
     195 
     196#------------------------------------------------------------------------------ 
     197# Check if X headers are broken.  GCC 2.95 and up reject headers that don't 
     198# have omit types, X11 headers have implicit int declarations on some systems 
     199# (e.g. Solaris). 
     200#------------------------------------------------------------------------------ 
     201AC_CACHE_CHECK(whether X11 headers are broken, x11_cv_broken_headers, [ 
     202                SAVED_CFLAGS=$CFLAGS 
     203                CFLAGS="$X_CFLAGS $CFLAGS" 
     204                AC_TRY_COMPILE([#include <X11/Xlib.h> 
     205                #include <X11/Xutil.h>], 
     206                return 0, 
     207                x11_cv_broken_headers=no, 
     208                x11_cv_broken_headers=yes) 
     209                CFLAGS=$SAVED_CFLAGS 
     210        ]); 
     211#------------------------------------------------------------------------------ 
     212# Attempt to make local fixed copies of headers. 
     213#------------------------------------------------------------------------------ 
     214if test $x11_cv_broken_headers=yes ; then 
     215        if test ! -d ./X11 ; then 
     216                mkdir ./X11 
     217                for header in Xlib.h Xutil.h 
     218                do 
     219                        cat $x_includes/X11/$header | sed 's/^\(extern\) \([[A-Za-z0-9]]*($\)/\1 int \2/' > X11/$header 
     220                        echo "creating ./X11/$header" 
     221                done 
     222        fi 
     223        X_CFLAGS="-I. $X_CFLAGS" 
     224fi 
     225 
    191226AC_SUBST(X_CFLAGS) 
    192227AC_SUBST(X_LIBS) 
     
    194229AC_SUBST(X_PRE_LIBS) 
    195230 
    196 #------------------------------------------------------------------------------ 
    197 # Check if X headers are broken.  GCC 2.95 and up reject headers that don't 
    198 # have omit types, X11 headers have implicit int declarations on some systems 
    199 # (e.g. Solaris). 
    200 #------------------------------------------------------------------------------ 
    201 AC_MSG_CHECKING(whether X11 headers are broken) 
    202 SAVED_CFLAGS=$CFLAGS 
    203 CFLAGS="$X_CFLAGS $CFLAGS" 
    204 AC_TRY_COMPILE([#include <X11/Xlib.h> 
    205 #include <X11/Xutil.h>], 
    206         return 0, 
    207         AC_MSG_RESULT(no), 
    208         AC_MSG_RESULT(yes)) 
    209 CFLAGS=$SAVED_CFLAGS 
    210  
    211231# TCL/TK  
    212232#------------------------------------------------------------------------------ 
     
    214234# Expect a source installation to have headers in TCL8_HOME/generic and libs in 
    215235# TCL8_HOME/unix.  A full installation should have headers in  
    216 # ROOT/include/tcl8.0, or ROOT/include, and have libraries be in ROOT/lib 
     236# INSTDIR/include/tcl8.0, or INSTDIR/include, and have libraries be in  
     237# INSTDIR/lib. 
    217238#------------------------------------------------------------------------------ 
    218239PARENT=`echo $PWD | sed -e 's%/[[^/]]*$%%'`