maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUAC-597: Remove unnecessary dlopen() test, add automatically generated dlopen() test result to Makefile.am.

Browse Source
This commit is contained in:
Michael Jumper 2014-04-11 11:25:14 -07:00
parent dc9bf7dff3
commit 15dc035db1
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -43,10 +43,6 @@ AC_CHECK_HEADERS([fcntl.h stdlib.h string.h sys/socket.h time.h sys/time.h syslo
AC_DEFINE([_POSIX_C_SOURCE], [200809L], [Uses POSIX APIs]) AC_DEFINE([_POSIX_C_SOURCE], [200809L], [Uses POSIX APIs])
AC_DEFINE([_BSD_SOURCE], [], [Uses BSD APIs]) AC_DEFINE([_BSD_SOURCE], [], [Uses BSD APIs])
# libdl
AC_CHECK_LIB([dl], [dlopen], [DL_LIBS=-ldl],
AC_MSG_ERROR("libdl is required for loading client plugins"))
# libpng # libpng
AC_CHECK_LIB([png], [png_write_png], [PNG_LIBS=-lpng], AC_CHECK_LIB([png], [png_write_png], [PNG_LIBS=-lpng],
AC_MSG_ERROR("libpng is required for writing png messages")) AC_MSG_ERROR("libpng is required for writing png messages"))
@ -66,7 +62,7 @@ AC_CHECK_LIB([cunit], [CU_run_test], [CUNIT_LIBS=-lcunit])
# WinSock # WinSock
AC_CHECK_LIB([wsock32], [main]) AC_CHECK_LIB([wsock32], [main])
AC_SUBST(DL_LIBS) AC_SUBST(LIBADD_DLOPEN)
AC_SUBST(PNG_LIBS) AC_SUBST(PNG_LIBS)
AC_SUBST(CAIRO_LIBS) AC_SUBST(CAIRO_LIBS)
AC_SUBST(PTHREAD_LIBS) AC_SUBST(PTHREAD_LIBS)

3
src/libguac/Makefile.am
View File

@ -88,5 +88,6 @@ noinst_HEADERS += ogg_encoder.h
endif endif
lib_LTLIBRARIES = libguac.la lib_LTLIBRARIES = libguac.la
libguac_la_LDFLAGS = -version-info 6:0:0 @PTHREAD_LIBS@ @CAIRO_LIBS@ @PNG_LIBS@ @DL_LIBS@ @VORBIS_LIBS@ libguac_la_LDFLAGS = -version-info 6:0:0 @PTHREAD_LIBS@ @CAIRO_LIBS@ @PNG_LIBS@ @VORBIS_LIBS@
libguac_la_LIBADD = @LIBADD_DLOPEN@