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

GUAC-847: Allow default location of config file to be overridden.

Browse Source
This commit is contained in:
Michael Jumper 2014-09-08 14:41:49 -07:00
parent 29c3aff5e2
commit d217e1ee9c
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@ -121,7 +121,7 @@ AC_SUBST([COMMON_INCLUDE], '-I$(top_srcdir)/src/common')
AC_SUBST([TERMINAL_LTLIB], '$(top_builddir)/src/terminal/libguac_terminal.la') AC_SUBST([TERMINAL_LTLIB], '$(top_builddir)/src/terminal/libguac_terminal.la')
AC_SUBST([TERMINAL_INCLUDE], '-I$(top_srcdir)/src/terminal $(PANGO_CFLAGS) $(PANGOCAIRO_CFLAGS) $(COMMON_INCLUDE)') AC_SUBST([TERMINAL_INCLUDE], '-I$(top_srcdir)/src/terminal $(PANGO_CFLAGS) $(PANGOCAIRO_CFLAGS) $(COMMON_INCLUDE)')
# Options # Init directory
AC_ARG_WITH(init_dir, AC_ARG_WITH(init_dir,
[AS_HELP_STRING([--with-init-dir=<path>], [AS_HELP_STRING([--with-init-dir=<path>],
[install init scripts to the given directory]) [install init scripts to the given directory])
@ -129,6 +129,14 @@ AC_ARG_WITH(init_dir,
AM_CONDITIONAL([ENABLE_INIT], [test "x${init_dir}" != "x"]) AM_CONDITIONAL([ENABLE_INIT], [test "x${init_dir}" != "x"])
AC_SUBST(init_dir) AC_SUBST(init_dir)
# guacd config file
AC_ARG_WITH(guacd_conf,
[AS_HELP_STRING([--with-guacd-conf=<path>],
[the full path to the guacd config file @<:@default=/etc/guacamole/guacd.conf@:>@])],
[guacd_conf=$withval],
[guacd_conf=/etc/guacamole/guacd.conf])
AC_DEFINE_UNQUOTED([GUACD_CONF_FILE], ["$guacd_conf"], [The full path to the guacd config file])
# #
# libssl # libssl
# #

5
src/guacd/conf-file.h
View File

@ -25,11 +25,6 @@
#include "config.h" #include "config.h"
/**
* The location of the system-wide configuration file.
*/
#define GUACD_CONF_FILE "/etc/guacamole/guacd.conf"
/** /**
* The contents of a guacd configuration file. * The contents of a guacd configuration file.
*/ */