Attachment 157309 Details for Bug 244715 – cvs diffs adminserver/configure.ac adminserver/m4/fhs.m4

[patch] cvs diffs adminserver/configure.ac adminserver/m4/fhs.m4

as_opt.diffs (text/plain), 3.49 KB, created by Noriko Hosoi on 2007-06-18 18:47:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noriko Hosoi

Created: 2007-06-18 18:47:23 UTC

Size: 3.49 KB

patch

obsolete

>Index: configure.ac
>===================================================================
>RCS file: /cvs/dirsec/adminserver/configure.ac,v
>retrieving revision 1.7
>diff -t -w -U4 -r1.7 configure.ac
>--- configure.ac	15 Jun 2007 22:16:28 -0000	1.7
>+++ configure.ac	18 Jun 2007 18:39:04 -0000
>@@ -57,10 +57,11 @@
> AC_CHECK_LIB([ncurses], [printw], [curses_lib=-lncurses],
>              AC_CHECK_LIB([curses], [printw], [curses_lib=-lcurses]))
> 
> PACKAGE_BASE_NAME=`echo $PACKAGE_NAME | sed -e s/-admin//`
>-# the default prefix - override with --prefix or --with-fhs
>-AC_PREFIX_DEFAULT([/opt/$PACKAGE_BASE_NAME])
>+AC_SUBST(PACKAGE_BASE_NAME)
>+# the default prefix - override with --prefix or --with-fhs or --with-fhs-opt
>+AC_PREFIX_DEFAULT([/opt/@PACKAGE_BASE_NAME@])
> 
> brand=fedora
> capbrand=Fedora
> vendor="Fedora Project"
>@@ -69,8 +70,23 @@
> 
> # installation paths - by default, configure will just
> # use /usr as the prefix for everything, which means
> # /usr/etc and /usr/var.  FHS sez to use /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_opt" = "yes"; then
>+  # Override sysconfdir and localstatedir if FHS optional
>+  # package was requested.
>+  sysconfdir='/etc/opt'
>+  localstatedir='/var/opt'
>+  # relative to datadir
>+  infdir=/inf
>+  htmldir=/html
>+  icondir=/icons
>+  manualdir=/manual
>+  ldifdir=/data
>+else
> if test "$with_fhs" = "yes"; then
>   ac_default_prefix=/usr
>   prefix=$ac_default_prefix
>   exec_prefix=$prefix
>@@ -78,8 +94,15 @@
>   sysconfdir='/etc'
> dnl as opposed to the default /usr/var
>   localstatedir='/var'
> fi
>+# relative to datadir
>+  infdir=/$PACKAGE_BASE_NAME/inf
>+  htmldir=/$PACKAGE_BASE_NAME/html
>+  icondir=/$PACKAGE_BASE_NAME/icons
>+  manualdir=/$PACKAGE_BASE_NAME/manual
>+  ldifdir=/$PACKAGE_BASE_NAME/data
>+fi
> 
> shared_lib_suffix=.so
> initdir=/rc.d
> case $host in
>@@ -135,15 +158,8 @@
>   instconfigdir='$(sysconfdir)/$(PACKAGE_BASE_NAME)'
> ])
> AC_SUBST(instconfigdir)
> 
>-# relative to datadir
>-htmldir=/$PACKAGE_BASE_NAME/html
>-icondir=/$PACKAGE_BASE_NAME/icons
>-manualdir=/$PACKAGE_BASE_NAME/manual
>-ldifdir=/$PACKAGE_BASE_NAME/data
>-infdir=/$PACKAGE_BASE_NAME/inf
>-
> # CGI program directory, relative to libdir
> cgibindir=/$PACKAGE_BASE_NAME/cgi-bin
> 
> # cmdbindir is just sbindir
>@@ -165,9 +181,8 @@
> perldir=/$PACKAGE_BASE_NAME/perl
> 
> # write out paths for binary components
> AC_SUBST(PACKAGE_NAME)
>-AC_SUBST(PACKAGE_BASE_NAME)
> AC_SUBST(nspr_inc)
> AC_SUBST(nspr_lib)
> AC_SUBST(nspr_libdir)
> AC_SUBST(nss_inc)
>Index: m4/fhs.m4
>===================================================================
>RCS file: /cvs/dirsec/adminserver/m4/fhs.m4,v
>retrieving revision 1.1
>diff -t -w -U4 -r1.1 fhs.m4
>--- m4/fhs.m4	9 May 2007 00:26:38 -0000	1.1
>+++ m4/fhs.m4	18 Jun 2007 18:39:41 -0000
>@@ -24,11 +24,28 @@
> AC_MSG_CHECKING(for --with-fhs)
> AC_ARG_WITH(fhs, [  --with-fhs   Use FHS layout],
> [
>   with_fhs=yes
>+  AC_MSG_RESULT(yes)
> ],
> AC_MSG_RESULT(no))
> 
> if test "$with_fhs" = "yes"; then
>   AC_DEFINE([IS_FHS], [1], [Use FHS layout])
> fi
> 
>+# check for --with-fhs-opt
>+AC_MSG_CHECKING(for --with-fhs-opt)
>+AC_ARG_WITH(fhs-opt, [  --with-fhs-opt   Use FHS optional layout],
>+[
>+  with_fhs_opt=yes
>+  AC_MSG_RESULT(yes)
>+],
>+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

Actions: View | Diff

Attachments on bug 244715: 157309 | 157416