From 066685a6d133a646de63d64fb6c4c25552a89ee9 Mon Sep 17 00:00:00 2001 From: Noriko Hosoi Date: Jun 21 2007 22:01:52 +0000 Subject: Resolves: #244749 Summary: Configure Pass Thru Auth (comment #8, #9) Description: 1) Introducing BaseVersion (*.inf files) via PACKAGE_BASE_VERSION (configure.ac) to generate #.# format version number from #.#.#. The #.# format version number is used in the jar file names 2) configure.ac: Changed the default prefix to the hardcoded string: AC_PREFIX_DEFAULT([/opt/fedora-ds]) --- diff --git a/Makefile.am b/Makefile.am index 279e3f9..eb046aa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -124,6 +124,8 @@ ldif_DATA = admserv/schema/ldif/00nsroot_backend.ldif.tmpl \ admserv/schema/ldif/02globalpreferences.ldif.tmpl \ admserv/schema/ldif/10dsdata.ldif.tmpl \ admserv/schema/ldif/11dstasks.ldif.tmpl \ + admserv/schema/ldif/12dsconfig.mod.tmpl \ + admserv/schema/ldif/13dsschema.mod.tmpl \ admserv/schema/ldif/20asdata.ldif.tmpl \ admserv/schema/ldif/21astasks.ldif.tmpl \ admserv/schema/ldif/22ascommands.ldif.tmpl @@ -382,6 +384,7 @@ fixupcmd = sed \ -e 's,@package_name\@,$(PACKAGE_NAME),g' \ -e 's,@PACKAGE_BASE_NAME\@,$(PACKAGE_BASE_NAME),g' \ -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \ + -e 's,@PACKAGE_BASE_VERSION\@,$(PACKAGE_BASE_VERSION),g' \ -e 's,@brand\@,$(brand),g' \ -e 's,@capbrand\@,$(capbrand),g' \ -e 's,@vendor\@,$(vendor),g' \ diff --git a/Makefile.in b/Makefile.in index 3b8540c..da95945 100644 --- a/Makefile.in +++ b/Makefile.in @@ -381,6 +381,7 @@ MOD_RESTARTD_TRUE = @MOD_RESTARTD_TRUE@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BASE_NAME = @PACKAGE_BASE_NAME@ +PACKAGE_BASE_VERSION = @PACKAGE_BASE_VERSION@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ @@ -389,7 +390,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -560,6 +560,8 @@ ldif_DATA = admserv/schema/ldif/00nsroot_backend.ldif.tmpl \ admserv/schema/ldif/02globalpreferences.ldif.tmpl \ admserv/schema/ldif/10dsdata.ldif.tmpl \ admserv/schema/ldif/11dstasks.ldif.tmpl \ + admserv/schema/ldif/12dsconfig.mod.tmpl \ + admserv/schema/ldif/13dsschema.mod.tmpl \ admserv/schema/ldif/20asdata.ldif.tmpl \ admserv/schema/ldif/21astasks.ldif.tmpl \ admserv/schema/ldif/22ascommands.ldif.tmpl @@ -774,6 +776,7 @@ fixupcmd = sed \ -e 's,@package_name\@,$(PACKAGE_NAME),g' \ -e 's,@PACKAGE_BASE_NAME\@,$(PACKAGE_BASE_NAME),g' \ -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \ + -e 's,@PACKAGE_BASE_VERSION\@,$(PACKAGE_BASE_VERSION),g' \ -e 's,@brand\@,$(brand),g' \ -e 's,@capbrand\@,$(capbrand),g' \ -e 's,@vendor\@,$(vendor),g' \ diff --git a/aclocal.m4 b/aclocal.m4 index c7c1c6f..9064efa 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1578,27 +1578,10 @@ linux*) # before this can be enabled. hardcode_into_libs=yes - # find out which ABI we are using - libsuff= - case "$host_cpu" in - x86_64*|s390x*|powerpc64*) - echo '[#]line __oline__ "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in - *64-bit*) - libsuff=64 - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" - ;; - esac - fi - rm -rf conftest* - ;; - esac - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -4305,9 +4288,6 @@ CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) # Is the compiler the GNU C compiler? with_gcc=$_LT_AC_TAGVAR(GCC, $1) -gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` -gcc_ver=\`gcc -dumpversion\` - # An ERE matcher. EGREP=$lt_EGREP @@ -4441,11 +4421,11 @@ striplib=$lt_striplib # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1) # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) # Dependencies to place before the objects being linked to create a # shared library. @@ -4457,7 +4437,7 @@ postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -4537,7 +4517,7 @@ variables_saved_for_relink="$variables_saved_for_relink" link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) # Compile-time system search path for libraries -sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -6373,7 +6353,6 @@ do done done done -IFS=$as_save_IFS lt_ac_max=0 lt_ac_count=0 # Add /usr/xpg4/bin/sed as it is typically found on Solaris @@ -6406,7 +6385,6 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do done ]) SED=$lt_cv_path_SED -AC_SUBST([SED]) AC_MSG_RESULT([$SED]) ]) diff --git a/admserv/newinst/src/admin.inf.in b/admserv/newinst/src/admin.inf.in index e12993d..174e0b5 100644 --- a/admserv/newinst/src/admin.inf.in +++ b/admserv/newinst/src/admin.inf.in @@ -29,6 +29,7 @@ Brand= @capbrand@ NormBrand = @brand@ Vendor=@vendor@ Version= @PACKAGE_VERSION@ +BaseVersion= @PACKAGE_BASE_VERSION@ NickName= admin BuildNumber= @NQBUILD_NUM@ # the rest of these are obsolete, but left here for diff --git a/admserv/newinst/src/adminserver.map.in b/admserv/newinst/src/adminserver.map.in index 85c05d3..eb5c82b 100644 --- a/admserv/newinst/src/adminserver.map.in +++ b/admserv/newinst/src/adminserver.map.in @@ -66,10 +66,11 @@ admpw = "@configdir@/admpw" as_error = "@logdir@/errors" as_access = "@logdir@/access" as_pid = "@pidfile@" -as_console_jar = "%normbrand%-admserv-%as_version%.jar" +as_console_jar = "%normbrand%-admserv-%as_baseversion%.jar" as_help_path = "@helpdir@" as_user = SysUser as_version = Version +as_baseversion = BaseVersion as_buildnum = BuildNumber as_installedlocation = "AS INSTALLED LOCATION -- replace me" as_serverroot = "AS SERVER ROOT-- replace me" diff --git a/admserv/newinst/src/configdsroot.map.in b/admserv/newinst/src/configdsroot.map.in index c5480c3..ec39357 100644 --- a/admserv/newinst/src/configdsroot.map.in +++ b/admserv/newinst/src/configdsroot.map.in @@ -62,10 +62,12 @@ as_uid = ServerAdminID as_passwd = ServerAdminPwd asid = `use Net::Domain qw(hostname); $returnvalue = hostname();` as_version = Version +as_baseversion = BaseVersion ds_version = Version +ds_baseversion = BaseVersion ds_port = ServerPort ds_secure_port ="636" ds_suffix = Suffix -ds_console_jar ="%normbrand%-ds-%ds_version%.jar" +ds_console_jar ="%normbrand%-ds-%ds_baseversion%.jar" diff --git a/admserv/newinst/src/dirserver.map.in b/admserv/newinst/src/dirserver.map.in index f2f94a1..ab0ef32 100644 --- a/admserv/newinst/src/dirserver.map.in +++ b/admserv/newinst/src/dirserver.map.in @@ -63,6 +63,7 @@ configroot = "CONFIG ROOT -- replace me" asid = `use Net::Domain qw(hostname); $returnvalue = hostname();` as_sie = "cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot" ds_version = Version +ds_baseversion = BaseVersion dsid = ServerIdentifier ds_user = SuiteSpotUserID ds_port = ServerPort @@ -70,7 +71,7 @@ ds_secure_port ="636" rootdn = RootDN ds_suffix = Suffix ds_buildnum = BuildNumber -ds_console_jar ="%normbrand%-ds-%ds_version%.jar" +ds_console_jar ="%normbrand%-ds-%ds_baseversion%.jar" ds_installedlocation = "DS INSTALLED LOCATION -- replace me" ds_serverroot = "DS SERVER ROOT-- replace me" ds_sie = "cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot" diff --git a/admserv/newinst/src/register_param.map.in b/admserv/newinst/src/register_param.map.in index 3cfe5b9..cd7b852 100644 --- a/admserv/newinst/src/register_param.map.in +++ b/admserv/newinst/src/register_param.map.in @@ -71,16 +71,18 @@ admpw = "@configdir@/admpw" as_error = "@logdir@/errors" as_access = "@logdir@/access" as_pid = "@pidfile@" -as_console_jar = "%normbrand%-admserv-%as_version%.jar" +as_console_jar = "%normbrand%-admserv-%as_baseversion%.jar" as_help_path = "@helpdir@" as_user = SysUser as_version = Version +as_baseversion = BaseVersion as_buildnum = BuildNumber as_installedlocation = "AS INSTALLED LOCATION -- replace me" as_serverroot = "AS SERVER ROOT-- replace me" as_sie = "cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot" ds_version = Version +ds_baseversion = BaseVersion dsid = ServerIdentifier ds_user = SuiteSpotUserID ds_port = ServerPort @@ -89,7 +91,7 @@ rootdn = RootDN ds_suffix = Suffix ds_buildnum = BuildNumber ds_passwd = RootDNPwd -ds_console_jar ="%normbrand%-ds-%ds_version%.jar" +ds_console_jar ="%normbrand%-ds-%ds_baseversion%.jar" ds_installedlocation = "DS INSTALLED LOCATION -- replace me" ds_serverroot = "DS SERVER ROOT-- replace me" ds_sie = "cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot" diff --git a/admserv/newinst/src/setup.inf.in b/admserv/newinst/src/setup.inf.in index 81f3e78..fee2f26 100644 --- a/admserv/newinst/src/setup.inf.in +++ b/admserv/newinst/src/setup.inf.in @@ -31,5 +31,6 @@ Name = @capbrand@ Server Products Vendor = @capbrand@ Project Description = @capbrand@ Server Products Installation Version = @PACKAGE_VERSION@ -Brand = @capbrand@ -NormBrand = @brand@ +BaseVersion = @PACKAGE_BASE_VERSION@ +Brand = @capbrand@ +NormBrand = @brand@ diff --git a/admserv/schema/ldif/01nsroot.ldif.tmpl b/admserv/schema/ldif/01nsroot.ldif.tmpl index cd46899..d1fdc94 100644 --- a/admserv/schema/ldif/01nsroot.ldif.tmpl +++ b/admserv/schema/ldif/01nsroot.ldif.tmpl @@ -24,7 +24,6 @@ o: NetscapeRoot aci: (targetattr="*")(version 3.0; acl "Enable Configuration Administrator Group modification"; allow (all) groupdn="ldap:///cn=Configuration Administrators, ou=Groups, ou=TopologyManagement, o=NetscapeRoot";) aci: (targetattr="*")(targetfilter=(o=NetscapeRoot))(version 3.0; acl "Default anonymous access"; allow (read, search) userdn="ldap:///anyone";) aci: (targetattr="*")(version 3.0; acl "Enable Group Expansion"; allow (read, search, compare) groupdnattr="uniquemember";) -aci: (targetattr = "*")(version 3.0; acl "SIE Group"; allow (all) groupdn = "ldap:///cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot";) dn: ou=TopologyManagement, o=NetscapeRoot objectClass: top diff --git a/admserv/schema/ldif/02globalpreferences.ldif.tmpl b/admserv/schema/ldif/02globalpreferences.ldif.tmpl index e0bae95..2a8e9e2 100644 --- a/admserv/schema/ldif/02globalpreferences.ldif.tmpl +++ b/admserv/schema/ldif/02globalpreferences.ldif.tmpl @@ -24,21 +24,21 @@ objectClass: extensibleObject ou: admin nsmerge: ADD_IF_EMPTY -dn: ou=%as_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot +dn: ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot objectClass: top objectClass: organizationalunit objectClass: extensibleObject -ou: %as_version% +ou: %as_baseversion% nsmerge: ADD_IF_EMPTY -dn: cn=ResourceEditorExtension, ou=%as_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot +dn: cn=ResourceEditorExtension, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot objectClass: top objectClass: nsResourceRef objectClass: extensibleObject cn: ResourceEditorExtension nsmerge: ADD_IF_EMPTY -dn: cn=nsroledefinition, cn=ResourceEditorExtension, ou=%as_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot +dn: cn=nsroledefinition, cn=ResourceEditorExtension, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot cn: nsroledefinition objectClass: top objectClass: extensibleObject @@ -50,7 +50,7 @@ nsClassname: com.netscape.admin.dirserv.roledit.ResEditorRoleMembers@%ds_console nsClassname: com.netscape.admin.dirserv.roledit.ResEditorRoleAccountPage@%ds_console_jar% nsmerge: {nsclassname}MULTI_MERGE -dn: cn=cossuperdefinition, cn=ResourceEditorExtension, ou=%as_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot +dn: cn=cossuperdefinition, cn=ResourceEditorExtension, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot cn: cossuperdefinition objectClass: top objectClass: extensibleObject @@ -97,17 +97,17 @@ nsNickName: cert,cert,%brand% Certificate Server nsmerge: {nsadminenduserhtmlindex}MULTI_MERGE nsmerge: {nsnickname}MULTI_MERGE -dn: cn=PublicViews, ou=%as_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot +dn: cn=PublicViews, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot objectClass: top objectClass: nsAdminConsoleUser cn: PublicViews -dn: cn=CustomView, ou=%as_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot +dn: cn=CustomView, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot objectClass: top objectClass: nsResourceRef cn: CustomView -dn: cn=inetorgPerson, cn=ResourceEditorExtension, ou=%as_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot +dn: cn=inetorgPerson, cn=ResourceEditorExtension, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot cn: inetorgPerson objectClass: nsResourceRef objectClass: nsAdminResourceEditorExtension @@ -121,7 +121,7 @@ nsClassname: com.netscape.management.client.ug.ResEditorNTUser nsClassname: com.netscape.management.client.ug.ResEditorPosixUser nsmerge: {nsclassname}MULTI_MERGE -dn: cn=organizationalPerson, cn=ResourceEditorExtension, ou=%as_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot +dn: cn=organizationalPerson, cn=ResourceEditorExtension, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot cn: organizationalPerson objectClass: nsResourceRef objectClass: nsAdminResourceEditorExtension @@ -133,7 +133,7 @@ nsClassname: com.netscape.management.client.ug.ResEditorAccountPage nsClassname: com.netscape.management.client.ug.LanguagePage nsmerge: {nsclassname}MULTI_MERGE -dn: cn=groupofuniquenames, cn=ResourceEditorExtension, ou=%as_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot +dn: cn=groupofuniquenames, cn=ResourceEditorExtension, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot cn: groupofuniquenames objectClass: nsResourceRef objectClass: nsAdminResourceEditorExtension @@ -146,7 +146,7 @@ nsClassname: com.netscape.management.client.ug.ResEditorAccountPage nsClassname: com.netscape.management.client.ug.LanguagePage nsmerge: {nsclassname}MULTI_MERGE -dn: cn=organizationalunit, cn=ResourceEditorExtension, ou=%as_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot +dn: cn=organizationalunit, cn=ResourceEditorExtension, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot cn: organizationalunit objectClass: nsResourceRef objectClass: nsAdminResourceEditorExtension @@ -157,12 +157,12 @@ nsClassname: com.netscape.management.client.ug.OUPage nsClassname: com.netscape.management.client.ug.LanguagePage nsmerge: {nsclassname}MULTI_MERGE -dn: cn=defaultObjectClassesContainer, ou=%as_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot +dn: cn=defaultObjectClassesContainer, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot objectClass: top objectClass: nsResourceRef cn: DefaultObjectClassesContainer -dn: cn=user, cn=defaultObjectClassesContainer, ou=%as_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot +dn: cn=user, cn=defaultObjectClassesContainer, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot objectClass: top objectClass: nsResourceRef objectClass: nsdefaultObjectClasses @@ -172,7 +172,7 @@ nsDefaultObjectClass: person nsDefaultObjectClass: organizationalPerson nsDefaultObjectClass: inetorgperson -dn: cn=group, cn=defaultObjectClassesContainer, ou=%as_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot +dn: cn=group, cn=defaultObjectClassesContainer, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot objectClass: top objectClass: nsResourceRef objectClass: nsdefaultObjectClasses @@ -180,7 +180,7 @@ cn: group nsDefaultObjectClass: top nsDefaultObjectClass: groupofuniquenames -dn: cn=ou, cn=defaultObjectClassesContainer, ou=%as_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot +dn: cn=ou, cn=defaultObjectClassesContainer, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot objectClass: top objectClass: nsResourceRef objectClass: nsdefaultObjectClasses @@ -188,14 +188,14 @@ cn: ou nsDefaultObjectClass: top nsDefaultObjectClass: organizationalunit -dn: cn=topologyplugin, ou=%as_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot +dn: cn=topologyplugin, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot objectClass: top objectClass: nsResourceRef objectClass: extensibleObject cn: topologyplugin nsmerge: ADD_IF_EMPTY -dn: cn=defaultplugin, cn=topologyplugin, ou=%as_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot +dn: cn=defaultplugin, cn=topologyplugin, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot objectClass: top objectClass: nstopologyplugin objectClass: extensibleObject @@ -204,7 +204,7 @@ cn: defaultplugin nsClassname: com.netscape.management.client.topology.DefaultTopologyPlugin nsmerge: {nsclassname}MULTI_MERGE -dn: cn=UI,ou=%as_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot +dn: cn=UI,ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot cn: UI objectClass: top objectClass: nsAdminConsoleUser diff --git a/admserv/schema/ldif/10dsdata.ldif.tmpl b/admserv/schema/ldif/10dsdata.ldif.tmpl index a7bf00b..78c7120 100644 --- a/admserv/schema/ldif/10dsdata.ldif.tmpl +++ b/admserv/schema/ldif/10dsdata.ldif.tmpl @@ -17,6 +17,11 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # END COPYRIGHT BLOCK +dn: o=NetscapeRoot +changetype: modify +add: aci +aci: (targetattr = "*")(version 3.0; acl "SIE Group"; allow (all) groupdn = "ldap:///cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot";) + dn: cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot objectClass: nsApplication objectClass: groupOfUniqueNames diff --git a/configure b/configure index 1409339..113bd2f 100755 --- a/configure +++ b/configure @@ -465,10 +465,10 @@ ac_includes_default="\ # include #endif" -ac_default_prefix=/opt/@PACKAGE_BASE_NAME@ +ac_default_prefix=/opt/fedora-ds ac_subdirs_all="$ac_subdirs_all mod_admserv" ac_subdirs_all="$ac_subdirs_all mod_restartd" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS PACKAGE_BASE_NAME initdir HTTPD APXS PKG_CONFIG ICU_CONFIG nsspcache instconfigdir nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver icu_lib icu_libdir icu_inc icu_bin curses_lib instancename cgibindir cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf mimemagic httpduser httpdgroup logdir piddir pidfile admservport ldifdir admmoddir nssmoddir infdir perldir brand capbrand vendor WINNT_TRUE WINNT_FALSE APACHE22_TRUE APACHE22_FALSE subdirs MOD_ADMSERV_TRUE MOD_ADMSERV_FALSE MOD_RESTARTD_TRUE MOD_RESTARTD_FALSE LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS PACKAGE_BASE_NAME PACKAGE_BASE_VERSION initdir HTTPD APXS PKG_CONFIG ICU_CONFIG nsspcache instconfigdir nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver icu_lib icu_libdir icu_inc icu_bin curses_lib instancename cgibindir cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf mimemagic httpduser httpdgroup logdir piddir pidfile admservport ldifdir admmoddir nssmoddir infdir perldir brand capbrand vendor WINNT_TRUE WINNT_FALSE APACHE22_TRUE APACHE22_FALSE subdirs MOD_ADMSERV_TRUE MOD_ADMSERV_FALSE MOD_RESTARTD_TRUE MOD_RESTARTD_FALSE LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -3824,7 +3824,6 @@ do done done done -IFS=$as_save_IFS lt_ac_max=0 lt_ac_count=0 # Add /usr/xpg4/bin/sed as it is typically found on Solaris @@ -3859,7 +3858,6 @@ done fi SED=$lt_cv_path_SED - echo "$as_me:$LINENO: result: $SED" >&5 echo "${ECHO_T}$SED" >&6 @@ -4300,7 +4298,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4303 "configure"' > conftest.$ac_ext + echo '#line 4301 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5435,7 +5433,7 @@ fi # Provide some information about the compiler. -echo "$as_me:5438:" \ +echo "$as_me:5436:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -6498,11 +6496,11 @@ else -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:6501: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6499: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6505: \$? = $ac_status" >&5 + echo "$as_me:6503: \$? = $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. @@ -6766,11 +6764,11 @@ else -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:6769: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6767: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6773: \$? = $ac_status" >&5 + echo "$as_me:6771: \$? = $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. @@ -6870,11 +6868,11 @@ else -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:6873: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6871: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6877: \$? = $ac_status" >&5 + echo "$as_me:6875: \$? = $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 @@ -8335,31 +8333,10 @@ linux*) # before this can be enabled. hardcode_into_libs=yes - # find out which ABI we are using - libsuff= - case "$host_cpu" in - x86_64*|s390x*|powerpc64*) - echo '#line 8342 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.$ac_objext` in - *64-bit*) - libsuff=64 - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" - ;; - esac - fi - rm -rf conftest* - ;; - esac - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -9236,7 +9213,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:11656: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11686: \$? = $ac_status" >&5 + echo "$as_me:11660: \$? = $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. @@ -11783,11 +11757,11 @@ else -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:11786: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11760: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11790: \$? = $ac_status" >&5 + echo "$as_me:11764: \$? = $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 @@ -12315,31 +12289,10 @@ linux*) # before this can be enabled. hardcode_into_libs=yes - # find out which ABI we are using - libsuff= - case "$host_cpu" in - x86_64*|s390x*|powerpc64*) - echo '#line 12322 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.$ac_objext` in - *64-bit*) - libsuff=64 - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" - ;; - esac - fi - rm -rf conftest* - ;; - esac - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -12723,9 +12676,6 @@ CC=$lt_compiler_CXX # Is the compiler the GNU C compiler? with_gcc=$GCC_CXX -gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` -gcc_ver=\`gcc -dumpversion\` - # An ERE matcher. EGREP=$lt_EGREP @@ -12859,11 +12809,11 @@ striplib=$lt_striplib # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=\`echo $lt_predep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +predep_objects=$lt_predep_objects_CXX # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=\`echo $lt_postdep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +postdep_objects=$lt_postdep_objects_CXX # Dependencies to place before the objects being linked to create a # shared library. @@ -12875,7 +12825,7 @@ postdeps=$lt_postdeps_CXX # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +compiler_lib_search_path=$lt_compiler_lib_search_path_CXX # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -12955,7 +12905,7 @@ variables_saved_for_relink="$variables_saved_for_relink" link_all_deplibs=$link_all_deplibs_CXX # Compile-time system search path for libraries -sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -13377,11 +13327,11 @@ else -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:13380: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13330: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13384: \$? = $ac_status" >&5 + echo "$as_me:13334: \$? = $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. @@ -13481,11 +13431,11 @@ else -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:13484: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13434: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13488: \$? = $ac_status" >&5 + echo "$as_me:13438: \$? = $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 @@ -14926,31 +14876,10 @@ linux*) # before this can be enabled. hardcode_into_libs=yes - # find out which ABI we are using - libsuff= - case "$host_cpu" in - x86_64*|s390x*|powerpc64*) - echo '#line 14933 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.$ac_objext` in - *64-bit*) - libsuff=64 - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" - ;; - esac - fi - rm -rf conftest* - ;; - esac - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -15334,9 +15263,6 @@ CC=$lt_compiler_F77 # Is the compiler the GNU C compiler? with_gcc=$GCC_F77 -gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` -gcc_ver=\`gcc -dumpversion\` - # An ERE matcher. EGREP=$lt_EGREP @@ -15470,11 +15396,11 @@ striplib=$lt_striplib # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=\`echo $lt_predep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +predep_objects=$lt_predep_objects_F77 # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=\`echo $lt_postdep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +postdep_objects=$lt_postdep_objects_F77 # Dependencies to place before the objects being linked to create a # shared library. @@ -15486,7 +15412,7 @@ postdeps=$lt_postdeps_F77 # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +compiler_lib_search_path=$lt_compiler_lib_search_path_F77 # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -15566,7 +15492,7 @@ variables_saved_for_relink="$variables_saved_for_relink" link_all_deplibs=$link_all_deplibs_F77 # Compile-time system search path for libraries -sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -15708,11 +15634,11 @@ else -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:15711: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15637: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15715: \$? = $ac_status" >&5 + echo "$as_me:15641: \$? = $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. @@ -15976,11 +15902,11 @@ else -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:15979: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15905: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15983: \$? = $ac_status" >&5 + echo "$as_me:15909: \$? = $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. @@ -16080,11 +16006,11 @@ else -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:16083: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16009: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16087: \$? = $ac_status" >&5 + echo "$as_me:16013: \$? = $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 @@ -17545,31 +17471,10 @@ linux*) # before this can be enabled. hardcode_into_libs=yes - # find out which ABI we are using - libsuff= - case "$host_cpu" in - x86_64*|s390x*|powerpc64*) - echo '#line 17552 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.$ac_objext` in - *64-bit*) - libsuff=64 - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" - ;; - esac - fi - rm -rf conftest* - ;; - esac - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -17953,9 +17858,6 @@ CC=$lt_compiler_GCJ # Is the compiler the GNU C compiler? with_gcc=$GCC_GCJ -gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` -gcc_ver=\`gcc -dumpversion\` - # An ERE matcher. EGREP=$lt_EGREP @@ -18089,11 +17991,11 @@ striplib=$lt_striplib # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=\`echo $lt_predep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +predep_objects=$lt_predep_objects_GCJ # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=\`echo $lt_postdep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +postdep_objects=$lt_postdep_objects_GCJ # Dependencies to place before the objects being linked to create a # shared library. @@ -18105,7 +18007,7 @@ postdeps=$lt_postdeps_GCJ # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -18185,7 +18087,7 @@ variables_saved_for_relink="$variables_saved_for_relink" link_all_deplibs=$link_all_deplibs_GCJ # Compile-time system search path for libraries -sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -18437,9 +18339,6 @@ CC=$lt_compiler_RC # Is the compiler the GNU C compiler? with_gcc=$GCC_RC -gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` -gcc_ver=\`gcc -dumpversion\` - # An ERE matcher. EGREP=$lt_EGREP @@ -18573,11 +18472,11 @@ striplib=$lt_striplib # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=\`echo $lt_predep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +predep_objects=$lt_predep_objects_RC # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=\`echo $lt_postdep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +postdep_objects=$lt_postdep_objects_RC # Dependencies to place before the objects being linked to create a # shared library. @@ -18589,7 +18488,7 @@ postdeps=$lt_postdeps_RC # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +compiler_lib_search_path=$lt_compiler_lib_search_path_RC # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -18669,7 +18568,7 @@ variables_saved_for_relink="$variables_saved_for_relink" link_all_deplibs=$link_all_deplibs_RC # Compile-time system search path for libraries -sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -23234,6 +23133,9 @@ PACKAGE_BASE_NAME=`echo $PACKAGE_NAME | sed -e s/-admin//` # the default prefix - override with --prefix or --with-fhs or --with-fhs-opt +PACKAGE_BASE_VERSION=`echo $PACKAGE_VERSION | awk -F\. '{print $1"."$2}'` + + brand=fedora capbrand=Fedora vendor="Fedora Project" @@ -25533,7 +25435,6 @@ s,@ac_ct_CC@,$ac_ct_CC,;t t s,@CCDEPMODE@,$CCDEPMODE,;t t s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t -s,@SED@,$SED,;t t s,@EGREP@,$EGREP,;t t s,@LN_S@,$LN_S,;t t s,@ECHO@,$ECHO,;t t @@ -25549,6 +25450,7 @@ s,@ac_ct_F77@,$ac_ct_F77,;t t s,@LIBTOOL@,$LIBTOOL,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@PACKAGE_BASE_NAME@,$PACKAGE_BASE_NAME,;t t +s,@PACKAGE_BASE_VERSION@,$PACKAGE_BASE_VERSION,;t t s,@initdir@,$initdir,;t t s,@HTTPD@,$HTTPD,;t t s,@APXS@,$APXS,;t t diff --git a/configure.ac b/configure.ac index 68a85db..216f9f9 100644 --- a/configure.ac +++ b/configure.ac @@ -60,7 +60,10 @@ AC_CHECK_LIB([ncurses], [printw], [curses_lib=-lncurses], PACKAGE_BASE_NAME=`echo $PACKAGE_NAME | sed -e s/-admin//` 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@]) +AC_PREFIX_DEFAULT([/opt/fedora-ds]) + +PACKAGE_BASE_VERSION=`echo $PACKAGE_VERSION | awk -F\. '{print $1"."$2}'` +AC_SUBST(PACKAGE_BASE_VERSION) brand=fedora capbrand=Fedora