[GNUnet-SVN] r8316 - in GNUnet: . contrib/macosx src/include

[gnunet]

Author: holindho
Date: 2009-03-08 08:09:39 -0600 (Sun, 08 Mar 2009)
New Revision: 8316

Modified:
   GNUnet/configure.ac
   GNUnet/contrib/macosx/build-osx-framework.sh
   GNUnet/src/include/gnunet_directories.h.in
Log:
better blend in


Modified: GNUnet/configure.ac
===================================================================
--- GNUnet/configure.ac 2009-03-07 09:50:34 UTC (rev 8315)
+++ GNUnet/configure.ac 2009-03-08 14:09:39 UTC (rev 8316)
@@ -955,6 +955,22 @@
                 [default daemon config directory (/etc)]),
         [gn_daemon_config_dir=$withval])
 AC_SUBST(GN_DAEMON_CONFIG_DIR, $gn_daemon_config_dir)
+gn_user_config_name="gnunet.conf"
+AC_ARG_WITH(user-config-name,
+        AC_HELP_STRING(
+                [--with-user-config-name=DIR],
+                [default user config name (gnunet.conf)]),
+        [gn_user_config_name=$withval])
+AC_SUBST(GN_USER_CONFIG_NAME, $gn_user_config_name)
+gn_daemon_config_name="gnunetd.conf"
+AC_ARG_WITH(daemon-config-name,
+        AC_HELP_STRING(
+                [--with-daemon-config-name=DIR],
+                [default daemon config name (gnunetd.conf)]),
+        [gn_daemon_config_name=$withval])
+AC_SUBST(GN_DAEMON_CONFIG_NAME, $gn_daemon_config_name)
+
+
 gn_daemon_pidfile="/var/run/gnunetd/pid"
 AC_ARG_WITH(daemon-pidfile,
         AC_HELP_STRING(

Modified: GNUnet/contrib/macosx/build-osx-framework.sh
===================================================================
--- GNUnet/contrib/macosx/build-osx-framework.sh        2009-03-07 09:50:34 UTC 
(rev 8315)
+++ GNUnet/contrib/macosx/build-osx-framework.sh        2009-03-08 14:09:39 UTC 
(rev 8316)
@@ -516,7 +516,9 @@
                        --prefix="${FW_DIR}"                    \
                        --with-user-home-dir="~/Library/GNUnet" \
                        --with-daemon-home-dir="/Library/GNUnet"        \
-                       --with-daemon-config-dir="/Library/GNUnet"      \
+                       --with-daemon-config-dir="/Library/Preferences" \
+                       --with-user-config-name="org.gnunet.gnunet.conf" \
+                       --with-daemon-config-name="org.gnunet.gnunetd.conf" \
                        --with-daemon-pidfile="/Library/GNUnet/gnunetd.pid" \
                        --enable-shared                         \
                        --enable-framework                      \

Modified: GNUnet/src/include/gnunet_directories.h.in
===================================================================
--- GNUnet/src/include/gnunet_directories.h.in  2009-03-07 09:50:34 UTC (rev 
8315)
+++ GNUnet/src/include/gnunet_directories.h.in  2009-03-08 14:09:39 UTC (rev 
8316)
@@ -28,9 +28,9 @@
 #ifndef GNUNET_DIRECTORIES
 #define GNUNET_DIRECTORIES
 
-#define GNUNET_DEFAULT_CLIENT_CONFIG_FILE "@GN_USER_HOME_DIR@/gnunet.conf"
-#define GNUNET_DEFAULT_CLIENT_SITE_CONFIG_FILE 
"@GN_DAEMON_CONFIG_DIR@/gnunet.conf"
-#define GNUNET_DEFAULT_DAEMON_CONFIG_FILE "@GN_DAEMON_CONFIG_DIR@/gnunetd.conf"
+#define GNUNET_DEFAULT_CLIENT_CONFIG_FILE 
"@GN_USER_HOME_DIR@/@GN_USER_CONFIG_NAME@"
+#define GNUNET_DEFAULT_CLIENT_SITE_CONFIG_FILE 
"@GN_DAEMON_CONFIG_DIR@/@GN_USER_CONFIG_NAME@"
+#define GNUNET_DEFAULT_DAEMON_CONFIG_FILE 
"@GN_DAEMON_CONFIG_DIR@/@GN_DAEMON_CONFIG_NAME@"
 #define GNUNET_DEFAULT_DAEMON_VAR_DIRECTORY       "$GNUNETD_HOME"
 #define GNUNET_DEFAULT_HOME_DIRECTORY      "$GNUNET_HOME"