[Fedora-directory-commits] adminserver Makefile.am, 1.40, 1.41 configure.ac, 1.26, 1.27 aclocal.m4, 1.40, 1.41 configure, 1.44, 1.45 missing, 1.30, 1.31 install-sh, 1.30, 1.31 Makefile.in, 1.47, 1.48 depcomp, 1.30, 1.31 config.sub, 1.30, 1.31 config.guess, 1.30, 1.31 compile, 1.29, 1.30

[Doctor Conrad]

Author: rmeggins

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

Modified Files:
    Makefile.am configure.ac aclocal.m4 configure missing 
    install-sh Makefile.in depcomp config.sub config.guess compile 
Log Message:
bump version to 1.1.6

Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.am,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- Makefile.am	9 Jun 2008 15:57:12 -0000	1.40
+++ Makefile.am	14 Jul 2008 23:51:43 -0000	1.41
@@ -48,19 +48,15 @@

install-data-hook:
    @for file in $(RESOURCE_BUNDLES_ROOT) ; do \
-	  basefile=`basename $$file` ; \
-	  destdir=`dirname $$file` ; \
-	  progname=`basename $$destdir` ; \
-	  destfile=$$progname/$$basefile ; \
-	  echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) '$$file' '$(DESTDIR)$(propertydir)/$$destfile'"; \
-	  $(mkdir_p) "$(DESTDIR)$(propertydir)/$$progname" ; \
-	  cp "$$file" "$(DESTDIR)$(propertydir)/$$destfile" || exit 1; \
-	  cp "$$file" "$(DESTDIR)$(propertydir)/$$progname/en.res" || exit 1; \
-	  cp "$$file" "$(DESTDIR)$(propertydir)/$$progname/en_US.res" || exit 1; \
+	  progdir=`dirname $$file` ; \
+	  progname=`basename $$progdir` ; \
+	  destdir="$(DESTDIR)$(propertydir)/$$progname" ; \
+	  echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) '$$file' '$$destdir'" ; \
+	  test -d "$$destdir" || mkdir -p "$$destdir" || exit 1 ; \
+	  cp "$$file" "$$destdir" || exit 1 ; \
+	  cp "$$file" "$$destdir/en.res" || exit 1 ; \
+	  cp "$$file" "$$destdir/en_US.res" || exit 1 ; \
    done
-# the makefile creates this one, but there seems to be no way to tell it not
-# to, so we have to remove it before it causes problems
-	rm -f $(DESTDIR)$(propertydir)/root.res

cgibindir = $(libdir)@cgibindir@
 cmdbindir = $(sbindir)
@@ -97,8 +93,7 @@
 libbase_a_SOURCES = lib/base/file.cpp lib/base/nscperror.c \
    lib/base/system.cpp lib/base/nscputil.cpp

-libsi18n_a_SOURCES = lib/libsi18n/coreres.c lib/libsi18n/getlang.c \
-	lib/libsi18n/getstrprop.c lib/libsi18n/propset.c lib/libsi18n/reshash.c lib/libsi18n/txtfile.c
+libsi18n_a_SOURCES = lib/libsi18n/getstrprop.c

libadmin_a_SOURCES = lib/libadmin/cluster.c lib/libadmin/dllglue.c \
    lib/libadmin/error.c lib/libadmin/form_get.c lib/libadmin/httpcon.c lib/libadmin/install.c \
@@ -371,14 +366,14 @@
 # This bundle must be always distributed and there is no need to have
 # *_en.properties resource bundle source files.
 RESOURCE_BUNDLES_ROOT = \
-	admserv/cgi-src40/admpw/root.res \
-	admserv/cgi-src40/security/root.res admserv/cgi-src40/config/root.res \
-	admserv/cgi-src40/stopsrv/root.res \
-	admserv/cgi-src40/dsconfig/root.res admserv/cgi-src40/monreplication/root.res \
-	admserv/cgi-src40/ugdsconfig/root.res admserv/cgi-src40/htmladmin/root.res \
-	admserv/cgi-src40/restartsrv/root.res admserv/cgi-src40/viewdata/root.res \
-	admserv/cgi-src40/sec-activate/root.res \
-	admserv/cgi-src40/viewlog/root.res
+	properties/admpw/root.res \
+	properties/security/root.res properties/config/root.res \
+	properties/stopsrv/root.res \
+	properties/dsconfig/root.res properties/monreplication/root.res \
+	properties/ugdsconfig/root.res properties/htmladmin/root.res \
+	properties/restartsrv/root.res properties/viewdata/root.res \
+	properties/sec-activate/root.res properties/viewlog/root.res \
+	properties/cgicommon/root.res

MOSTLYCLEANFILES += $(RESOURCE_BUNDLES_ROOT)
 # ICU resource file installation is handled specially
@@ -396,6 +391,10 @@
 # German resource bundles (for the German localization in the future)
 #RESOURCE_BUNDLES_DE = foo_de.res

+properties/%/root.res : admserv/cgi-src40/%.properties
+	if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
+	$(ICU_GENRB) -s. -d$(dir $@) --encoding 8859-1 $* $+
+
 %/root.res : %.properties
    if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
    $(ICU_GENRB) -s. -d$(dir $@) --encoding 8859-1 $* $+

Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/adminserver/configure.ac,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- configure.ac	9 Jun 2008 15:57:12 -0000	1.26
+++ configure.ac	14 Jul 2008 23:51:43 -0000	1.27
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.

AC_PREREQ(2.59)
-AC_INIT([dirsrv-admin], [1.1.5], [http://bugzilla.redhat.com/])
+AC_INIT([dirsrv-admin], [1.1.6], [http://bugzilla.redhat.com/])
 AC_CONFIG_SRCDIR([admserv/cgi-src40/viewlog.c])
 AM_INIT_AUTOMAKE([1.9 foreign subdir-objects])
 AM_MAINTAINER_MODE

Index: configure
===================================================================
RCS file: /cvs/dirsec/adminserver/configure,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- configure	9 Jun 2008 15:57:12 -0000	1.44
+++ configure	14 Jul 2008 23:51:43 -0000	1.45
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for dirsrv-admin 1.1.5.
+# Generated by GNU Autoconf 2.59 for dirsrv-admin 1.1.6.
 #
 # Report bugs to http://bugzilla.redhat.com/.
 #
@@ -423,8 +423,8 @@
 # Identity of this package.
 PACKAGE_NAME='dirsrv-admin'
 PACKAGE_TARNAME='dirsrv-admin'
-PACKAGE_VERSION='1.1.5'
-PACKAGE_STRING='dirsrv-admin 1.1.5'
+PACKAGE_VERSION='1.1.6'
+PACKAGE_STRING='dirsrv-admin 1.1.6'
 PACKAGE_BUGREPORT='http://bugzilla.redhat.com/'

ac_unique_file="admserv/cgi-src40/viewlog.c"
@@ -957,7 +957,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-`configure' configures dirsrv-admin 1.1.5 to adapt to many kinds of systems.
+`configure' configures dirsrv-admin 1.1.6 to adapt to many kinds of systems.

Usage: $0 [OPTION]... [VAR=VALUE]...

@@ -1023,7 +1023,7 @@

if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dirsrv-admin 1.1.5:";;
+     short | recursive ) echo "Configuration of dirsrv-admin 1.1.6:";;
    esac
   cat <<_ACEOF

@@ -1202,7 +1202,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<_ACEOF
-dirsrv-admin configure 1.1.5
+dirsrv-admin configure 1.1.6
 generated by GNU Autoconf 2.59

Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1216,7 +1216,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.

-It was created by dirsrv-admin $as_me 1.1.5, which was
+It was created by dirsrv-admin $as_me 1.1.6, which was
 generated by GNU Autoconf 2.59.  Invocation command line was

$ $0 $@
@@ -1860,7 +1860,7 @@

# Define the identity of the package.
  PACKAGE='dirsrv-admin'
- VERSION='1.1.5'
+ VERSION='1.1.6'

cat >>confdefs.h <<_ACEOF
@@ -25613,7 +25613,7 @@
 } >&5
 cat >&5 <<_CSEOF

-This file was extended by dirsrv-admin $as_me 1.1.5, which was
+This file was extended by dirsrv-admin $as_me 1.1.6, which was
 generated by GNU Autoconf 2.59.  Invocation command line was

CONFIG_FILES    = $CONFIG_FILES
@@ -25676,7 +25676,7 @@

cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\
-dirsrv-admin config.status 1.1.5
+dirsrv-admin config.status 1.1.6
 configured by $0, generated by GNU Autoconf 2.59,
   with options \"`echo "$ac_configure_args" | sed 's/[\""`$]/\\&/g'`\"

Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.in,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- Makefile.in	9 Jun 2008 15:57:12 -0000	1.47
+++ Makefile.in	14 Jul 2008 23:51:43 -0000	1.48
@@ -104,9 +104,7 @@
 libds_admin_serv_la_LIBADD =
 am__objects_1 = lib/base/file.lo lib/base/nscperror.lo \
    lib/base/system.lo lib/base/nscputil.lo
-am__objects_2 = lib/libsi18n/coreres.lo lib/libsi18n/getlang.lo \
-	lib/libsi18n/getstrprop.lo lib/libsi18n/propset.lo \
-	lib/libsi18n/reshash.lo lib/libsi18n/txtfile.lo
+am__objects_2 = lib/libsi18n/getstrprop.lo
 am__objects_3 = lib/libadmin/cluster.lo lib/libadmin/dllglue.lo \
    lib/libadmin/error.lo lib/libadmin/form_get.lo \
    lib/libadmin/httpcon.lo lib/libadmin/install.lo \
@@ -506,9 +504,7 @@
 libbase_a_SOURCES = lib/base/file.cpp lib/base/nscperror.c \
    lib/base/system.cpp lib/base/nscputil.cpp

-libsi18n_a_SOURCES = lib/libsi18n/coreres.c lib/libsi18n/getlang.c \
-	lib/libsi18n/getstrprop.c lib/libsi18n/propset.c lib/libsi18n/reshash.c lib/libsi18n/txtfile.c
-
+libsi18n_a_SOURCES = lib/libsi18n/getstrprop.c 
 libadmin_a_SOURCES = lib/libadmin/cluster.c lib/libadmin/dllglue.c \
    lib/libadmin/error.c lib/libadmin/form_get.c lib/libadmin/httpcon.c lib/libadmin/install.c \
    lib/libadmin/referer.c lib/libadmin/template.c lib/libadmin/util.c
@@ -741,14 +737,14 @@
 # This bundle must be always distributed and there is no need to have
 # *_en.properties resource bundle source files.
 RESOURCE_BUNDLES_ROOT = \
-	admserv/cgi-src40/admpw/root.res \
-	admserv/cgi-src40/security/root.res admserv/cgi-src40/config/root.res \
-	admserv/cgi-src40/stopsrv/root.res \
-	admserv/cgi-src40/dsconfig/root.res admserv/cgi-src40/monreplication/root.res \
-	admserv/cgi-src40/ugdsconfig/root.res admserv/cgi-src40/htmladmin/root.res \
-	admserv/cgi-src40/restartsrv/root.res admserv/cgi-src40/viewdata/root.res \
-	admserv/cgi-src40/sec-activate/root.res \
-	admserv/cgi-src40/viewlog/root.res
+	properties/admpw/root.res \
+	properties/security/root.res properties/config/root.res \
+	properties/stopsrv/root.res \
+	properties/dsconfig/root.res properties/monreplication/root.res \
+	properties/ugdsconfig/root.res properties/htmladmin/root.res \
+	properties/restartsrv/root.res properties/viewdata/root.res \
+	properties/sec-activate/root.res properties/viewlog/root.res \
+	properties/cgicommon/root.res

# ICU resource file installation is handled specially
 nodist_property_DATA = $(RESOURCE_BUNDLES_ROOT)
@@ -1006,18 +1002,8 @@
 lib/libsi18n/$(DEPDIR)/$(am__dirstamp):
    @$(mkdir_p) lib/libsi18n/$(DEPDIR)
    @: > lib/libsi18n/$(DEPDIR)/$(am__dirstamp)
-lib/libsi18n/coreres.lo: lib/libsi18n/$(am__dirstamp) \
-	lib/libsi18n/$(DEPDIR)/$(am__dirstamp)
-lib/libsi18n/getlang.lo: lib/libsi18n/$(am__dirstamp) \
-	lib/libsi18n/$(DEPDIR)/$(am__dirstamp)
 lib/libsi18n/getstrprop.lo: lib/libsi18n/$(am__dirstamp) \
    lib/libsi18n/$(DEPDIR)/$(am__dirstamp)
-lib/libsi18n/propset.lo: lib/libsi18n/$(am__dirstamp) \
-	lib/libsi18n/$(DEPDIR)/$(am__dirstamp)
-lib/libsi18n/reshash.lo: lib/libsi18n/$(am__dirstamp) \
-	lib/libsi18n/$(DEPDIR)/$(am__dirstamp)
-lib/libsi18n/txtfile.lo: lib/libsi18n/$(am__dirstamp) \
-	lib/libsi18n/$(DEPDIR)/$(am__dirstamp)
 lib/libadmin/$(am__dirstamp):
    @$(mkdir_p) lib/libadmin
    @: > lib/libadmin/$(am__dirstamp)
@@ -1375,18 +1361,8 @@
    -rm -f lib/libdsa/libdsa_a-dsalib_tailf.$(OBJEXT)
    -rm -f lib/libdsa/libdsa_a-dsalib_updown.$(OBJEXT)
    -rm -f lib/libdsa/libdsa_a-dsalib_util.$(OBJEXT)
-	-rm -f lib/libsi18n/coreres.$(OBJEXT)
-	-rm -f lib/libsi18n/coreres.lo
-	-rm -f lib/libsi18n/getlang.$(OBJEXT)
-	-rm -f lib/libsi18n/getlang.lo
    -rm -f lib/libsi18n/getstrprop.$(OBJEXT)
    -rm -f lib/libsi18n/getstrprop.lo
-	-rm -f lib/libsi18n/propset.$(OBJEXT)
-	-rm -f lib/libsi18n/propset.lo
-	-rm -f lib/libsi18n/reshash.$(OBJEXT)
-	-rm -f lib/libsi18n/reshash.lo
-	-rm -f lib/libsi18n/txtfile.$(OBJEXT)
-	-rm -f lib/libsi18n/txtfile.lo

distclean-compile:
    -rm -f *.tab.c
@@ -1440,12 +1416,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_tailf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_updown.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/libdsa/$(DEPDIR)/libdsa_a-dsalib_util.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@lib/libsi18n/$(DEPDIR)/coreres.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@lib/libsi18n/$(DEPDIR)/getlang.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lib/libsi18n/$(DEPDIR)/getstrprop.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@lib/libsi18n/$(DEPDIR)/propset.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@lib/libsi18n/$(DEPDIR)/reshash.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@lib/libsi18n/$(DEPDIR)/txtfile.Plo@am__quote@

.c.o:
 @am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|.o$$||'`; \
@@ -2359,19 +2330,15 @@

install-data-hook:
    @for file in $(RESOURCE_BUNDLES_ROOT) ; do \
-	  basefile=`basename $$file` ; \
-	  destdir=`dirname $$file` ; \
-	  progname=`basename $$destdir` ; \
-	  destfile=$$progname/$$basefile ; \
-	  echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) '$$file' '$(DESTDIR)$(propertydir)/$$destfile'"; \
-	  $(mkdir_p) "$(DESTDIR)$(propertydir)/$$progname" ; \
-	  cp "$$file" "$(DESTDIR)$(propertydir)/$$destfile" || exit 1; \
-	  cp "$$file" "$(DESTDIR)$(propertydir)/$$progname/en.res" || exit 1; \
-	  cp "$$file" "$(DESTDIR)$(propertydir)/$$progname/en_US.res" || exit 1; \
-	done
-# the makefile creates this one, but there seems to be no way to tell it not
-# to, so we have to remove it before it causes problems
-	rm -f $(DESTDIR)$(propertydir)/root.res
+	  progdir=`dirname $$file` ; \
+	  progname=`basename $$progdir` ; \
+	  destdir="$(DESTDIR)$(propertydir)/$$progname" ; \
+	  echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) '$$file' '$$destdir'" ; \
+	  test -d "$$destdir" || mkdir -p "$$destdir" || exit 1 ; \
+	  cp "$$file" "$$destdir" || exit 1 ; \
+	  cp "$$file" "$$destdir/en.res" || exit 1 ; \
+	  cp "$$file" "$$destdir/en_US.res" || exit 1 ; \
+	done

# French resource bundles (for the French localization in the future)
 #RESOURCE_BUNDLES_FR = foo_fr.res
@@ -2379,6 +2346,10 @@
 # German resource bundles (for the German localization in the future)
 #RESOURCE_BUNDLES_DE = foo_de.res

+properties/%/root.res : admserv/cgi-src40/%.properties
+	if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
+	$(ICU_GENRB) -s. -d$(dir $@) --encoding 8859-1 $* $+
+
 %/root.res : %.properties
    if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
    $(ICU_GENRB) -s. -d$(dir $@) --encoding 8859-1 $* $+