[Fedora-directory-commits] ldapserver config.h.in, 1.5, 1.6 configure, 1.40, 1.41 configure.ac, 1.26, 1.27

[Nathan Kinder (nkinder)]

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