Ticket #58058: configure.diff

File configure.diff, 4.4 KB (added by jmroot (Joshua Root), 6 years ago)
  • configure

    old new  
    5959# work okay, usually.
    6060
    6161# Set some defaults
    62 XINCPATH="/usr/X11R6/include /usr/X11/include /usr/include /usr/include/X11 /usr/local/X11/include /usr/openwin/include"
    63 XLIBPATH="/lib /usr/lib /usr/X11/lib /usr/local/X11/lib /usr/openwin/lib /usr/X11R6/lib /usr/ucblib /usr/ccs/lib /usr/local/lib "`echo "$LD_LIBRARY_PATH" | tr ':' ' '`
     62XINCPATH="/usr/X11R6/include /usr/X11/include @@SDKROOT@@/usr/include /usr/include/X11 /usr/local/X11/include /usr/openwin/include"
     63XLIBPATH="/lib @@SDKROOT@@/usr/lib /usr/X11/lib /usr/local/X11/lib /usr/openwin/lib /usr/X11R6/lib /usr/ucblib /usr/ccs/lib /usr/local/lib "`echo "$LD_LIBRARY_PATH" | tr ':' ' '`
    6464GNUPATH=`echo "$PATH" | tr ':' ' '`
    6565PREFIX=/usr
    6666BINDIR='$(PREFIX)/bin'
     
    488488
    489489
    490490# Check for some known system quirks
    491 if [ -f /usr/include/sys/ptem.h ]
     491if [ -f @@SDKROOT@@/usr/include/sys/ptem.h ]
    492492then
    493493        why "This system has a <sys/ptem.h> file so I assume elvis needs it"
    494494        NEED_WINSIZE=define
    495495else
    496496        why "This system has no <sys/ptem.h> file so I assume elvis doesn't need it"
    497497fi
    498 if [ -f /usr/include/termcap.h ]
     498if [ -f @@SDKROOT@@/usr/include/termcap.h ]
    499499then
    500500        why "This system has a <termcap.h> file so I assume elvis needs it"
    501501        NEED_SPEED_T=define
    502502else
    503503        why "This system has no <termcap.h> file so I assume elvis doesn't need it"
    504504fi
    505 if [ -f /usr/include/sys/wait.h ]
     505if [ -f @@SDKROOT@@/usr/include/sys/wait.h ]
    506506then
    507507        why "This system has a <sys/wait.h> file so I assume elvis needs it"
    508508        NEED_WAIT_H=define
    509509else
    510510        why "This system has no <sys/wait.h> file so I assume elvis doesn't need it"
    511511fi
    512 if [ -f /usr/include/sys/select.h ]
     512if [ -f @@SDKROOT@@/usr/include/sys/select.h ]
    513513then
    514514        why "This system has a <sys/select.h> file so I assume elvis needs it"
    515515        NEED_SELECT_H=define
    516516else
    517517        why "This system has no <sys/select.h> file so I assume elvis doesn't need it"
    518518fi
    519 if [ -f /usr/include/sys/ioctl.h ]
     519if [ -f @@SDKROOT@@/usr/include/sys/ioctl.h ]
    520520then
    521521        why "This system has a <sys/ioctl.h> file so I assume elvis needs it"
    522522        NEED_IOCTL_H=define
    523523else
    524524        why "This system has no <sys/ioctl.h> file so I assume elvis doesn't need it"
    525525fi
    526 if [ -f /usr/include/netinet/in.h ]
     526if [ -f @@SDKROOT@@/usr/include/netinet/in.h ]
    527527then
    528528        why "This system has a <netinet/in.h> file so I assume elvis needs it"
    529529        NEED_IN_H=define
    530530else
    531531        why "This system has no <netinet/in.h> file so I assume elvis doesn't need it"
    532532fi
    533 if [ -f /usr/include/sys/socket.h ]
     533if [ -f @@SDKROOT@@/usr/include/sys/socket.h ]
    534534then
    535535        why "This system has a <sys/socket.h> file so I assume elvis needs it"
    536536        NEED_SOCKET_H=define
     
    548548        fi
    549549fi
    550550why "Does this system support setpgid()?"
    551 if fgrep setpgid /usr/include/unistd.h >/dev/null 2>/dev/null
     551if fgrep setpgid @@SDKROOT@@/usr/include/unistd.h >/dev/null 2>/dev/null
    552552then
    553553        why "   Assuming yes, because it is declared in <unistd.h>"
    554554        NEED_SETPGID=undef
     
    557557        NEED_SETPGID=define
    558558fi
    559559why "Does this system support freopen()?"
    560 if fgrep freopen /usr/include/stdio.h >/dev/null 2>/dev/null
     560if fgrep freopen @@SDKROOT@@/usr/include/stdio.h >/dev/null 2>/dev/null
    561561then
    562562        why "   Assuming yes, because it is declared in <stdio.h>"
    563563        NEED_FREOPEN=undef
     
    584584        then
    585585                why "   Assuming no, because this is a Sun system."
    586586                NEED_INET_ATON=define
    587         elif fgrep inet_aton /usr/include/arpa/inet.h </dev/null >/dev/null
     587        elif fgrep inet_aton @@SDKROOT@@/usr/include/arpa/inet.h </dev/null >/dev/null
    588588        then
    589589                why "   Assuming yes, because it is declared in <arpa/inet.h>"
    590590                NEED_INET_ATON=undef
     
    605605        fi
    606606fi
    607607why "Does this system support memmove()?"
    608 if fgrep memmove /usr/include/string*.h </dev/null >/dev/null
     608if fgrep memmove @@SDKROOT@@/usr/include/string*.h </dev/null >/dev/null
    609609then
    610610        why "   Assuming yes, because it is declared in <string.h> or <strings.h>"
    611611        NEED_MEMMOVE=undef
     
    619619  sgtty)        USE=" -DUSE_SGTTY"      ;;
    620620  *)
    621621        why "Choosing a type of ioctl() calls, since no --ioctl=... argument was given"
    622         if [ -f /usr/include/termios.h ]
     622        if [ -f @@SDKROOT@@/usr/include/termios.h ]
    623623        then
    624624                USE=
    625625                args="$args --ioctl=termios"
    626626                why "   Assuming --ioctl=termios because <termios.h> exists"
    627627        else
    628                 if [ -f /usr/include/termio.h ]
     628                if [ -f @@SDKROOT@@/usr/include/termio.h ]
    629629                then
    630630                        USE=" -DUSE_TERMIO"
    631631                        args="$args --ioctl=termio"