diff options
author | Nathan Kinder <nkinder@redhat.com> | 2007-04-26 02:37:54 +0000 |
---|---|---|
committer | Nathan Kinder <nkinder@redhat.com> | 2007-04-26 02:37:54 +0000 |
commit | 88ddde4b61766e7ccfb45bc4f5e6a00f90bb992c (patch) | |
tree | 0c07364da2b1edfb38a603c3c6662c1429d2a2f0 | |
parent | b0e077769e5247e96ef6fd66d75dc96698dda107 (diff) | |
download | ds-88ddde4b61766e7ccfb45bc4f5e6a00f90bb992c.tar.gz ds-88ddde4b61766e7ccfb45bc4f5e6a00f90bb992c.tar.xz ds-88ddde4b61766e7ccfb45bc4f5e6a00f90bb992c.zip |
Resolves: 236612
Summary: Modified the with-fhs and with-fhs-opt configure options
-rw-r--r-- | config.h.in | 3 | ||||
-rwxr-xr-x | configure | 49 | ||||
-rw-r--r-- | configure.ac | 45 | ||||
-rw-r--r-- | ldap/admin/src/create_instance.c | 94 | ||||
-rw-r--r-- | m4/fhs.m4 | 4 |
5 files changed, 104 insertions, 91 deletions
diff --git a/config.h.in b/config.h.in index 9409bd78..8da8808c 100644 --- a/config.h.in +++ b/config.h.in @@ -241,6 +241,9 @@ /* Use FHS layout */ #undef IS_FHS +/* Use FHS optional layout */ +#undef IS_FHS_OPT + /* LDAP debug flag */ #undef LDAP_DEBUG @@ -22983,6 +22983,14 @@ else echo "${ECHO_T}no" >&6 fi; +if test "$with_fhs_opt" = "yes"; then + +cat >>confdefs.h <<\_ACEOF +#define IS_FHS_OPT 1 +_ACEOF + +fi + if test "$with_fhs" = "yes" -a "$with_fhs_opt" = "yes"; then { { echo "$as_me:$LINENO: error: Can't set both --with-fhs and --with-fhs-opt. Please only use one of these options." >&5 echo "$as_me: error: Can't set both --with-fhs and --with-fhs-opt. Please only use one of these options." >&2;} @@ -22995,39 +23003,38 @@ fi # /etc, and /var. The with-fhs-opt option will use the # prefix, but it's sysconfdir and localstatedir will be # /etc/opt, and /var/opt. -if test "$with_fhs" = "yes"; then - ac_default_prefix=/usr - prefix=$ac_default_prefix - exec_prefix=$prefix - sysconfdir='/etc' - localstatedir='/var' +if test "$with_fhs_opt" = "yes"; then + # Override sysconfdir and localstatedir if FHS optional + # package was requested. + sysconfdir='/etc/opt' + localstatedir='/var/opt' # relative to datadir - sampledatadir=/$PACKAGE_NAME/data + sampledatadir=/data # relative to datadir - scripttemplatedir=/$PACKAGE_NAME/script-templates + scripttemplatedir=/script-templates # relative to libdir - serverdir=/$PACKAGE_NAME + serverdir= # relative to libdir - serverplugindir=/$PACKAGE_NAME/plugins + serverplugindir=/plugins else - if test "$with_fhs_opt" = "yes"; then - # Override sysconfdir and localstatedir if FHS optional - # package was requested. - sysconfdir='/etc/opt' - localstatedir='/var/opt' + if test "$with_fhs" = "yes"; then + ac_default_prefix=/usr + prefix=$ac_default_prefix + exec_prefix=$prefix + sysconfdir='/etc' + localstatedir='/var' fi - # Paths for default layout # relative to datadir - sampledatadir=/data + sampledatadir=/$PACKAGE_NAME/data # relative to datadir - scripttemplatedir=/script-templates + scripttemplatedir=/$PACKAGE_NAME/script-templates # relative to libdir - serverdir= + serverdir=/$PACKAGE_NAME # relative to libdir - serverplugindir=/plugins + serverplugindir=/$PACKAGE_NAME/plugins fi -# Shared paths for both FHS and default layouts +# Shared paths for all layouts # relative to sysconfdir configdir=/$PACKAGE_NAME/config # relative to sysconfdir diff --git a/configure.ac b/configure.ac index 6913711a..d643656b 100644 --- a/configure.ac +++ b/configure.ac @@ -131,41 +131,40 @@ m4_include(m4/fhs.m4) # /etc, and /var. The with-fhs-opt option will use the # prefix, but it's sysconfdir and localstatedir will be # /etc/opt, and /var/opt. -if test "$with_fhs" = "yes"; then - ac_default_prefix=/usr - prefix=$ac_default_prefix - exec_prefix=$prefix -dnl as opposed to the default /usr/etc - sysconfdir='/etc' -dnl as opposed to the default /usr/var - localstatedir='/var' +if test "$with_fhs_opt" = "yes"; then + # Override sysconfdir and localstatedir if FHS optional + # package was requested. + sysconfdir='/etc/opt' + localstatedir='/var/opt' # relative to datadir - sampledatadir=/$PACKAGE_NAME/data + sampledatadir=/data # relative to datadir - scripttemplatedir=/$PACKAGE_NAME/script-templates + scripttemplatedir=/script-templates # relative to libdir - serverdir=/$PACKAGE_NAME + serverdir= # relative to libdir - serverplugindir=/$PACKAGE_NAME/plugins + serverplugindir=/plugins else - if test "$with_fhs_opt" = "yes"; then - # Override sysconfdir and localstatedir if FHS optional - # package was requested. - sysconfdir='/etc/opt' - localstatedir='/var/opt' + if test "$with_fhs" = "yes"; then + ac_default_prefix=/usr + prefix=$ac_default_prefix + exec_prefix=$prefix + dnl as opposed to the default /usr/etc + sysconfdir='/etc' + dnl as opposed to the default /usr/var + localstatedir='/var' fi - # Paths for default layout # relative to datadir - sampledatadir=/data + sampledatadir=/$PACKAGE_NAME/data # relative to datadir - scripttemplatedir=/script-templates + scripttemplatedir=/$PACKAGE_NAME/script-templates # relative to libdir - serverdir= + serverdir=/$PACKAGE_NAME # relative to libdir - serverplugindir=/plugins + serverplugindir=/$PACKAGE_NAME/plugins fi -# Shared paths for both FHS and default layouts +# Shared paths for all layouts # relative to sysconfdir configdir=/$PACKAGE_NAME/config # relative to sysconfdir diff --git a/ldap/admin/src/create_instance.c b/ldap/admin/src/create_instance.c index c2b0d47e..2a75904c 100644 --- a/ldap/admin/src/create_instance.c +++ b/ldap/admin/src/create_instance.c @@ -709,13 +709,13 @@ char *gen_script_auto(char *s_root, char *cs_path, return NULL; } -#if defined (IS_FHS) +#if defined (IS_FHS_OPT) + PR_snprintf(ofn, sizeof(ofn), "%s%cscript-templates%ctemplate-%s", + cf->datadir, FILE_PATHSEP, FILE_PATHSEP, name); +#else PR_snprintf(ofn, sizeof(ofn), "%s%c%s%cscript-templates%ctemplate-%s", cf->datadir, FILE_PATHSEP, cf->package_name, FILE_PATHSEP, FILE_PATHSEP, name); -#else - PR_snprintf(ofn, sizeof(ofn), "%s%cscript-templates%ctemplate-%s", - cf->datadir, FILE_PATHSEP, FILE_PATHSEP, name); #endif PR_snprintf(fn, sizeof(fn), "%s%c%s", cs_path, FILE_PATHSEP, name); create_instance_mkdir(cs_path, NEWDIR_MODE); @@ -4371,11 +4371,11 @@ int parse_form(server_config_s *cf) prefix = cf->prefix = PL_strdup("/"); } -#if defined (IS_FHS) +#if defined (IS_FHS_OPT) + cf->sroot = PR_smprintf("%sopt%c%s", prefix, FILE_PATHSEP, cf->package_name); +#else cf->sroot = PR_smprintf("%s%s%c%s", prefix, LIBDIR, FILE_PATHSEP, cf->package_name); -#else - cf->sroot = PR_smprintf("%sopt%c%s", prefix, FILE_PATHSEP, cf->package_name); #endif temp = ds_a_get_cgi_var("sasl_path", NULL, NULL); @@ -4393,10 +4393,10 @@ int parse_form(server_config_s *cf) } #endif -#if defined (IS_FHS) - cf->plugin_dir = PR_smprintf("%s%cplugins", cf->sroot, FILE_PATHSEP); -#else +#if defined (IS_FHS_OPT) cf->plugin_dir = PR_smprintf("%s%s%cplugins", prefix, LIBDIR, FILE_PATHSEP); +#else + cf->plugin_dir = PR_smprintf("%s%cplugins", cf->sroot, FILE_PATHSEP); #endif if (!(cf->servname = ds_a_get_cgi_var("servname", "Server Name", @@ -4610,16 +4610,16 @@ int parse_form(server_config_s *cf) temp = ds_a_get_cgi_var("lock_dir", NULL, NULL); if (NULL == temp) { -#if defined (IS_FHS) - cf->lock_dir = PR_smprintf("%s%clock%c%s%c%s-%s", - cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP, - cf->package_name, FILE_PATHSEP, - PRODUCT_NAME, cf->servid); -#else +#if defined (IS_FHS_OPT) cf->lock_dir = PR_smprintf("%s%c%s%c%s-%s%clock", cf->localstatedir, FILE_PATHSEP, cf->package_name, FILE_PATHSEP, PRODUCT_NAME, cf->servid, FILE_PATHSEP); +#else + cf->lock_dir = PR_smprintf("%s%clock%c%s%c%s-%s", + cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP, + cf->package_name, FILE_PATHSEP, + PRODUCT_NAME, cf->servid); #endif } else { cf->lock_dir = PL_strdup(temp); @@ -4627,16 +4627,16 @@ int parse_form(server_config_s *cf) temp = ds_a_get_cgi_var("log_dir", NULL, NULL); if (NULL == temp) { -#if defined (IS_FHS) - cf->log_dir = PR_smprintf("%s%clog%c%s%c%s-%s", - cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP, - cf->package_name, FILE_PATHSEP, - PRODUCT_NAME, cf->servid); -#else +#if defined (IS_FHS_OPT) cf->log_dir = PR_smprintf("%s%c%s%c%s-%s%clog", cf->localstatedir, FILE_PATHSEP, cf->package_name, FILE_PATHSEP, PRODUCT_NAME, cf->servid, FILE_PATHSEP); +#else + cf->log_dir = PR_smprintf("%s%clog%c%s%c%s-%s", + cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP, + cf->package_name, FILE_PATHSEP, + PRODUCT_NAME, cf->servid); #endif } else { cf->log_dir = PL_strdup(temp); @@ -4644,15 +4644,15 @@ int parse_form(server_config_s *cf) temp = ds_a_get_cgi_var("run_dir", NULL, NULL); if (NULL == temp) { -#if defined (IS_FHS) - cf->run_dir = PR_smprintf("%s%crun%c%s", - cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP, - cf->package_name); -#else +#if defined (IS_FHS_OPT) cf->run_dir = PR_smprintf("%s%c%s%c%s-%s%crun", cf->localstatedir, FILE_PATHSEP, cf->package_name, FILE_PATHSEP, PRODUCT_NAME, cf->servid, FILE_PATHSEP); +#else + cf->run_dir = PR_smprintf("%s%crun%c%s", + cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP, + cf->package_name); #endif } else { cf->run_dir = PL_strdup(temp); @@ -4662,14 +4662,14 @@ int parse_form(server_config_s *cf) temp = ds_a_get_cgi_var("db_dir", NULL, NULL); if (NULL == temp) { -#if defined (IS_FHS) - cf->db_dir = PR_smprintf("%s%clib%c%s%c%s-%s%cdb", - cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP, +#if defined (IS_FHS_OPT) + cf->db_dir = PR_smprintf("%s%c%s%c%s-%s%cdb", + cf->localstatedir, FILE_PATHSEP, cf->package_name, FILE_PATHSEP, PRODUCT_NAME, cf->servid, FILE_PATHSEP); #else - cf->db_dir = PR_smprintf("%s%c%s%c%s-%s%cdb", - cf->localstatedir, FILE_PATHSEP, + cf->db_dir = PR_smprintf("%s%clib%c%s%c%s-%s%cdb", + cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP, cf->package_name, FILE_PATHSEP, PRODUCT_NAME, cf->servid, FILE_PATHSEP); #endif @@ -4679,14 +4679,14 @@ int parse_form(server_config_s *cf) temp = ds_a_get_cgi_var("bak_dir", NULL, NULL); if (NULL == temp) { -#if defined (IS_FHS) - cf->bak_dir = PR_smprintf("%s%clib%c%s%c%s-%s%cbak", - cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP, +#if defined (IS_FHS_OPT) + cf->bak_dir = PR_smprintf("%s%c%s%c%s-%s%cbak", + cf->localstatedir, FILE_PATHSEP, cf->package_name, FILE_PATHSEP, PRODUCT_NAME, cf->servid, FILE_PATHSEP); #else - cf->bak_dir = PR_smprintf("%s%c%s%c%s-%s%cbak", - cf->localstatedir, FILE_PATHSEP, + cf->bak_dir = PR_smprintf("%s%clib%c%s%c%s-%s%cbak", + cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP, cf->package_name, FILE_PATHSEP, PRODUCT_NAME, cf->servid, FILE_PATHSEP); #endif @@ -4698,12 +4698,12 @@ int parse_form(server_config_s *cf) temp = ds_a_get_cgi_var("ldif_dir", NULL, NULL); if (NULL == temp) { -#if defined (IS_FHS) - cf->ldif_dir = PR_smprintf("%s%c%s%cldif", - cf->datadir, FILE_PATHSEP, cf->package_name, FILE_PATHSEP); -#else +#if defined (IS_FHS_OPT) cf->ldif_dir = PR_smprintf("%s%cldif", cf->datadir, FILE_PATHSEP); +#else + cf->ldif_dir = PR_smprintf("%s%c%s%cldif", + cf->datadir, FILE_PATHSEP, cf->package_name, FILE_PATHSEP); #endif } else { cf->ldif_dir = PL_strdup(temp); @@ -4711,16 +4711,16 @@ int parse_form(server_config_s *cf) temp = ds_a_get_cgi_var("tmp_dir", NULL, NULL); if (NULL == temp) { -#if defined (IS_FHS) - cf->tmp_dir = PR_smprintf("%s%ctmp%c%s%c%s-%s", - cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP, - cf->package_name, FILE_PATHSEP, - PRODUCT_NAME, cf->servid); -#else +#if defined (IS_FHS_OPT) cf->tmp_dir = PR_smprintf("%s%c%s%c%s-%s%ctmp", cf->localstatedir, FILE_PATHSEP, cf->package_name, FILE_PATHSEP, PRODUCT_NAME, cf->servid, FILE_PATHSEP); +#else + cf->tmp_dir = PR_smprintf("%s%ctmp%c%s%c%s-%s", + cf->localstatedir, FILE_PATHSEP, FILE_PATHSEP, + cf->package_name, FILE_PATHSEP, + PRODUCT_NAME, cf->servid); #endif } else { cf->tmp_dir = PL_strdup(temp); @@ -42,6 +42,10 @@ AC_ARG_WITH(fhs-opt, [ --with-fhs-opt Use FHS optional layout], ], AC_MSG_RESULT(no)) +if test "$with_fhs_opt" = "yes"; then + AC_DEFINE([IS_FHS_OPT], [1], [Use FHS optional layout]) +fi + if test "$with_fhs" = "yes" -a "$with_fhs_opt" = "yes"; then AC_MSG_ERROR([Can't set both --with-fhs and --with-fhs-opt. Please only use one of these options.]) fi |