Author: nkinder Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19382 Modified Files: configure configure.ac Log Message: Resolves: 236612 Summary: Added a configure option for FHS optional software layout style. Index: configure =================================================================== RCS file: /cvs/dirsec/ldapserver/configure,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- configure 12 Apr 2007 21:05:59 -0000 1.39 +++ configure 24 Apr 2007 18:02:15 -0000 1.40 @@ -1056,6 +1056,7 @@ --with-tags[=TAGS] include additional configurations [automatic] --with-fhs Use FHS layout + --with-fhs-opt Use FHS optional layout --with-instconfigdir=/path Base directory for instance specific writable configuration directories (default @@ -4306,7 +4307,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4309 "configure"' > conftest.$ac_ext + echo '#line 4310 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5441,7 +5442,7 @@ # Provide some information about the compiler. -echo "$as_me:5444:" \ +echo "$as_me:5445:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 @@ -6504,11 +6505,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6507: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6508: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6511: \$? = $ac_status" >&5 + echo "$as_me:6512: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6772,11 +6773,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6775: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6776: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6779: \$? = $ac_status" >&5 + echo "$as_me:6780: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6876,11 +6877,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6879: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6880: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6883: \$? = $ac_status" >&5 + echo "$as_me:6884: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9221,7 +9222,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9224 "configure" +#line 9225 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9321,7 +9322,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9324 "configure" +#line 9325 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11661,11 +11662,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11664: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11665: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11668: \$? = $ac_status" >&5 + echo "$as_me:11669: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11765,11 +11766,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11768: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11769: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11772: \$? = $ac_status" >&5 + echo "$as_me:11773: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13335,11 +13336,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13338: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13339: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13342: \$? = $ac_status" >&5 + echo "$as_me:13343: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13439,11 +13440,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13442: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13443: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13446: \$? = $ac_status" >&5 + echo "$as_me:13447: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15642,11 +15643,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15645: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15646: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15649: \$? = $ac_status" >&5 + echo "$as_me:15650: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15910,11 +15911,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15913: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15914: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15917: \$? = $ac_status" >&5 + echo "$as_me:15918: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16014,11 +16015,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16017: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16018: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16021: \$? = $ac_status" >&5 + echo "$as_me:16022: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -22949,6 +22950,8 @@ withval="$with_fhs" with_fhs=yes + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else echo "$as_me:$LINENO: result: no" >&5 @@ -22963,33 +22966,74 @@ fi +# check for --with-fhs-opt +echo "$as_me:$LINENO: checking for --with-fhs-opt" >&5 +echo $ECHO_N "checking for --with-fhs-opt... $ECHO_C" >&6 + +# Check whether --with-fhs-opt or --without-fhs-opt was given. +if test "${with_fhs_opt+set}" = set; then + withval="$with_fhs_opt" + + with_fhs_opt=yes + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +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;} + { (exit 1); exit 1; }; } +fi -# 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. +# installation paths - by default, we store everything +# under the prefix. The with-fhs option will use /usr, +# /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' + # relative to datadir + sampledatadir=/$PACKAGE_NAME/data + # relative to datadir + scripttemplatedir=/$PACKAGE_NAME/script-templates + # relative to libdir + serverdir=/$PACKAGE_NAME + # relative to libdir + serverplugindir=/$PACKAGE_NAME/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' + fi + # Paths for default layout + # relative to datadir + sampledatadir=/data + # relative to datadir + scripttemplatedir=/script-templates + # relative to libdir + serverdir= + # relative to libdir + serverplugindir=/plugins fi +# Shared paths for both FHS and default layouts # relative to sysconfdir configdir=/$PACKAGE_NAME/config -# relative to datadir -sampledatadir=/$PACKAGE_NAME/data # relative to sysconfdir propertydir=/$PACKAGE_NAME/property # relative to sysconfdir schemadir=/$PACKAGE_NAME/schema -# relative to libdir -serverdir=/$PACKAGE_NAME -# relative to libdir -serverplugindir=/$PACKAGE_NAME/plugins -# relative to datadir -scripttemplatedir=/$PACKAGE_NAME/script-templates Index: configure.ac =================================================================== RCS file: /cvs/dirsec/ldapserver/configure.ac,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- configure.ac 20 Mar 2007 18:46:45 -0000 1.25 +++ configure.ac 24 Apr 2007 18:02:15 -0000 1.26 @@ -126,9 +126,11 @@ m4_include(m4/fhs.m4) -# 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. +# installation paths - by default, we store everything +# under the prefix. The with-fhs option will use /usr, +# /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 @@ -137,22 +139,39 @@ sysconfdir='/etc' dnl as opposed to the default /usr/var localstatedir='/var' + # relative to datadir + sampledatadir=/$PACKAGE_NAME/data + # relative to datadir + scripttemplatedir=/$PACKAGE_NAME/script-templates + # relative to libdir + serverdir=/$PACKAGE_NAME + # relative to libdir + serverplugindir=/$PACKAGE_NAME/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' + fi + # Paths for default layout + # relative to datadir + sampledatadir=/data + # relative to datadir + scripttemplatedir=/script-templates + # relative to libdir + serverdir= + # relative to libdir + serverplugindir=/plugins fi +# Shared paths for both FHS and default layouts # relative to sysconfdir configdir=/$PACKAGE_NAME/config -# relative to datadir -sampledatadir=/$PACKAGE_NAME/data # relative to sysconfdir propertydir=/$PACKAGE_NAME/property # relative to sysconfdir schemadir=/$PACKAGE_NAME/schema -# relative to libdir -serverdir=/$PACKAGE_NAME -# relative to libdir -serverplugindir=/$PACKAGE_NAME/plugins -# relative to datadir -scripttemplatedir=/$PACKAGE_NAME/script-templates AC_SUBST(configdir) AC_SUBST(sampledatadir)