[Fedora-directory-commits] ldapserver/ldap/admin/src/java/com/netscape/xmltools DSML2LDIF.java, 1.4, NONE DSMLReader.java, 1.4, NONE DSMLSAXBuilder.java, 1.4, NONE DSMLSAXHandler.java, 1.4, NONE DSMLWriter.java, 1.4, NONE GetOpt.java, 1.4, NONE LDIF2DSML.java, 1.4, NONE Makefile, 1.5, NONE
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/admin/src/java/com/netscape/xmltools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8631/ldap/admin/src/java/com/netscape/xmltools
Removed Files:
DSML2LDIF.java DSMLReader.java DSMLSAXBuilder.java
DSMLSAXHandler.java DSMLWriter.java GetOpt.java LDIF2DSML.java
Makefile
Log Message:
Resolves: #237356
Summary: Move DS Admin Code into Admin Server (Comment #2)
Description: Cleaning up unused code
--- DSML2LDIF.java DELETED ---
--- DSMLReader.java DELETED ---
--- DSMLSAXBuilder.java DELETED ---
--- DSMLSAXHandler.java DELETED ---
--- DSMLWriter.java DELETED ---
--- GetOpt.java DELETED ---
--- LDIF2DSML.java DELETED ---
--- Makefile DELETED ---
17 years
[Fedora-directory-commits] ldapserver/config .cvsignore, 1.1.1.1, NONE Makefile, 1.4, NONE common.mn, 1.4, NONE nfspwd.pl, 1.4, NONE nsinstall.c, 1.6, NONE pathsub.c, 1.5, NONE pathsub.h, 1.6, NONE revdepth-nt.pl, 1.4, NONE revdepth.pl, 1.4, NONE
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/config
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8631/config
Removed Files:
.cvsignore Makefile common.mn nfspwd.pl nsinstall.c pathsub.c
pathsub.h revdepth-nt.pl revdepth.pl
Log Message:
Resolves: #237356
Summary: Move DS Admin Code into Admin Server (Comment #2)
Description: Cleaning up unused code
--- .cvsignore DELETED ---
--- Makefile DELETED ---
--- common.mn DELETED ---
--- nfspwd.pl DELETED ---
--- nsinstall.c DELETED ---
--- pathsub.c DELETED ---
--- pathsub.h DELETED ---
--- revdepth-nt.pl DELETED ---
--- revdepth.pl DELETED ---
17 years
[Fedora-directory-commits] ldapserver/ldap/servers/slapd/libsh_stub libsh_stub.c, 1.5, NONE
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/libsh_stub
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7800/ldap/servers/slapd/libsh_stub
Removed Files:
libsh_stub.c
Log Message:
Resolves: #237356
Summary: Move DS Admin Code into Admin Server (Comment #2)
Description: Cleaning up unused code
--- libsh_stub.c DELETED ---
17 years
[Fedora-directory-commits] dsmlgw/src/com/netscape - Imported sources
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/dsmlgw/src/com/netscape
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3200
Log Message:
Initial import of code from ldapserver
Status:
Vendor Tag: DSMLGW_INITIAL
Release Tags: DSMLGW_INITIAL_IMPORT
N dsmlgw/src/com/netscape/xmltools/DSMLReader.java
N dsmlgw/src/com/netscape/xmltools/DSMLWriter.java
N dsmlgw/src/com/netscape/xmltools/Makefile
N dsmlgw/src/com/netscape/xmltools/LDIF2DSML.java
N dsmlgw/src/com/netscape/xmltools/GetOpt.java
N dsmlgw/src/com/netscape/xmltools/DSMLSAXHandler.java
N dsmlgw/src/com/netscape/xmltools/DSML2LDIF.java
N dsmlgw/src/com/netscape/xmltools/DSMLSAXBuilder.java
No conflicts created by this import
17 years
[Fedora-directory-commits] ldapserver/ldap/servers/slapd connection.c, 1.14, 1.15
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17768
Modified Files:
connection.c
Log Message:
Resolves: #237731
Summary: Random SASL GSSAPI test failure on shadowfoot (Comment #7)
Changes: If PR_Recv in sasl_recv_connection gets EAGAIN (== errno 11),
check whether it should be retried as being done for "a temporary
non-blocking I/O error".
Index: connection.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/connection.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- connection.c 27 Feb 2007 02:57:29 -0000 1.14
+++ connection.c 27 Apr 2007 18:00:21 -0000 1.15
@@ -1745,7 +1745,8 @@
}
/* err = PR_GetError(); */
/* If we would block, we need to poll for a while */
- if ( SLAPD_PR_WOULD_BLOCK_ERROR( err ) ) {
+ if ( SLAPD_PR_WOULD_BLOCK_ERROR( err ) ||
+ SLAPD_SYSTEM_WOULD_BLOCK_ERROR( err ) ) {
struct PRPollDesc pr_pd;
PRIntervalTime timeout = PR_MillisecondsToInterval(CONN_TURBO_TIMEOUT_INTERVAL);
pr_pd.fd = (PRFileDesc *)conn->c_prfd;
17 years
[Fedora-directory-commits] dsorgchart - Imported sources
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/dsorgchart
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2859
Log Message:
Initial import of code from ldapserver
Status:
Vendor Tag: DSORGCHART_INITIAL
Release Tags: DSORGCHART_INITIAL_IMPORT
N dsorgchart/styles.css
N dsorgchart/ldap-person.gif
N dsorgchart/botframe.html
N dsorgchart/myorg.pl
N dsorgchart/index.html
N dsorgchart/wrapper.c
N dsorgchart/mail.gif
N dsorgchart/new-branch-straight.gif
N dsorgchart/topframe.html
N dsorgchart/org.pl
N dsorgchart/org.bat
N dsorgchart/starthelp.gif
N dsorgchart/arrow.gif
N dsorgchart/new-branch-blank.gif
N dsorgchart/aim-online.gif
N dsorgchart/orgicon.gif
N dsorgchart/new-branch-first.gif
N dsorgchart/branch-cc1.gif
N dsorgchart/myorg.bat
N dsorgchart/config.tmpl
N dsorgchart/mag.gif
No conflicts created by this import
17 years
[Fedora-directory-commits] dsmlgw - Imported sources
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/dsmlgw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2316
Log Message:
Initial import of code from ldapserver
Status:
Vendor Tag: DSMLGW_INITIAL
Release Tags: DSMLGW_INITIAL_IMPORT
N dsmlgw/Makefile
N dsmlgw/build.xml
N dsmlgw/dsml/European.dsml
N dsmlgw/dsml/Example-roles.dsml
N dsmlgw/dsml/Example.dsml
N dsmlgw/misc/server-config.wsdd
N dsmlgw/misc/dsmlgw.cfg
N dsmlgw/misc/web-app_2_3.dtd
N dsmlgw/src/com/netscape/dsml/gateway/IConnectionManager.java
N dsmlgw/src/com/netscape/dsml/gateway/ProxyConnMgrFactory.java
N dsmlgw/src/com/netscape/dsml/gateway/BatchProcessor.java
N dsmlgw/src/com/netscape/dsml/gateway/gatewayHandler.java
N dsmlgw/src/com/netscape/dsml/gateway/ParseControl.java
N dsmlgw/src/com/netscape/dsml/gateway/OperationModify.java
N dsmlgw/src/com/netscape/dsml/gateway/OperationSearch.java
N dsmlgw/src/com/netscape/dsml/gateway/ProxyConnectionManager.java
N dsmlgw/src/com/netscape/dsml/gateway/gatewayException.java
N dsmlgw/src/com/netscape/dsml/gateway/IConnMgrFactoryFunctor.java
N dsmlgw/src/com/netscape/dsml/gateway/OperationModifyDN.java
N dsmlgw/src/com/netscape/dsml/gateway/gatewayContext.java
N dsmlgw/src/com/netscape/dsml/gateway/OperationCompare.java
N dsmlgw/src/com/netscape/dsml/gateway/ParseFilter.java
N dsmlgw/src/com/netscape/dsml/gateway/OperationDelete.java
N dsmlgw/src/com/netscape/dsml/gateway/Constants.java
N dsmlgw/src/com/netscape/dsml/gateway/Configuration.java
N dsmlgw/src/com/netscape/dsml/gateway/gatewayService.java
N dsmlgw/src/com/netscape/dsml/gateway/LDAPAuthenticator.java
N dsmlgw/src/com/netscape/dsml/gateway/OperationAdd.java
N dsmlgw/src/com/netscape/dsml/gateway/ParseValue.java
N dsmlgw/src/com/netscape/dsml/gateway/OperationExtended.java
N dsmlgw/src/com/netscape/dsml/gateway/GenericOperation.java
N dsmlgw/src/com/netscape/dsml/gateway/OperationAuth.java
N dsmlgw/src/com/netscape/dsml/test/SOAPClient.java
N dsmlgw/src/com/netscape/dsml/test/dsmlSearch.java
N dsmlgw/src/com/netscape/dsml/test/dsmlClient.java
No conflicts created by this import
17 years
[Fedora-directory-commits] ldapserver/m4 fhs.m4,1.2,1.3
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/m4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16117/m4
Modified Files:
fhs.m4
Log Message:
Resolves: 236612
Summary: Modified the with-fhs and with-fhs-opt configure options
Index: fhs.m4
===================================================================
RCS file: /cvs/dirsec/ldapserver/m4/fhs.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fhs.m4 24 Apr 2007 18:02:21 -0000 1.2
+++ fhs.m4 26 Apr 2007 02:37:54 -0000 1.3
@@ -42,6 +42,10 @@
],
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
17 years
[Fedora-directory-commits] ldapserver/ldap/admin/src create_instance.c, 1.54, 1.55
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16117/ldap/admin/src
Modified Files:
create_instance.c
Log Message:
Resolves: 236612
Summary: Modified the with-fhs and with-fhs-opt configure options
Index: create_instance.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- create_instance.c 24 Apr 2007 18:02:15 -0000 1.54
+++ create_instance.c 26 Apr 2007 02:37:49 -0000 1.55
@@ -709,13 +709,13 @@
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 @@
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 @@
}
#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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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);
17 years
[Fedora-directory-commits] ldapserver config.h.in, 1.5, 1.6 configure, 1.40, 1.41 configure.ac, 1.26, 1.27
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16117
Modified Files:
config.h.in configure configure.ac
Log Message:
Resolves: 236612
Summary: Modified the with-fhs and with-fhs-opt configure options
Index: config.h.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/config.h.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- config.h.in 22 Feb 2007 23:59:13 -0000 1.5
+++ config.h.in 26 Apr 2007 02:37:48 -0000 1.6
@@ -241,6 +241,9 @@
/* Use FHS layout */
#undef IS_FHS
+/* Use FHS optional layout */
+#undef IS_FHS_OPT
+
/* LDAP debug flag */
#undef LDAP_DEBUG
Index: configure
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- configure 24 Apr 2007 18:02:15 -0000 1.40
+++ configure 26 Apr 2007 02:37:48 -0000 1.41
@@ -22983,6 +22983,14 @@
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 @@
# /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
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure.ac,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- configure.ac 24 Apr 2007 18:02:15 -0000 1.26
+++ configure.ac 26 Apr 2007 02:37:49 -0000 1.27
@@ -131,41 +131,40 @@
# /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
17 years