kekePower/rdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #218 from paulmenzel/improve-configure-help-text

Browse Source 
Improve configure help text
This commit is contained in:
Karl Mikaelsson 2018-01-03 13:50:46 +01:00 committed by GitHub
commit 15af5e46df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
configure.ac
View File

@ -26,7 +26,7 @@ if test "$no_x" = "yes"; then
echo echo
exit 1 exit 1
fi fi
AC_PATH_TOOL(PKG_CONFIG, pkg-config) AC_PATH_TOOL(PKG_CONFIG, pkg-config)
AC_SEARCH_LIBS(socket, socket) AC_SEARCH_LIBS(socket, socket)
@ -53,7 +53,7 @@ m4_ifdef([PKG_CHECK_MODULES], [], [
dnl Add option to build with using address sanitizer dnl Add option to build with using address sanitizer
AC_ARG_ENABLE([address-sanitizer], AS_HELP_STRING([--enable-address-sanitizer], \ AC_ARG_ENABLE([address-sanitizer], AS_HELP_STRING([--enable-address-sanitizer], \
[enabled AddressSanitizer support for detecting a wide variety of \ [enable AddressSanitizer support for detecting a wide variety of \
memory allocation and deallocation errors]), \ memory allocation and deallocation errors]), \
[AC_DEFINE(HAVE_ADDRESS_SANITIZER, 1, [enable AddressSanitizer]) [AC_DEFINE(HAVE_ADDRESS_SANITIZER, 1, [enable AddressSanitizer])
CFLAGS="$CFLAGS -fsanitize=address" CFLAGS="$CFLAGS -fsanitize=address"
@ -106,9 +106,9 @@ AC_DEFINE_UNQUOTED(ssldir, "$ssldir")
dnl Add OpenSSL includes and libraries dnl Add OpenSSL includes and libraries
CFLAGS="$CFLAGS -I$ssldir/include" CFLAGS="$CFLAGS -I$ssldir/include"
AC_ARG_ENABLE(static-openssl, AC_ARG_ENABLE(static-openssl,
[ --enable-static-openssl link OpenSSL statically], [ --enable-static-openssl link OpenSSL statically],
[static_openssl=yes], [static_openssl=yes],
[static_openssl=no]) [static_openssl=no])
if test x"$static_openssl" = "xyes"; then if test x"$static_openssl" = "xyes"; then
# OpenSSL generally relies on libz # OpenSSL generally relies on libz
@ -251,11 +251,11 @@ int main(int argc, char **argv)
return 1; return 1;
} }
return 0; return 0;
}], }],
[AC_MSG_RESULT(no)], [AC_MSG_RESULT(no)],
[AC_MSG_RESULT(yes) [AC_MSG_RESULT(yes)
AC_DEFINE(NEED_ALIGN)], AC_DEFINE(NEED_ALIGN)],
[AC_MSG_RESULT(assuming yes) [AC_MSG_RESULT(assuming yes)
AC_DEFINE(NEED_ALIGN)]) AC_DEFINE(NEED_ALIGN)])
@ -277,17 +277,17 @@ AC_DEFINE_UNQUOTED(EGD_SOCKET, "$EGD_SOCKET")
sound="yes" sound="yes"
AC_ARG_WITH(sound, AC_ARG_WITH(sound,
[ --with-sound select sound system ("oss", "sgi", "sun", "alsa", "pulse" or "libao") ], [ --with-sound select sound system ("oss", "sgi", "sun", "alsa", "pulse" or "libao") ],
[ [
sound="$withval" sound="$withval"
]) ])
AC_CHECK_HEADER(sys/soundcard.h, [HAVE_OSS=1], [HAVE_OSS=0]) AC_CHECK_HEADER(sys/soundcard.h, [HAVE_OSS=1], [HAVE_OSS=0])
AC_CHECK_HEADER(dmedia/audio.h, [HAVE_SGI=1], [HAVE_SGI=0]) AC_CHECK_HEADER(dmedia/audio.h, [HAVE_SGI=1], [HAVE_SGI=0])
AC_CHECK_HEADER(sys/audioio.h, [HAVE_SUN=1], [HAVE_SUN=0]) AC_CHECK_HEADER(sys/audioio.h, [HAVE_SUN=1], [HAVE_SUN=0])
AC_ARG_ENABLE(static-libsamplerate, AC_ARG_ENABLE(static-libsamplerate,
[ --enable-static-libsamplerate link libsamplerate statically], [ --enable-static-libsamplerate link libsamplerate statically],
[static_libsamplerate=yes], [static_libsamplerate=yes],
[static_libsamplerate=no]) [static_libsamplerate=no])
if test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG"; then
@ -879,7 +879,7 @@ AC_CHECK_FUNCS(setmntent)
# #
AC_ARG_WITH(ipv6, AC_ARG_WITH(ipv6,
[ --with-ipv6 enable IPv6-support], [ --with-ipv6 enable IPv6-support],
[ [
if test $withval != "no"; if test $withval != "no";
then then
AC_DEFINE(IPv6,1) AC_DEFINE(IPv6,1)