From d217e1ee9c1ff72abef60ef256d2720d0abef762 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Mon, 8 Sep 2014 14:41:49 -0700
Subject: [PATCH] GUAC-847: Allow default location of config file to be
 overridden.

---
 configure.ac          | 10 +++++++++-
 src/guacd/conf-file.h |  5 -----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index a823eed2..2ac62ad8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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_INCLUDE], '-I$(top_srcdir)/src/terminal $(PANGO_CFLAGS) $(PANGOCAIRO_CFLAGS) $(COMMON_INCLUDE)')
 
-# Options
+# Init directory
 AC_ARG_WITH(init_dir,
             [AS_HELP_STRING([--with-init-dir=<path>],
                             [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"])
 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
 #
diff --git a/src/guacd/conf-file.h b/src/guacd/conf-file.h
index 181a6dba..ae8744c7 100644
--- a/src/guacd/conf-file.h
+++ b/src/guacd/conf-file.h
@@ -25,11 +25,6 @@
 
 #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.
  */