Fix build process such that pango is properly detected.
This commit is contained in:
parent
602e0045b6
commit
e7c70111ef
30
configure.ac
30
configure.ac
@ -95,6 +95,14 @@ AM_CONDITIONAL([ENABLE_OGG], [test "x${have_vorbisenc}" = "xyes"])
|
|||||||
|
|
||||||
AC_SUBST(VORBIS_LIBS)
|
AC_SUBST(VORBIS_LIBS)
|
||||||
|
|
||||||
|
#
|
||||||
|
# PANGO
|
||||||
|
#
|
||||||
|
|
||||||
|
have_pango=yes
|
||||||
|
PKG_CHECK_MODULES([PANGO], [pango],, [have_pango=no]);
|
||||||
|
PKG_CHECK_MODULES([PANGOCAIRO], [pangocairo],, [have_pango=no]);
|
||||||
|
|
||||||
#
|
#
|
||||||
# libVNCServer
|
# libVNCServer
|
||||||
#
|
#
|
||||||
@ -131,9 +139,7 @@ have_libssh=yes
|
|||||||
SSH_LIBS=
|
SSH_LIBS=
|
||||||
|
|
||||||
AC_CHECK_LIB([ssh], [ssh_new], [SSH_LIBS="$SSH_LIBS -lssh"], [have_libssh=no])
|
AC_CHECK_LIB([ssh], [ssh_new], [SSH_LIBS="$SSH_LIBS -lssh"], [have_libssh=no])
|
||||||
PKG_CHECK_MODULES([PANGO], pango);
|
AM_CONDITIONAL([ENABLE_SSH], [test "x${have_libssh}" = "xyes" -a "x${have_pango}" = "xyes"])
|
||||||
PKG_CHECK_MODULES([PANGOCAIRO], pangocairo);
|
|
||||||
AM_CONDITIONAL([ENABLE_SSH], [test "x${have_libssh}" = "xyes"])
|
|
||||||
|
|
||||||
AC_SUBST(SSH_LIBS)
|
AC_SUBST(SSH_LIBS)
|
||||||
|
|
||||||
@ -146,16 +152,28 @@ AC_CONFIG_FILES([Makefile
|
|||||||
src/protocols/vnc/Makefile])
|
src/protocols/vnc/Makefile])
|
||||||
AC_OUTPUT
|
AC_OUTPUT
|
||||||
|
|
||||||
|
AM_COND_IF([ENABLE_RDP], [build_rdp=yes], [build_rdp=no])
|
||||||
|
AM_COND_IF([ENABLE_SSH], [build_ssh=yes], [build_ssh=no])
|
||||||
|
AM_COND_IF([ENABLE_VNC], [build_vnc=yes], [build_vnc=no])
|
||||||
|
|
||||||
echo "
|
echo "
|
||||||
------------------------------------------------
|
------------------------------------------------
|
||||||
$PACKAGE_NAME version $PACKAGE_VERSION
|
$PACKAGE_NAME version $PACKAGE_VERSION
|
||||||
------------------------------------------------
|
------------------------------------------------
|
||||||
|
|
||||||
|
Library status:
|
||||||
|
|
||||||
|
freerdp ............. ${have_freerdp}
|
||||||
|
pango ............... ${have_pango}
|
||||||
|
libssh .............. ${have_libssh}
|
||||||
|
libVNCServer ........ ${have_libvncserver}
|
||||||
|
libvorbisenc ........ ${have_vorbisenc}
|
||||||
|
|
||||||
Protocol support:
|
Protocol support:
|
||||||
|
|
||||||
RDP ....... ${have_freerdp}
|
RDP ....... ${build_rdp}
|
||||||
SSH ....... ${have_libssh}
|
SSH ....... ${build_ssh}
|
||||||
VNC ....... ${have_libvncserver}
|
VNC ....... ${build_vnc}
|
||||||
|
|
||||||
Type \"make\" to compile $PACKAGE_NAME.
|
Type \"make\" to compile $PACKAGE_NAME.
|
||||||
"
|
"
|
||||||
|
Loading…
Reference in New Issue
Block a user