diff options
author | Martin Pool <mbp@samba.org> | 2001-11-19 02:49:53 +0000 |
---|---|---|
committer | Martin Pool <mbp@samba.org> | 2001-11-19 02:49:53 +0000 |
commit | f741f656737f4ec46cd318e986b6bf412ed309d2 (patch) | |
tree | fb2b1999441e25ae5db177631dd42abb051a9bce /source3/smbd/build_options.c | |
parent | a1b9de0b9872b91574e75bb360d49b887a072389 (diff) | |
download | samba-f741f656737f4ec46cd318e986b6bf412ed309d2.tar.gz samba-f741f656737f4ec46cd318e986b6bf412ed309d2.tar.xz samba-f741f656737f4ec46cd318e986b6bf412ed309d2.zip |
Store some path names in global variables initialized to configure
default, rather than in preprocessor macros.
(This used to be commit 79ec88f0da40faebe1e587f1b3e87b5f2b184f58)
Diffstat (limited to 'source3/smbd/build_options.c')
-rw-r--r-- | source3/smbd/build_options.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/source3/smbd/build_options.c b/source3/smbd/build_options.c index d12fe408728..8c22e95451d 100644 --- a/source3/smbd/build_options.c +++ b/source3/smbd/build_options.c @@ -22,6 +22,7 @@ #include "includes.h" #include "build_env.h" +#include "dynconfig.h" static void output(BOOL screen, char *format, ...) PRINTF_ATTRIBUTE(2,3); @@ -184,30 +185,22 @@ void build_options(BOOL screen) /* Output various paths to files and directories */ output(screen,"\nPaths:\n"); -#ifdef CONFIGFILE - output(screen," CONFIGFILE: %s\n",CONFIGFILE); -#endif + output(screen," CONFIGFILE: %s\n", dyn_CONFIGFILE); #ifdef PRIVATE_DIR output(screen," PRIVATE_DIR: %s\n",PRIVATE_DIR); #endif #ifdef LMHOSTSFILE output(screen," LMHOSTSFILE: %s\n",LMHOSTSFILE); #endif -#ifdef SBINDIR - output(screen," SBINDIR: %s\n",SBINDIR); -#endif -#ifdef BINDIR - output(screen," BINDIR: %s\n",BINDIR); -#endif + output(screen," SBINDIR: %s\n", dyn_SBINDIR); + output(screen," BINDIR: %s\n", dyn_BINDIR); #ifdef LOCKDIR output(screen," LOCKDIR: %s\n",LOCKDIR); #endif #ifdef DRIVERFILE output(screen," DRIVERFILE: %s\n",DRIVERFILE); #endif -#ifdef LOGFILEBASE - output(screen," LOGFILEBASE: %s\n",LOGFILEBASE); -#endif + output(screen," LOGFILEBASE: %s\n", dyn_LOGFILEBASE); #ifdef FORMSFILE output(screen," FORMSFILE: %s\n",FORMSFILE); #endif |