[Fedora-directory-commits] adminserver/m4 fhs.m4,1.1,1.2

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/adminserver/m4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11758/m4

Modified Files:
	fhs.m4 
Log Message:
Resolves #244715
Summary: Admin Server support --with-fhs-opt
Description: 
1. Adjust the Admin Server's prefix to the Directory Server's including the support for "--with-fhs-opt"
2. Fixed a bug: Default prefix (AX_PREFIX_DEFAULT) does not get PACKAGE_BASE_NAME value.



Index: fhs.m4
===================================================================
RCS file: /cvs/dirsec/adminserver/m4/fhs.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fhs.m4	9 May 2007 00:26:38 -0000	1.1
+++ fhs.m4	19 Jun 2007 20:49:55 -0000	1.2
@@ -25,6 +25,7 @@
 AC_ARG_WITH(fhs, [  --with-fhs   Use FHS layout],
 [
   with_fhs=yes
+  AC_MSG_RESULT(yes)
 ],
 AC_MSG_RESULT(no))
 
@@ -32,3 +33,19 @@
   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