Move libguac headers to a location others can pull. Modify guacd to use bundled libguac if present.
This commit is contained in:
parent
8a18afeb1d
commit
7f1eb77c8f
@ -37,14 +37,15 @@
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
initdir = @init_dir@
|
||||
|
||||
AM_CFLAGS = -Werror -Wall -pedantic -Iinclude
|
||||
AM_CFLAGS = -Werror -Wall -pedantic -Iinclude $(LIBGUAC_INCLUDE)
|
||||
|
||||
sbin_PROGRAMS = guacd
|
||||
init_SCRIPTS = init.d/guacd
|
||||
man_MANS = man/guacd.8
|
||||
|
||||
noinst_HEADERS = include/client.h include/log.h
|
||||
guacd_SOURCES = src/daemon.c src/client.c src/log.c
|
||||
guacd_SOURCES = src/daemon.c src/client.c src/log.c
|
||||
guacd_LDADD = $(LIBGUAC_LTLIB)
|
||||
|
||||
EXTRA_DIST = init.d/guacd.in man/guacd.8 LICENSE
|
||||
CLEANFILES = $(init_SCRIPTS)
|
||||
|
@ -38,6 +38,9 @@ AC_PREREQ([2.61])
|
||||
AC_INIT([guacd], [0.7.0])
|
||||
AM_INIT_AUTOMAKE([-Wall -Werror foreign])
|
||||
|
||||
LT_PREREQ([2.2])
|
||||
LT_INIT([dlopen])
|
||||
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
AC_CONFIG_SRCDIR([src/client.c])
|
||||
|
||||
@ -48,6 +51,15 @@ AC_PROG_CC_C99
|
||||
# Libraries
|
||||
AC_CHECK_LIB([pthread], [pthread_create])
|
||||
|
||||
# If bundled copy of libguac found, use that
|
||||
if test -d "$srcdir/../libguac"
|
||||
then
|
||||
AC_SUBST([LIBGUAC_LTLIB], '$(top_builddir)/../libguac/src/libguac.la')
|
||||
AC_SUBST([LIBGUAC_INCLUDE], '-I$(top_srcdir)/../libguac/include')
|
||||
else
|
||||
AC_CHECK_LIB([guac], [guac_client_plugin_open])
|
||||
fi
|
||||
|
||||
# Functions
|
||||
AC_FUNC_MALLOC
|
||||
AC_CHECK_FUNCS([memset socket strerror fork])
|
||||
|
@ -603,7 +603,7 @@ RECURSIVE = YES
|
||||
# excluded from the INPUT source files. This way you can easily exclude a
|
||||
# subdirectory from a directory tree whose root is specified with the INPUT tag.
|
||||
|
||||
EXCLUDE = ../include/client-handlers.h ../include/palette.h
|
||||
EXCLUDE = ../include/_private
|
||||
|
||||
# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
|
||||
# directories that are symbolic links (a Unix filesystem feature) are excluded
|
||||
|
@ -36,42 +36,42 @@
|
||||
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
AM_CFLAGS = -Werror -Wall -pedantic -I../include
|
||||
AM_CFLAGS = -Werror -Wall -pedantic -I../include/guacamole -I../include/_private
|
||||
|
||||
libguacincdir = $(includedir)/guacamole
|
||||
libguacinc_HEADERS = \
|
||||
../include/client.h \
|
||||
../include/error.h \
|
||||
../include/hash.h \
|
||||
../include/instruction.h \
|
||||
../include/layer.h \
|
||||
../include/plugin.h \
|
||||
../include/pool.h \
|
||||
../include/protocol.h \
|
||||
../include/socket.h \
|
||||
../include/stream.h \
|
||||
../include/timestamp.h
|
||||
libguacinc_HEADERS = \
|
||||
../include/guacamole/client.h \
|
||||
../include/guacamole/error.h \
|
||||
../include/guacamole/hash.h \
|
||||
../include/guacamole/instruction.h \
|
||||
../include/guacamole/layer.h \
|
||||
../include/guacamole/plugin.h \
|
||||
../include/guacamole/pool.h \
|
||||
../include/guacamole/protocol.h \
|
||||
../include/guacamole/socket.h \
|
||||
../include/guacamole/stream.h \
|
||||
../include/guacamole/timestamp.h
|
||||
|
||||
noinst_HEADERS = \
|
||||
../include/client-handlers.h \
|
||||
../include/palette.h \
|
||||
../include/unicode.h
|
||||
noinst_HEADERS = \
|
||||
../include/_private/client-handlers.h \
|
||||
../include/_private/palette.h \
|
||||
../include/_private/unicode.h
|
||||
|
||||
libguac_la_SOURCES = \
|
||||
client.c \
|
||||
client-handlers.c \
|
||||
error.c \
|
||||
hash.c \
|
||||
instruction.c \
|
||||
palette.c \
|
||||
plugin.c \
|
||||
pool.c \
|
||||
protocol.c \
|
||||
socket.c \
|
||||
socket-fd.c \
|
||||
socket-nest.c \
|
||||
timestamp.c \
|
||||
unicode.c
|
||||
client-handlers.c \
|
||||
error.c \
|
||||
hash.c \
|
||||
instruction.c \
|
||||
palette.c \
|
||||
plugin.c \
|
||||
pool.c \
|
||||
protocol.c \
|
||||
socket.c \
|
||||
socket-fd.c \
|
||||
socket-nest.c \
|
||||
timestamp.c \
|
||||
unicode.c
|
||||
|
||||
lib_LTLIBRARIES = libguac.la
|
||||
libguac_la_LDFLAGS = -version-info 4:0:0
|
||||
|
Loading…
Reference in New Issue
Block a user