--- sourceforge.net/trunk/rdesktop/configure.ac 2004/08/08 11:17:12 743 +++ sourceforge.net/trunk/rdesktop/configure.ac 2004/12/13 12:41:20 802 @@ -16,6 +16,11 @@ AC_SEARCH_LIBS(socket, socket) AC_SEARCH_LIBS(inet_aton, resolv) +AC_CHECK_HEADER(sys/select.h, AC_DEFINE(HAVE_SYS_SELECT_H)) +AC_CHECK_HEADER(sys/modem.h, AC_DEFINE(HAVE_SYS_MODEM_H)) +AC_CHECK_HEADER(sys/filio.h, AC_DEFINE(HAVE_SYS_FILIO_H)) +AC_CHECK_HEADER(sys/strtio.h, AC_DEFINE(HAVE_SYS_STRTIO_H)) + rpath="" # @@ -132,12 +137,13 @@ # sound="yes" AC_ARG_WITH(sound, - [ --with-sound select sound system ("oss" or "sun") ], + [ --with-sound select sound system ("oss", "sgi" or "sun") ], [ sound="$withval" ]) if test "$sound" = yes; then AC_CHECK_HEADER(sys/soundcard.h, [sound=oss]) + AC_CHECK_HEADER(dmedia/audio.h, [sound=sgi]) AC_CHECK_HEADER(sys/audioio.h, [sound=sun]) fi if test "$sound" = no; then @@ -145,12 +151,16 @@ elif test "$sound" = oss; then SOUNDOBJ="rdpsnd.o rdpsnd_oss.o" AC_DEFINE(WITH_RDPSND) +elif test "$sound" = sgi; then + SOUNDOBJ="rdpsnd.o rdpsnd_sgi.o" + LDFLAGS="$LDFLAGS -laudio" + AC_DEFINE(WITH_RDPSND) elif test "$sound" = sun; then SOUNDOBJ="rdpsnd.o rdpsnd_sun.o" AC_DEFINE(WITH_RDPSND) else AC_MSG_WARN([sound support disabled (no sys/soundcard.h or sys/audioio.h)]) - AC_MSG_WARN([Currently supported systems are Open Sound System (oss) and Sun/BSD (sun)]) + AC_MSG_WARN([Currently supported systems are Open Sound System (oss), SGI AL (sgi) and Sun/BSD (sun)]) fi AC_SUBST(SOUNDOBJ) @@ -237,6 +247,15 @@ UTILS_FUNC_DIRFD + +# +# IPv6 +# +AC_ARG_WITH(ipv6, + [ --with-ipv6 enable IPv6-support], + [ AC_DEFINE(IPv6) ]) + + # # debugging # @@ -273,6 +292,10 @@ *-*-hpux*) CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED" ;; +*-*-irix6.5*) + LIBS="$LIBS -L$ssldir/lib32 -lcrypto" + CFLAGS="$CFLAGS -D__SGI_IRIX__" + ;; esac