Changeset 793

Timestamp:

10/15/06 15:50:24 (6 years ago)

Author:

wd

Message:

Ported log module, updated echo module.

Location:

trunk/ithildin

Files:

• SConstruct (modified) (3 diffs)
• modules/echo/SConscript (modified) (1 diff)
• modules/echo/modconfig.h (added)
• modules/log/SConscript (added)
• modules/log/log.c (modified) (2 diffs)

trunk/ithildin/SConstruct

@@ -28 +28 @@
 env = Environment(ENV = {
     'PATH': os.environ['PATH'],
-})
+    },
+    CPPPATH = ['#/include']
+)
 
 # Perform some magic to get the repository version.  If we have svn and we
@@ -279 +281 @@
 
 # Set our final environment parameters.
-env.Append(CPPPATH = '#/include')
 env.Append(LIBPATH = '#/lib')
 env.AppendUnique(RPATH = [env['libdir'], env['libdir'] + '/modules'])
@@ -314 +315 @@
 
 for m in modules.split(','):
-    if m: env.SConscript('modules/%s/SConscript' % m)
+    if not m: continue
+    # create a modified env for each module
+    modenv = env.Copy()
+    env.SConscript('modules/%s/SConscript' % m, exports = ['modenv'])
+    del modenv
 
 # vi:set ts=8 sts=4 sw=4 tw=76 et syntax=python:

trunk/ithildin/modules/echo/SConscript

@@ -16 +16 @@
 # Build specification for the ithildin library
 env.Install(env['libdir'] + '/modules',
-    env.SharedLibrary(target = 'echo', source = Split('''
-        echo.c
-        '''),
-        SHLIBPREFIX = '',
-        LIBS = 'ithildin'
+    modenv.SharedLibrary(target = 'echo', source = 'echo.c', SHLIBPREFIX = '',
+        LIBS = 'ithildin', CPPDEFINES = env['CPPDEFINES'] + ['MODULE'],
+        CPPPATH = env['CPPPATH'] + ['.']
     )
 )

trunk/ithildin/modules/log/log.c

@@ -200 +200 @@
 static int log_parse_conf(conf_list_t *conf) {
     char *s;
+#ifdef HAVE_SYSLOG
     int facility = LOG_DAEMON;
+#endif
     conf_list_t *clp = NULL;
     log_hook_t *lhp;
@@ -212 +214 @@
     if (conf == NULL) {
 #ifdef HAVE_SYSLOG
-        openlog(PACKAGE_NAME, LOG_PID, facility);
+        openlog(me.execname, LOG_PID, facility);
         /* Make a hook that dumps to syslog. */
         lhp = log_hook_create();