diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2012-05-03 12:25:15 +0200 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2012-05-03 12:25:15 +0200 |
| commit | ab188fb76d7822350724b182106a19995a73d719 (patch) | |
| tree | 1b635d644d5595908bff662938373e6b0b6dcd5d /sysdep | |
| parent | 7a2c48dafce9420a23fd57408c31eecfc20c4fe0 (diff) | |
Implements build options to specify socket dir and suffix.
Diffstat (limited to 'sysdep')
| -rw-r--r-- | sysdep/autoconf.h.in | 1 | ||||
| -rw-r--r-- | sysdep/config.h | 19 | ||||
| -rw-r--r-- | sysdep/unix/main.c | 2 |
3 files changed, 2 insertions, 20 deletions
diff --git a/sysdep/autoconf.h.in b/sysdep/autoconf.h.in index d029e2a7..ac6f7a87 100644 --- a/sysdep/autoconf.h.in +++ b/sysdep/autoconf.h.in @@ -62,3 +62,4 @@ /* We have stdint.h */ #undef HAVE_STDINT_H +#define CONFIG_PATH ? diff --git a/sysdep/config.h b/sysdep/config.h index 7e6fad8b..8d93d381 100644 --- a/sysdep/config.h +++ b/sysdep/config.h @@ -37,23 +37,4 @@ typedef u16 word; #endif -/* Path to configuration file */ -#ifdef IPV6 -# ifdef DEBUGGING -# define PATH_CONFIG "bird6.conf" -# define PATH_CONTROL_SOCKET "bird6.ctl" -# else -# define PATH_CONFIG PATH_CONFIG_DIR "/bird6.conf" -# define PATH_CONTROL_SOCKET PATH_CONTROL_SOCKET_DIR "/bird6.ctl" -# endif -#else -# ifdef DEBUGGING -# define PATH_CONFIG "bird.conf" -# define PATH_CONTROL_SOCKET "bird.ctl" -# else -# define PATH_CONFIG PATH_CONFIG_DIR "/bird.conf" -# define PATH_CONTROL_SOCKET PATH_CONTROL_SOCKET_DIR "/bird.ctl" -# endif -#endif - #endif diff --git a/sysdep/unix/main.c b/sysdep/unix/main.c index dfe0b89c..e0563aae 100644 --- a/sysdep/unix/main.c +++ b/sysdep/unix/main.c @@ -151,7 +151,7 @@ read_iproute_table(char *file, char *prefix, int max) #endif // PATH_IPROUTE_DIR -static char *config_name = PATH_CONFIG; +static char *config_name = PATH_CONFIG_FILE; static int cf_read(byte *dest, unsigned int len, int fd) |