Clean up the static linking of openssl and libsamplerate. We should now do
the bare minimum in most of the cases. git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/rdesktop/trunk@1631 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
parent
ad99e08bcc
commit
5274e765af
47
configure.ac
47
configure.ac
@ -2,6 +2,8 @@ AC_INIT(rdesktop, 1.7.0post)
|
|||||||
|
|
||||||
AC_CONFIG_SRCDIR([rdesktop.c])
|
AC_CONFIG_SRCDIR([rdesktop.c])
|
||||||
|
|
||||||
|
AC_CANONICAL_HOST
|
||||||
|
|
||||||
AC_PROG_CC
|
AC_PROG_CC
|
||||||
if test "$GCC" = yes; then
|
if test "$GCC" = yes; then
|
||||||
CFLAGS="$CFLAGS -Wall"
|
CFLAGS="$CFLAGS -Wall"
|
||||||
@ -49,8 +51,6 @@ m4_ifdef([PKG_CHECK_MODULES], [], [
|
|||||||
])
|
])
|
||||||
])
|
])
|
||||||
|
|
||||||
rpath=""
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# OpenSSL detection borrowed from stunnel
|
# OpenSSL detection borrowed from stunnel
|
||||||
#
|
#
|
||||||
@ -98,13 +98,28 @@ 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],
|
||||||
LIBS="$LIBS $ssldir/lib/libcrypto.a"
|
[static_openssl=no])
|
||||||
],
|
if test x"$static_openssl" = "xyes"; then
|
||||||
[
|
# OpenSSL generally relies on libz
|
||||||
LIBS="$LIBS -L$ssldir/lib -lcrypto"
|
AC_SEARCH_LIBS(deflate, z)
|
||||||
rpath="$rpath:$ssldir/lib"
|
LIBS="$ssldir/lib/libcrypto.a $LIBS"
|
||||||
])
|
else
|
||||||
|
LIBS="-L$ssldir/lib -lcrypto $LIBS"
|
||||||
|
|
||||||
|
#
|
||||||
|
# target-specific stuff
|
||||||
|
#
|
||||||
|
case "$host" in
|
||||||
|
*-*-solaris*)
|
||||||
|
LDFLAGS="$LDFLAGS -R$ssldir/lib"
|
||||||
|
;;
|
||||||
|
*-dec-osf*)
|
||||||
|
LDFLAGS="$LDFLAGS -Wl,-rpath,$ssldir/lib"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
|
||||||
# xrandr
|
# xrandr
|
||||||
if test -n "$PKG_CONFIG"; then
|
if test -n "$PKG_CONFIG"; then
|
||||||
PKG_CHECK_MODULES(XRANDR, xrandr, [HAVE_XRANDR=1], [HAVE_XRANDR=0])
|
PKG_CHECK_MODULES(XRANDR, xrandr, [HAVE_XRANDR=1], [HAVE_XRANDR=0])
|
||||||
@ -244,8 +259,8 @@ if test -n "$PKG_CONFIG"; then
|
|||||||
if test x"$static_libsamplerate" = "xyes"; then
|
if test x"$static_libsamplerate" = "xyes"; then
|
||||||
_libsamplerate_libdir=`$PKG_CONFIG --errors-to-stdout --variable=libdir samplerate`
|
_libsamplerate_libdir=`$PKG_CONFIG --errors-to-stdout --variable=libdir samplerate`
|
||||||
LIBSAMPLERATE_LIBS="$_libsamplerate_libdir""/libsamplerate.a"
|
LIBSAMPLERATE_LIBS="$_libsamplerate_libdir""/libsamplerate.a"
|
||||||
|
LIBSAMPLERATE_LIBS="$LIBSAMPLERATE_LIBS -lm"
|
||||||
fi
|
fi
|
||||||
LIBSAMPLERATE_LIBS="$LIBSAMPLERATE_LIBS -lm"
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -893,26 +908,16 @@ AC_ARG_WITH(debug-smartcard,
|
|||||||
#
|
#
|
||||||
# target-specific stuff
|
# target-specific stuff
|
||||||
#
|
#
|
||||||
# strip leading colon from rpath
|
|
||||||
rpath=`echo $rpath |sed 's/^://'`
|
|
||||||
AC_CANONICAL_HOST
|
|
||||||
case "$host" in
|
case "$host" in
|
||||||
*-*-solaris*)
|
|
||||||
LDFLAGS="$LDFLAGS -R$rpath"
|
|
||||||
;;
|
|
||||||
*-dec-osf*)
|
|
||||||
LDFLAGS="$LDFLAGS -Wl,-rpath,$rpath"
|
|
||||||
;;
|
|
||||||
*-*-hpux*)
|
*-*-hpux*)
|
||||||
CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
|
CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
|
||||||
;;
|
;;
|
||||||
*-*-irix6.5*)
|
*-*-irix6.5*)
|
||||||
LIBS="$LIBS -L$ssldir/lib32 -lcrypto"
|
LIBS="-L$ssldir/lib32 $LIBS"
|
||||||
CFLAGS="$CFLAGS -D__SGI_IRIX__"
|
CFLAGS="$CFLAGS -D__SGI_IRIX__"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
|
||||||
AC_OUTPUT(Makefile)
|
AC_OUTPUT(Makefile)
|
||||||
|
|
||||||
dnl Local Variables:
|
dnl Local Variables:
|
||||||
|
Loading…
Reference in New Issue
Block a user