Set default configuration file directory on Unix to the configured value instead...

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3602 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/autoconf/config.h.in b/bacula/autoconf/config.h.in
index 1ebb5a81d42f403f6b0fc2d6abffae45979748c3..efc3e757e74217e9734a314299d1e40c5448db7e 100644 (file)
--- a/bacula/autoconf/config.h.in
+++ b/bacula/autoconf/config.h.in
@@ -149,6 +149,9 @@
 /* LOCALEDIR */
 #undef LOCALEDIR
 
+/* Set to value of --sysconfdir option */
+#undef SYSCONFDIR
+
 /* Define if you have zlib */
 #undef HAVE_LIBZ
 

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index aa3c4b4a3243c09401c0272e4b0315e27c589e8b..e4f6eba18884f3ae212dad3e2600a10bec8c50fa 100644 (file)
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -146,6 +146,7 @@ sysconfdir=`eval echo ${sysconfdir}`
 datadir=`eval echo ${datadir}`
 localedir=`eval echo ${datadir}/locale`
 AC_DEFINE_UNQUOTED(LOCALEDIR, "$localedir") 
+AC_DEFINE_UNQUOTED(SYSCONFDIR, "$sysconfdir")
 
 # -------------------------------------------------------------------------
 #  If the user has not set --exec-prefix, we default to ${prefix}
@@ -301,7 +302,7 @@ if test x$support_tray_monitor = xyes; then
      abc=`$PKGCONFIG --atleast-version=2.4 gtk+-2.0`
      pkg=$?
      if test $pkg = 0; then
-       AC_DEFINE(HAVE_GTK_2_4)
+     AC_DEFINE(HAVE_GTK_2_4)
      fi
   fi
 fi

diff --git a/bacula/configure b/bacula/configure
index 303519c3e44e7b2a546a79b701df63c2a87097d5..4bebc8dfc352161f3d5a83fb29d1bf4058ea7b9d 100755 (executable)
--- a/bacula/configure
+++ b/bacula/configure
@@ -6736,6 +6736,10 @@ cat >>confdefs.h <<_ACEOF
 #define LOCALEDIR "$localedir"
 _ACEOF
 
+cat >>confdefs.h <<_ACEOF
+#define SYSCONFDIR "$sysconfdir"
+_ACEOF
+
 
 # -------------------------------------------------------------------------
 #  If the user has not set --exec-prefix, we default to ${prefix}
@@ -12883,7 +12887,7 @@ if test x$support_tray_monitor = xyes; then
      abc=`$PKGCONFIG --atleast-version=2.4 gtk+-2.0`
      pkg=$?
      if test $pkg = 0; then
-       cat >>confdefs.h <<\_ACEOF
+     cat >>confdefs.h <<\_ACEOF
 #define HAVE_GTK_2_4 1
 _ACEOF
 

diff --git a/bacula/src/lib/parse_conf.c b/bacula/src/lib/parse_conf.c
index b3f6804312fcc95c620a3e4838cbde1423179ae9..48c5a58cea468389d1ce4053c1f7279c13689cae 100755 (executable)
--- a/bacula/src/lib/parse_conf.c
+++ b/bacula/src/lib/parse_conf.c
@@ -930,7 +930,7 @@ const char *get_default_configdir()
    }
    return szConfigDir;
 #else
-   return "/etc/bacula";
+   return SYSCONFDIR;
 #endif
 }