[Fedora-directory-commits] dsgw Makefile.am, 1.14, 1.15 Makefile.in, 1.15, 1.16
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsgw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20908
Modified Files:
Makefile.am Makefile.in
Log Message:
added perlpath for bundled installs
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/dsgw/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Makefile.am 31 Jan 2008 22:48:17 -0000 1.14
+++ Makefile.am 31 Jan 2008 23:53:34 -0000 1.15
@@ -35,12 +35,19 @@
securitydir=$(instconfigdir)@securitydir@
# relative to $localstatedir
cookiedir=$(localstatedir)@cookiedir@
-perldir = $(libdir)@perldir@
manualdir = $(datadir)@manualdir@
manualsubdir = @manualsubdir@
gwinfodir = $(manualdir)/en/$(manualsubdir)/info
# this is the directory where the manuals will actually be installed
maninstdir = $(manualdir)/en/$(manualsubdir)
+perldir = $(libdir)@perldir@
+
+# for a bundle, all of the components will be under libdir (e.g. prefix/lib)
+if BUNDLE
+perlpath=$(perldir) $(libdir)/perl/arch $(libdir)/perl
+else
+perlpath=$(perldir)
+endif
DSGW_VER_STR := "Directory-Server-Gateway/$(PACKAGE_VERSION)"
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/dsgw/Makefile.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile.in 31 Jan 2008 22:48:17 -0000 1.15
+++ Makefile.in 31 Jan 2008 23:53:34 -0000 1.16
@@ -393,6 +393,10 @@
gwinfodir = $(manualdir)/en/$(manualsubdir)/info
# this is the directory where the manuals will actually be installed
maninstdir = $(manualdir)/en/$(manualsubdir)
+@BUNDLE_FALSE@perlpath = $(perldir)
+
+# for a bundle, all of the components will be under libdir (e.g. prefix/lib)
+@BUNDLE_TRUE@perlpath = $(perldir) $(libdir)/perl/arch $(libdir)/perl
DSGW_VER_STR := "Directory-Server-Gateway/$(PACKAGE_VERSION)"
AM_CPPFLAGS = -DDSGW_VER_STR=\"$(DSGW_VER_STR)\" $(DEBUG_DEFINES) \
@adminutil_inc@ @icu_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@ \
16 years, 1 month
[Fedora-directory-commits] dsgw setup-ds-dsgw.in,1.3,1.4
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsgw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20864
Modified Files:
setup-ds-dsgw.in
Log Message:
attributes in LDIF may be in mixed case - sed cannot portably do case insensitive matching - just use a simple sed search and replace for ldif attributes
Index: setup-ds-dsgw.in
===================================================================
RCS file: /cvs/dirsec/dsgw/setup-ds-dsgw.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- setup-ds-dsgw.in 31 Jan 2008 21:43:36 -0000 1.3
+++ setup-ds-dsgw.in 31 Jan 2008 23:51:47 -0000 1.4
@@ -33,22 +33,22 @@
getValFromInf() {
cattr=$1
cfile=$2
- rval=`grep -i ^$cattr $cfile | head -1 | sed -e "s/^$cattr[ ]*=[ ]*//"`
+ rval=`grep ^$cattr $cfile | head -1 | sed -e "s/^$cattr[ ]*=[ ]*//"`
echo $rval
}
getValFromConf() {
cattr=$1
cfile=$2
- rval=`grep -i ^$cattr $cfile | head -1 | sed -e "s/^$cattr[ ]*//"`
+ rval=`grep ^$cattr $cfile | head -1 | sed -e "s/^$cattr[ ]*//"`
echo $rval
}
getValFromLdif() {
cattr=$1
cfile=$2
- num=${3:-1}
- rval=`grep -i ^$cattr: $cfile | head -$num | sed -e "s/^$cattr:[ ]*//"`
+ num=${3:-1}
+ rval=`grep -i ^$cattr: $cfile | head -$num | sed -e "s/^..*:[ ]*//"`
echo $rval
}
@@ -76,8 +76,8 @@
httpurl="http://$host:$port"
fi
httpdconf=$admservdir/httpd.conf
- dsgwuser=`ls -l $admservdir/local.conf | awk '{print $3}'`
- dsgwgroup=`ls -l $admservdir/local.conf | awk '{print $4}'`
+ dsgwuser=`ls -l $admservdir/local.conf | awk '{print $3}'`
+ dsgwgroup=`ls -l $admservdir/local.conf | awk '{print $4}'`
fi
# see if there are any directory servers here
16 years, 1 month
[Fedora-directory-commits] dsgw Makefile.am, 1.13, 1.14 aclocal.m4, 1.11, 1.12 configure, 1.14, 1.15 missing, 1.10, 1.11 install-sh, 1.10, 1.11 Makefile.in, 1.14, 1.15 depcomp, 1.10, 1.11 config.sub, 1.10, 1.11 config.guess, 1.10, 1.11 compile, 1.10, 1.11
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsgw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11649/dsgw
Modified Files:
Makefile.am aclocal.m4 configure missing install-sh
Makefile.in depcomp config.sub config.guess compile
Log Message:
add pthread lib for HP-UX
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/dsgw/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makefile.am 31 Jan 2008 21:43:36 -0000 1.13
+++ Makefile.am 31 Jan 2008 22:48:17 -0000 1.14
@@ -69,6 +69,11 @@
noinst_PROGRAMS = propmaker
+# We need to make sure that libpthread is linked before libc on HP-UX.
+if HPUX
+AM_LDFLAGS = -lpthread
+endif
+
# this is just a dummy to make automake define
# the CXXLINK macro
if CXXLINK_REQUIRED
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/dsgw/Makefile.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Makefile.in 31 Jan 2008 21:43:36 -0000 1.14
+++ Makefile.in 31 Jan 2008 22:48:17 -0000 1.15
@@ -404,6 +404,9 @@
-DINSTCONFIGDIR=\"$(instconfigdir)\" \
-DMANUALDIR=\"$(manualdir)\" -DCGIURIBASE=\"$(cgiuri)\" \
-DMANUALSUBDIR=\"$(manualsubdir)\" -DINFODIR=\"$(gwinfodir)\"
+
+# We need to make sure that libpthread is linked before libc on HP-UX.
+@HPUX_TRUE@AM_LDFLAGS = -lpthread
@CXXLINK_REQUIRED_TRUE@dummy_SOURCES = dummy.cpp
@CXXLINK_REQUIRED_TRUE@dummy_LINK = $(CXXLINK)
@CXXLINK_REQUIRED_FALSE@MYLINK = $(LINK)
16 years, 1 month
[Fedora-directory-commits] dsgw Makefile.am, 1.12, 1.13 setup-ds-dsgw.in, 1.2, 1.3 aclocal.m4, 1.10, 1.11 configure, 1.13, 1.14 missing, 1.9, 1.10 install-sh, 1.9, 1.10 Makefile.in, 1.13, 1.14 depcomp, 1.9, 1.10 config.sub, 1.9, 1.10 config.guess, 1.9, 1.10 compile, 1.9, 1.10
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsgw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32675/dsgw
Modified Files:
Makefile.am setup-ds-dsgw.in aclocal.m4 configure missing
install-sh Makefile.in depcomp config.sub config.guess compile
Log Message:
enhance setup - move to sbin, check for already configured, add reconfig option to force reconfig, add support for users and groups
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/dsgw/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Makefile.am 30 Jan 2008 17:47:50 -0000 1.12
+++ Makefile.am 31 Jan 2008 21:43:36 -0000 1.13
@@ -223,7 +223,7 @@
dist_gwinfo_DATA = html/info/infonav.html
nodist_context_DATA = dsgw-httpd.conf
-nodist_bin_SCRIPTS = setup-ds-dsgw
+nodist_sbin_SCRIPTS = setup-ds-dsgw
# add more here for localized bundles
nodist_property_DATA = root.res en.res en_US.res
Index: setup-ds-dsgw.in
===================================================================
RCS file: /cvs/dirsec/dsgw/setup-ds-dsgw.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- setup-ds-dsgw.in 31 Jan 2008 20:31:59 -0000 1.2
+++ setup-ds-dsgw.in 31 Jan 2008 21:43:36 -0000 1.3
@@ -76,6 +76,8 @@
httpurl="http://$host:$port"
fi
httpdconf=$admservdir/httpd.conf
+ dsgwuser=`ls -l $admservdir/local.conf | awk '{print $3}'`
+ dsgwgroup=`ls -l $admservdir/local.conf | awk '{print $4}'`
fi
# see if there are any directory servers here
@@ -98,14 +100,18 @@
port=`getValFromLdif nsslapd-port "$dir/dse.ldif"`
ldapurl="ldap://$host:$port"
fi
- # get suffix
- grep ^nsslapd-suffix: $dir/dse.ldif | sed -e 's/^nsslapd-suffix:[ ]*//' | while read suffix ; do
- case "$suffix" in
- *netscaperoot) ;;
- *NetscapeRoot) ;;
- *) break ;; # find the first non-netscaperoot suffix
- esac
- done
+ # get suffix - first non-netscaperoot suffix
+ savesuffix="$suffix"
+ suffix=`grep ^nsslapd-suffix: $dir/dse.ldif | sed -e 's/^nsslapd-suffix:[ ]*//' | grep -v -i o=netscaperoot | head -1`
+ if [ -z "$suffix" ] ; then
+ suffix="$savesuffix"
+ fi
+ if [ -z "$dsgwuser" ] ; then
+ dsgwuser=`ls -l $dir/dse.ldif | awk '{print $3}'`
+ fi
+ if [ -z "$dsgwgroup" ] ; then
+ dsgwgroup=`ls -l $dir/dse.ldif | awk '{print $4}'`
+ fi
fi
done
@@ -122,6 +128,8 @@
silent=1
elif [ "$arg" = "-k" ]; then
keepinffile=1
+ elif [ "$arg" = "-r" ]; then
+ reconfig=1
elif [ "$arg" = "-f" ]; then
nextisinffile=1
elif [ $nextisinffile ]; then
@@ -140,9 +148,33 @@
httpport=`getValFromInf Port $inffile`
httpurl="http://$host:$httpport"
ldapurl="ldap://$host:$port"
+ infuser=`getValFromInf SysUser $inffile`
+ infgroup=`getValFromInf SysGroup $inffile`
+ if [ -z "$infuser" ] ; then
+ infuser=`getValFromInf SuiteSpotUserID $inffile`
+ fi
+ if [ -z "$infgroup" ] ; then
+ infgroup=`getValFromInf SuiteSpotGroup $inffile`
+ fi
+ if [ -n "$infuser" ] ; then
+ dsgwuser="$infuser"
+ fi
+ if [ -n "$infgroup" ] ; then
+ dsgwgroup="$infgroup"
+ fi
+fi
+
+if [ -z "$reconfig" -a -f $dsgwconfigdir/dsgw.conf ] ; then
+ echo The Directory Server Gateway has already been configured. The
+ echo file $dsgwconfigdir/dsgw.conf
+ echo exists already. If you want to force a reconfiguration, removing
+ echo your existing configuration and recreating it, run this script
+ echo again with the "-r" argument.
+ exit 1
fi
# generate dsgw.conf and pb.conf and default.conf in the $dsgwconfigdir directory
+rm -f $dsgwconfigdir/dsgw.conf
sed -e "s#@host@#$hostname#g" \
-e "s#@port@#$port#g" \
-e "s#@httpport@#$httpport#g" \
@@ -153,6 +185,10 @@
-e "s#@httpurl@#$httpurl#g" \
@configdir(a)/dsgw.tmpl > $dsgwconfigdir/dsgw.conf
+chown $dsgwuser:$dsgwgroup $dsgwconfigdir/dsgw.conf
+chmod 0400 $dsgwconfigdir/dsgw.conf
+
+rm -f $dsgwconfigdir/pb.conf
sed -e "s#@host@#$hostname#g" \
-e "s#@port@#$port#g" \
-e "s#@httpport@#$httpport#g" \
@@ -163,6 +199,10 @@
-e "s#@httpurl@#$httpurl#g" \
@pbconfigdir(a)/pb.tmpl > $dsgwconfigdir/pb.conf
+chown $dsgwuser:$dsgwgroup $dsgwconfigdir/pb.conf
+chmod 0400 $dsgwconfigdir/pb.conf
+
+rm -f $dsgwconfigdir/orgchart.conf
sed -e "s#@host@#$hostname#g" \
-e "s#@port@#$port#g" \
-e "s#@httpport@#$httpport#g" \
@@ -173,8 +213,14 @@
-e "s#@httpurl@#$httpurl#g" \
@orghtmldir(a)/orgchart.tmpl > $dsgwconfigdir/orgchart.conf
+chown $dsgwuser:$dsgwgroup $dsgwconfigdir/orgchart.conf
+chmod 0400 $dsgwconfigdir/orgchart.conf
+
# the default.conf is just a copy of dsgw.conf
+rm -f $dsgwconfigdir/default.conf
cp $dsgwconfigdir/dsgw.conf $dsgwconfigdir/default.conf
+chown $dsgwuser:$dsgwgroup $dsgwconfigdir/default.conf
+chmod 0400 $dsgwconfigdir/default.conf
# tell Apache about the dsgw - must restart Apache
grep dsgw-httpd.conf "$httpdconf" > /dev/null 2>&1 || (echo "" ; echo "# DSGW configuration" ; echo "Include $dsgwconfigdir/dsgw-httpd.conf") >> $httpdconf
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/dsgw/Makefile.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makefile.in 31 Jan 2008 03:14:44 -0000 1.13
+++ Makefile.in 31 Jan 2008 21:43:36 -0000 1.14
@@ -92,7 +92,7 @@
am__EXEEXT_1 = unauth$(EXEEXT) search$(EXEEXT) csearch$(EXEEXT) \
newentry$(EXEEXT) tutor$(EXEEXT) lang$(EXEEXT)
am__installdirs = "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cgibindir)" \
- "$(DESTDIR)$(bindir)" "$(DESTDIR)$(configdir)" \
+ "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(configdir)" \
"$(DESTDIR)$(gwinfodir)" "$(DESTDIR)$(htmldir)" \
"$(DESTDIR)$(maninstdir)" "$(DESTDIR)$(orghtmldir)" \
"$(DESTDIR)$(pbconfigdir)" "$(DESTDIR)$(pbhtmldir)" \
@@ -154,8 +154,8 @@
unauth_OBJECTS = $(am_unauth_OBJECTS)
unauth_LDADD = $(LDADD)
cgibinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
-nodist_binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
-SCRIPTS = $(cgibin_SCRIPTS) $(nodist_bin_SCRIPTS)
+nodist_sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(cgibin_SCRIPTS) $(nodist_sbin_SCRIPTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -535,7 +535,7 @@
dist_gwinfo_DATA = html/info/infonav.html
nodist_context_DATA = dsgw-httpd.conf
-nodist_bin_SCRIPTS = setup-ds-dsgw
+nodist_sbin_SCRIPTS = setup-ds-dsgw
# add more here for localized bundles
nodist_property_DATA = root.res en.res en_US.res
@@ -745,24 +745,24 @@
echo " rm -f '$(DESTDIR)$(cgibindir)/$$f'"; \
rm -f "$(DESTDIR)$(cgibindir)/$$f"; \
done
-install-nodist_binSCRIPTS: $(nodist_bin_SCRIPTS)
+install-nodist_sbinSCRIPTS: $(nodist_sbin_SCRIPTS)
@$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
- @list='$(nodist_bin_SCRIPTS)'; for p in $$list; do \
+ test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)"
+ @list='$(nodist_sbin_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
- echo " $(nodist_binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
- $(nodist_binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
+ echo " $(nodist_sbinSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
+ $(nodist_sbinSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(sbindir)/$$f"; \
else :; fi; \
done
-uninstall-nodist_binSCRIPTS:
+uninstall-nodist_sbinSCRIPTS:
@$(NORMAL_UNINSTALL)
- @list='$(nodist_bin_SCRIPTS)'; for p in $$list; do \
+ @list='$(nodist_sbin_SCRIPTS)'; for p in $$list; do \
f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
- rm -f "$(DESTDIR)$(bindir)/$$f"; \
+ echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \
+ rm -f "$(DESTDIR)$(sbindir)/$$f"; \
done
mostlyclean-compile:
@@ -1193,7 +1193,7 @@
check: check-am
all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) config.h
installdirs:
- for dir in "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(gwinfodir)" "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(maninstdir)" "$(DESTDIR)$(orghtmldir)" "$(DESTDIR)$(pbconfigdir)" "$(DESTDIR)$(pbhtmldir)" "$(DESTDIR)$(contextdir)" "$(DESTDIR)$(propertydir)"; do \
+ for dir in "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(gwinfodir)" "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(maninstdir)" "$(DESTDIR)$(orghtmldir)" "$(DESTDIR)$(pbconfigdir)" "$(DESTDIR)$(pbhtmldir)" "$(DESTDIR)$(contextdir)" "$(DESTDIR)$(propertydir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
@@ -1250,7 +1250,7 @@
install-dist_pbhtmlDATA install-nodist_contextDATA \
install-nodist_propertyDATA
-install-exec-am: install-nodist_binSCRIPTS
+install-exec-am: install-nodist_sbinSCRIPTS
install-info: install-info-am
@@ -1283,8 +1283,8 @@
uninstall-dist_htmlDATA uninstall-dist_maninstDATA \
uninstall-dist_orghtmlDATA uninstall-dist_pbconfigDATA \
uninstall-dist_pbhtmlDATA uninstall-info-am \
- uninstall-nodist_binSCRIPTS uninstall-nodist_contextDATA \
- uninstall-nodist_propertyDATA
+ uninstall-nodist_contextDATA uninstall-nodist_propertyDATA \
+ uninstall-nodist_sbinSCRIPTS
.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
clean-cgibinPROGRAMS clean-generic clean-libtool \
@@ -1300,8 +1300,8 @@
install-dist_orghtmlDATA install-dist_pbconfigDATA \
install-dist_pbhtmlDATA install-exec install-exec-am \
install-info install-info-am install-man \
- install-nodist_binSCRIPTS install-nodist_contextDATA \
- install-nodist_propertyDATA install-strip installcheck \
+ install-nodist_contextDATA install-nodist_propertyDATA \
+ install-nodist_sbinSCRIPTS install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
@@ -1310,8 +1310,8 @@
uninstall-dist_gwinfoDATA uninstall-dist_htmlDATA \
uninstall-dist_maninstDATA uninstall-dist_orghtmlDATA \
uninstall-dist_pbconfigDATA uninstall-dist_pbhtmlDATA \
- uninstall-info-am uninstall-nodist_binSCRIPTS \
- uninstall-nodist_contextDATA uninstall-nodist_propertyDATA
+ uninstall-info-am uninstall-nodist_contextDATA \
+ uninstall-nodist_propertyDATA uninstall-nodist_sbinSCRIPTS
# By default create only the default root bundle (english).
16 years, 1 month
[Fedora-directory-commits] dsgw setup-ds-dsgw.in,1.1,1.2
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsgw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19979
Modified Files:
setup-ds-dsgw.in
Log Message:
better method of choosing suffix
Index: setup-ds-dsgw.in
===================================================================
RCS file: /cvs/dirsec/dsgw/setup-ds-dsgw.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- setup-ds-dsgw.in 30 Jan 2008 02:22:46 -0000 1.1
+++ setup-ds-dsgw.in 31 Jan 2008 20:31:59 -0000 1.2
@@ -99,9 +99,8 @@
ldapurl="ldap://$host:$port"
fi
# get suffix
- suffixlist="`getValFromLdif nsslapd-suffix $dir/dse.ldif 2`"
- for suffix in $suffixlist ; do
- case $suffix in
+ grep ^nsslapd-suffix: $dir/dse.ldif | sed -e 's/^nsslapd-suffix:[ ]*//' | while read suffix ; do
+ case "$suffix" in
*netscaperoot) ;;
*NetscapeRoot) ;;
*) break ;; # find the first non-netscaperoot suffix
16 years, 1 month
[Fedora-directory-commits] dsgw configure.ac, 1.8, 1.9 aclocal.m4, 1.9, 1.10 configure, 1.12, 1.13 missing, 1.8, 1.9 install-sh, 1.8, 1.9 config.h.in, 1.3, 1.4 Makefile.in, 1.12, 1.13 depcomp, 1.8, 1.9 config.sub, 1.8, 1.9 config.guess, 1.8, 1.9 compile, 1.8, 1.9
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsgw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27707
Modified Files:
configure.ac aclocal.m4 configure missing install-sh
config.h.in Makefile.in depcomp config.sub config.guess
compile
Log Message:
do not check for GNU compatible realloc
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/dsgw/configure.ac,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- configure.ac 30 Jan 2008 17:16:45 -0000 1.8
+++ configure.ac 31 Jan 2008 03:14:44 -0000 1.9
@@ -52,7 +52,6 @@
# Checks for library functions.
AC_FUNC_MALLOC
AC_FUNC_MEMCMP
-AC_FUNC_REALLOC
AC_FUNC_SELECT_ARGTYPES
AC_FUNC_STAT
AC_FUNC_STRTOD
Index: configure
===================================================================
RCS file: /cvs/dirsec/dsgw/configure,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- configure 30 Jan 2008 17:47:50 -0000 1.12
+++ configure 31 Jan 2008 03:14:44 -0000 1.13
@@ -19879,237 +19879,6 @@
-for ac_header in stdlib.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to http://bugzilla.redhat.com/ ##
-## ------------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-echo "$as_me:$LINENO: checking for GNU libc compatible realloc" >&5
-echo $ECHO_N "checking for GNU libc compatible realloc... $ECHO_C" >&6
-if test "${ac_cv_func_realloc_0_nonnull+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "$cross_compiling" = yes; then
- ac_cv_func_realloc_0_nonnull=no
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#if STDC_HEADERS || HAVE_STDLIB_H
-# include <stdlib.h>
-#else
-char *realloc ();
-#endif
-
-int
-main ()
-{
-exit (realloc (0, 0) ? 0 : 1);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_func_realloc_0_nonnull=yes
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_realloc_0_nonnull=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_realloc_0_nonnull" >&5
-echo "${ECHO_T}$ac_cv_func_realloc_0_nonnull" >&6
-if test $ac_cv_func_realloc_0_nonnull = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_REALLOC 1
-_ACEOF
-
-else
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_REALLOC 0
-_ACEOF
-
- case $LIBOBJS in
- "realloc.$ac_objext" | \
- *" realloc.$ac_objext" | \
- "realloc.$ac_objext "* | \
- *" realloc.$ac_objext "* ) ;;
- *) LIBOBJS="$LIBOBJS realloc.$ac_objext" ;;
-esac
-
-
-cat >>confdefs.h <<\_ACEOF
-#define realloc rpl_realloc
-_ACEOF
-
-fi
-
-
-
-
for ac_header in sys/select.h sys/socket.h
do
Index: config.h.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config.h.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config.h.in 30 Jan 2008 17:16:45 -0000 1.3
+++ config.h.in 31 Jan 2008 03:14:44 -0000 1.4
@@ -52,10 +52,6 @@
/* Define to 1 if you have the `memset' function. */
#undef HAVE_MEMSET
-/* Define to 1 if your system has a GNU libc compatible `realloc' function,
- and to 0 otherwise. */
-#undef HAVE_REALLOC
-
/* Define to 1 if you have the `select' function. */
#undef HAVE_SELECT
@@ -250,9 +246,6 @@
/* Define to rpl_malloc if the replacement function should be used. */
#undef malloc
-/* Define to rpl_realloc if the replacement function should be used. */
-#undef realloc
-
/* Define to `unsigned' if <sys/types.h> does not define. */
#undef size_t
16 years, 1 month
[Fedora-directory-commits] dsgw dsgw.h,1.5,1.6
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsgw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23897
Modified Files:
dsgw.h
Log Message:
include config.h in dsgw.h so all of the dsgw code will include it
Index: dsgw.h
===================================================================
RCS file: /cvs/dirsec/dsgw/dsgw.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dsgw.h 16 Jan 2008 22:56:02 -0000 1.5
+++ dsgw.h 31 Jan 2008 03:03:33 -0000 1.6
@@ -39,6 +39,10 @@
* dsgw.h -- defines for HTTP gateway
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
16 years, 1 month
[Fedora-directory-commits] dsgw dummy.cpp, NONE, 1.1 Makefile.am, 1.11, 1.12 aclocal.m4, 1.8, 1.9 configure, 1.11, 1.12 missing, 1.7, 1.8 install-sh, 1.7, 1.8 depcomp, 1.7, 1.8 compile, 1.7, 1.8 Makefile.in, 1.11, 1.12 config.sub, 1.7, 1.8 config.guess, 1.7, 1.8
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsgw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31357/dsgw
Modified Files:
Makefile.am aclocal.m4 configure missing install-sh depcomp
compile Makefile.in config.sub config.guess
Added Files:
dummy.cpp
Log Message:
add dummy c++ file to force automake to define CXXLINK
--- NEW FILE dummy.cpp ---
// this is just a dummy
// C++ program to make automake define
// the macro CXXLINK
int
main(int argc, char *argv[])
{
int ii = 1;
int jj = ii;
}
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/dsgw/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile.am 30 Jan 2008 17:38:03 -0000 1.11
+++ Makefile.am 30 Jan 2008 17:47:50 -0000 1.12
@@ -67,6 +67,16 @@
@nss_lib@ -lsmime3 -lssl3 -lnss3 -lsoftokn3 \
@nspr_lib@ -lplds4 -lplc4 -lnspr4
+noinst_PROGRAMS = propmaker
+
+# this is just a dummy to make automake define
+# the CXXLINK macro
+if CXXLINK_REQUIRED
+noinst_PROGRAMS += dummy
+dummy_SOURCES = dummy.cpp
+dummy_LINK = $(CXXLINK)
+endif
+
if CXXLINK_REQUIRED
MYLINK = $(CXXLINK)
else
@@ -101,7 +111,6 @@
cgibin_SCRIPTS += $(DBGSCRIPTS)
endif
-noinst_PROGRAMS = propmaker
# I need propmaker to build with no libraries - I don't know of any other way to set
# the LIBS for a specific program (no, propmaker_LIBS doesn't work) - LDADD is the
# last thing on the link line before LIBS, so just have it terminate the command
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/dsgw/Makefile.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile.in 30 Jan 2008 17:38:03 -0000 1.11
+++ Makefile.in 30 Jan 2008 17:47:50 -0000 1.12
@@ -60,11 +60,15 @@
host_triplet = @host@
@WINNT_TRUE@am__append_1 = -DXP_WINNT
@WINNT_FALSE@am__append_2 = -DXP_UNIX
+noinst_PROGRAMS = propmaker$(EXEEXT) $(am__EXEEXT_2)
+
+# this is just a dummy to make automake define
+# the CXXLINK macro
+@CXXLINK_REQUIRED_TRUE@am__append_3 = dummy
cgibin_PROGRAMS = auth$(EXEEXT) doauth$(EXEEXT) edit$(EXEEXT) \
domodify$(EXEEXT) dnedit$(EXEEXT) dosearch$(EXEEXT) \
$(am__EXEEXT_1)
-@DEBUG_TRUE@am__append_3 = $(DBGSCRIPTS)
-noinst_PROGRAMS = propmaker$(EXEEXT)
+@DEBUG_TRUE@am__append_4 = $(DBGSCRIPTS)
DIST_COMMON = README $(am__configure_deps) $(dist_config_DATA) \
$(dist_gwinfo_DATA) $(dist_html_DATA) $(dist_maninst_DATA) \
$(dist_orghtml_DATA) $(dist_pbconfig_DATA) $(dist_pbhtml_DATA) \
@@ -94,6 +98,7 @@
"$(DESTDIR)$(pbconfigdir)" "$(DESTDIR)$(pbhtmldir)" \
"$(DESTDIR)$(contextdir)" "$(DESTDIR)$(propertydir)"
cgibinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+@CXXLINK_REQUIRED_TRUE@am__EXEEXT_2 = dummy$(EXEEXT)
PROGRAMS = $(cgibin_PROGRAMS) $(noinst_PROGRAMS)
am__objects_1 = htmlout.$(OBJEXT) htmlparse.$(OBJEXT) error.$(OBJEXT) \
cgiutil.$(OBJEXT) dsgwutil.$(OBJEXT) ldaputil.$(OBJEXT) \
@@ -120,6 +125,10 @@
am_dosearch_OBJECTS = dosearch.$(OBJEXT) $(am__objects_1)
dosearch_OBJECTS = $(am_dosearch_OBJECTS)
dosearch_LDADD = $(LDADD)
+am__dummy_SOURCES_DIST = dummy.cpp
+@CXXLINK_REQUIRED_TRUE@am_dummy_OBJECTS = dummy.$(OBJEXT)
+dummy_OBJECTS = $(am_dummy_OBJECTS)
+dummy_LDADD = $(LDADD)
am_edit_OBJECTS = edit.$(OBJEXT) $(am__objects_1)
edit_OBJECTS = $(am_edit_OBJECTS)
edit_LDADD = $(LDADD)
@@ -158,16 +167,24 @@
CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(auth_SOURCES) $(csearch_SOURCES) $(dnedit_SOURCES) \
$(doauth_SOURCES) $(domodify_SOURCES) $(dosearch_SOURCES) \
- $(edit_SOURCES) $(lang_SOURCES) $(newentry_SOURCES) \
- propmaker.c $(search_SOURCES) $(tutor_SOURCES) \
- $(unauth_SOURCES)
+ $(dummy_SOURCES) $(edit_SOURCES) $(lang_SOURCES) \
+ $(newentry_SOURCES) propmaker.c $(search_SOURCES) \
+ $(tutor_SOURCES) $(unauth_SOURCES)
DIST_SOURCES = $(auth_SOURCES) $(csearch_SOURCES) $(dnedit_SOURCES) \
$(doauth_SOURCES) $(domodify_SOURCES) $(dosearch_SOURCES) \
- $(edit_SOURCES) $(lang_SOURCES) $(newentry_SOURCES) \
- propmaker.c $(search_SOURCES) $(tutor_SOURCES) \
- $(unauth_SOURCES)
+ $(am__dummy_SOURCES_DIST) $(edit_SOURCES) $(lang_SOURCES) \
+ $(newentry_SOURCES) propmaker.c $(search_SOURCES) \
+ $(tutor_SOURCES) $(unauth_SOURCES)
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -387,6 +404,8 @@
-DINSTCONFIGDIR=\"$(instconfigdir)\" \
-DMANUALDIR=\"$(manualdir)\" -DCGIURIBASE=\"$(cgiuri)\" \
-DMANUALSUBDIR=\"$(manualsubdir)\" -DINFODIR=\"$(gwinfodir)\"
+@CXXLINK_REQUIRED_TRUE@dummy_SOURCES = dummy.cpp
+@CXXLINK_REQUIRED_TRUE@dummy_LINK = $(CXXLINK)
@CXXLINK_REQUIRED_FALSE@MYLINK = $(LINK)
@CXXLINK_REQUIRED_TRUE@MYLINK = $(CXXLINK)
@@ -406,8 +425,9 @@
newentry_LINK = $(MYLINK)
tutor_LINK = $(MYLINK)
lang_LINK = $(MYLINK)
-cgibin_SCRIPTS = orgbin/org orgbin/myorg $(am__append_3)
+cgibin_SCRIPTS = orgbin/org orgbin/myorg $(am__append_4)
@DEBUG_TRUE@DBGSCRIPTS = $(addsuffix .sh,$(cgibin_PROGRAMS))
+
# I need propmaker to build with no libraries - I don't know of any other way to set
# the LIBS for a specific program (no, propmaker_LIBS doesn't work) - LDADD is the
# last thing on the link line before LIBS, so just have it terminate the command
@@ -578,7 +598,7 @@
$(MAKE) $(AM_MAKEFLAGS) all-am
.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
+.SUFFIXES: .c .cpp .lo .o .obj
am--refresh:
@:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@@ -682,6 +702,9 @@
dosearch$(EXEEXT): $(dosearch_OBJECTS) $(dosearch_DEPENDENCIES)
@rm -f dosearch$(EXEEXT)
$(dosearch_LINK) $(dosearch_LDFLAGS) $(dosearch_OBJECTS) $(dosearch_LDADD) $(LIBS)
+dummy$(EXEEXT): $(dummy_OBJECTS) $(dummy_DEPENDENCIES)
+ @rm -f dummy$(EXEEXT)
+ $(dummy_LINK) $(dummy_LDFLAGS) $(dummy_OBJECTS) $(dummy_LDADD) $(LIBS)
edit$(EXEEXT): $(edit_OBJECTS) $(edit_DEPENDENCIES)
@rm -f edit$(EXEEXT)
$(edit_LINK) $(edit_LDFLAGS) $(edit_OBJECTS) $(edit_LDADD) $(LIBS)
@@ -761,6 +784,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dosearch.Po(a)am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsgwgetlang.Po(a)am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsgwutil.Po(a)am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po(a)am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/edit.Po(a)am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/emitauth.Po(a)am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/emitf.Po(a)am__quote@
@@ -803,6 +827,30 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+.cpp.o:
+@am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
+@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
+@am__fastdepCXX_TRUE@ then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+@am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`; \
+@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCXX_TRUE@ then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+@am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \
+@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
+@am__fastdepCXX_TRUE@ then mv -f "$$depbase.Tpo" "$$depbase.Plo"; else rm -f "$$depbase.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
mostlyclean-libtool:
-rm -f *.lo
16 years, 1 month
[Fedora-directory-commits] dsgw Makefile.am, 1.10, 1.11 aclocal.m4, 1.7, 1.8 configure, 1.10, 1.11 missing, 1.6, 1.7 install-sh, 1.6, 1.7 Makefile.in, 1.10, 1.11 depcomp, 1.6, 1.7 config.sub, 1.6, 1.7 config.guess, 1.6, 1.7 compile, 1.6, 1.7
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsgw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28167/dsgw
Modified Files:
Makefile.am aclocal.m4 configure missing install-sh
Makefile.in depcomp config.sub config.guess compile
Log Message:
added CXXLINK stuff for HP-UX
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/dsgw/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.am 30 Jan 2008 17:16:45 -0000 1.10
+++ Makefile.am 30 Jan 2008 17:38:03 -0000 1.11
@@ -67,6 +67,12 @@
@nss_lib@ -lsmime3 -lssl3 -lnss3 -lsoftokn3 \
@nspr_lib@ -lplds4 -lplc4 -lnspr4
+if CXXLINK_REQUIRED
+MYLINK = $(CXXLINK)
+else
+MYLINK = $(LINK)
+endif
+
# these are programs which we do not want to link with nss
NEED_SECGLUE = unauth search csearch newentry tutor lang
# these are programs which are not used at runtime but may be useful
@@ -75,6 +81,20 @@
cgibin_PROGRAMS = auth doauth edit domodify dnedit dosearch $(NEED_SECGLUE) $(CKUTILPROGS)
+# for c++ linkage on those platforms that require it
+auth_LINK = $(MYLINK)
+doauth_LINK = $(MYLINK)
+edit_LINK = $(MYLINK)
+domodify_LINK = $(MYLINK)
+dnedit_LINK = $(MYLINK)
+dosearch_LINK = $(MYLINK)
+unauth_LINK = $(MYLINK)
+search_LINK = $(MYLINK)
+csearch_LINK = $(MYLINK)
+newentry_LINK = $(MYLINK)
+tutor_LINK = $(MYLINK)
+lang_LINK = $(MYLINK)
+
cgibin_SCRIPTS = orgbin/org orgbin/myorg
if DEBUG
DBGSCRIPTS = $(addsuffix .sh,$(cgibin_PROGRAMS))
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/dsgw/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.in 30 Jan 2008 17:16:45 -0000 1.10
+++ Makefile.in 30 Jan 2008 17:38:03 -0000 1.11
@@ -387,9 +387,25 @@
-DINSTCONFIGDIR=\"$(instconfigdir)\" \
-DMANUALDIR=\"$(manualdir)\" -DCGIURIBASE=\"$(cgiuri)\" \
-DMANUALSUBDIR=\"$(manualsubdir)\" -DINFODIR=\"$(gwinfodir)\"
+@CXXLINK_REQUIRED_FALSE@MYLINK = $(LINK)
+@CXXLINK_REQUIRED_TRUE@MYLINK = $(CXXLINK)
# these are programs which we do not want to link with nss
NEED_SECGLUE = unauth search csearch newentry tutor lang
+
+# for c++ linkage on those platforms that require it
+auth_LINK = $(MYLINK)
+doauth_LINK = $(MYLINK)
+edit_LINK = $(MYLINK)
+domodify_LINK = $(MYLINK)
+dnedit_LINK = $(MYLINK)
+dosearch_LINK = $(MYLINK)
+unauth_LINK = $(MYLINK)
+search_LINK = $(MYLINK)
+csearch_LINK = $(MYLINK)
+newentry_LINK = $(MYLINK)
+tutor_LINK = $(MYLINK)
+lang_LINK = $(MYLINK)
cgibin_SCRIPTS = orgbin/org orgbin/myorg $(am__append_3)
@DEBUG_TRUE@DBGSCRIPTS = $(addsuffix .sh,$(cgibin_PROGRAMS))
# I need propmaker to build with no libraries - I don't know of any other way to set
@@ -650,43 +666,43 @@
done
auth$(EXEEXT): $(auth_OBJECTS) $(auth_DEPENDENCIES)
@rm -f auth$(EXEEXT)
- $(LINK) $(auth_LDFLAGS) $(auth_OBJECTS) $(auth_LDADD) $(LIBS)
+ $(auth_LINK) $(auth_LDFLAGS) $(auth_OBJECTS) $(auth_LDADD) $(LIBS)
csearch$(EXEEXT): $(csearch_OBJECTS) $(csearch_DEPENDENCIES)
@rm -f csearch$(EXEEXT)
- $(LINK) $(csearch_LDFLAGS) $(csearch_OBJECTS) $(csearch_LDADD) $(LIBS)
+ $(csearch_LINK) $(csearch_LDFLAGS) $(csearch_OBJECTS) $(csearch_LDADD) $(LIBS)
dnedit$(EXEEXT): $(dnedit_OBJECTS) $(dnedit_DEPENDENCIES)
@rm -f dnedit$(EXEEXT)
- $(LINK) $(dnedit_LDFLAGS) $(dnedit_OBJECTS) $(dnedit_LDADD) $(LIBS)
+ $(dnedit_LINK) $(dnedit_LDFLAGS) $(dnedit_OBJECTS) $(dnedit_LDADD) $(LIBS)
doauth$(EXEEXT): $(doauth_OBJECTS) $(doauth_DEPENDENCIES)
@rm -f doauth$(EXEEXT)
- $(LINK) $(doauth_LDFLAGS) $(doauth_OBJECTS) $(doauth_LDADD) $(LIBS)
+ $(doauth_LINK) $(doauth_LDFLAGS) $(doauth_OBJECTS) $(doauth_LDADD) $(LIBS)
domodify$(EXEEXT): $(domodify_OBJECTS) $(domodify_DEPENDENCIES)
@rm -f domodify$(EXEEXT)
- $(LINK) $(domodify_LDFLAGS) $(domodify_OBJECTS) $(domodify_LDADD) $(LIBS)
+ $(domodify_LINK) $(domodify_LDFLAGS) $(domodify_OBJECTS) $(domodify_LDADD) $(LIBS)
dosearch$(EXEEXT): $(dosearch_OBJECTS) $(dosearch_DEPENDENCIES)
@rm -f dosearch$(EXEEXT)
- $(LINK) $(dosearch_LDFLAGS) $(dosearch_OBJECTS) $(dosearch_LDADD) $(LIBS)
+ $(dosearch_LINK) $(dosearch_LDFLAGS) $(dosearch_OBJECTS) $(dosearch_LDADD) $(LIBS)
edit$(EXEEXT): $(edit_OBJECTS) $(edit_DEPENDENCIES)
@rm -f edit$(EXEEXT)
- $(LINK) $(edit_LDFLAGS) $(edit_OBJECTS) $(edit_LDADD) $(LIBS)
+ $(edit_LINK) $(edit_LDFLAGS) $(edit_OBJECTS) $(edit_LDADD) $(LIBS)
lang$(EXEEXT): $(lang_OBJECTS) $(lang_DEPENDENCIES)
@rm -f lang$(EXEEXT)
- $(LINK) $(lang_LDFLAGS) $(lang_OBJECTS) $(lang_LDADD) $(LIBS)
+ $(lang_LINK) $(lang_LDFLAGS) $(lang_OBJECTS) $(lang_LDADD) $(LIBS)
newentry$(EXEEXT): $(newentry_OBJECTS) $(newentry_DEPENDENCIES)
@rm -f newentry$(EXEEXT)
- $(LINK) $(newentry_LDFLAGS) $(newentry_OBJECTS) $(newentry_LDADD) $(LIBS)
+ $(newentry_LINK) $(newentry_LDFLAGS) $(newentry_OBJECTS) $(newentry_LDADD) $(LIBS)
propmaker$(EXEEXT): $(propmaker_OBJECTS) $(propmaker_DEPENDENCIES)
@rm -f propmaker$(EXEEXT)
$(LINK) $(propmaker_LDFLAGS) $(propmaker_OBJECTS) $(propmaker_LDADD) $(LIBS)
search$(EXEEXT): $(search_OBJECTS) $(search_DEPENDENCIES)
@rm -f search$(EXEEXT)
- $(LINK) $(search_LDFLAGS) $(search_OBJECTS) $(search_LDADD) $(LIBS)
+ $(search_LINK) $(search_LDFLAGS) $(search_OBJECTS) $(search_LDADD) $(LIBS)
tutor$(EXEEXT): $(tutor_OBJECTS) $(tutor_DEPENDENCIES)
@rm -f tutor$(EXEEXT)
- $(LINK) $(tutor_LDFLAGS) $(tutor_OBJECTS) $(tutor_LDADD) $(LIBS)
+ $(tutor_LINK) $(tutor_LDFLAGS) $(tutor_OBJECTS) $(tutor_LDADD) $(LIBS)
unauth$(EXEEXT): $(unauth_OBJECTS) $(unauth_DEPENDENCIES)
@rm -f unauth$(EXEEXT)
- $(LINK) $(unauth_LDFLAGS) $(unauth_OBJECTS) $(unauth_LDADD) $(LIBS)
+ $(unauth_LINK) $(unauth_LDFLAGS) $(unauth_OBJECTS) $(unauth_LDADD) $(LIBS)
install-cgibinSCRIPTS: $(cgibin_SCRIPTS)
@$(NORMAL_INSTALL)
test -z "$(cgibindir)" || $(mkdir_p) "$(DESTDIR)$(cgibindir)"
16 years, 1 month
[Fedora-directory-commits] dsgw Makefile.am, 1.9, 1.10 cgiutil.c, 1.3, 1.4 config.h.in, 1.2, 1.3 configure.ac, 1.7, 1.8 entrydisplay.c, 1.3, 1.4 aclocal.m4, 1.6, 1.7 configure, 1.9, 1.10 missing, 1.5, 1.6 install-sh, 1.5, 1.6 Makefile.in, 1.9, 1.10 depcomp, 1.5, 1.6 config.sub, 1.5, 1.6 config.guess, 1.5, 1.6 compile, 1.5, 1.6
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsgw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21875/dsgw
Modified Files:
Makefile.am cgiutil.c config.h.in configure.ac entrydisplay.c
aclocal.m4 configure missing install-sh Makefile.in depcomp
config.sub config.guess compile
Log Message:
fix build issues and compiler warnings on HP-UX
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/dsgw/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.am 30 Jan 2008 02:22:46 -0000 1.9
+++ Makefile.am 30 Jan 2008 17:16:45 -0000 1.10
@@ -205,7 +205,7 @@
if WINNT
ICU_GENRB = @icu_bin(a)/genrb.exe
else
-ICU_GENRB = sh $(srcdir)/genrb_wrapper.sh @icu_bin@ @icu_lib@
+ICU_GENRB = sh $(srcdir)/genrb_wrapper.sh @icu_bin@ @icu_libdir@
endif
# The root resource bundle is based on English (en) locale;
Index: cgiutil.c
===================================================================
RCS file: /cvs/dirsec/dsgw/cgiutil.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cgiutil.c 15 Jan 2008 18:23:43 -0000 1.3
+++ cgiutil.c 30 Jan 2008 17:16:45 -0000 1.4
@@ -138,7 +138,7 @@
int
dsgw_post_begin(FILE *in)
{
- char *ct, *tmp = NULL;
+ char *ct = NULL, *tmp = NULL;
char **vars = NULL;
if (( ct = getenv( "CONTENT_TYPE" )) == NULL ||
@@ -354,7 +354,7 @@
*pErrorCode = U_ZERO_ERROR;
- if(sourceSize<0 || source==NULL || nDest==NULL || nSource==NULL)
+ if(source==NULL || nDest==NULL || nSource==NULL)
{
*pErrorCode=U_ILLEGAL_ARGUMENT_ERROR;
return -1;
Index: config.h.in
===================================================================
RCS file: /cvs/dirsec/dsgw/config.h.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config.h.in 10 Jan 2008 01:19:36 -0000 1.2
+++ config.h.in 30 Jan 2008 17:16:45 -0000 1.3
@@ -214,6 +214,9 @@
/* Define to 1 if your <sys/time.h> declares `struct tm'. */
#undef TM_IN_SYS_TIME
+/* use lockf instead of flock */
+#undef USE_LOCKF
+
/* Version number of package */
#undef VERSION
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/dsgw/configure.ac,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- configure.ac 28 Jan 2008 21:22:47 -0000 1.7
+++ configure.ac 30 Jan 2008 17:16:45 -0000 1.8
@@ -59,6 +59,9 @@
AC_FUNC_VPRINTF
AC_CHECK_FUNCS([ftruncate getcwd isascii localtime_r memmove memset select strcasecmp strchr strdup strerror strncasecmp strpbrk strrchr strstr strtoul])
+# check for lockf
+AC_CHECK_FUNC([lockf], [AC_DEFINE([USE_LOCKF], [1], [use lockf instead of flock])])
+
PACKAGE_BASE_NAME=`echo $PACKAGE_NAME | sed -e s/-gw//`
AC_SUBST(PACKAGE_BASE_NAME)
Index: entrydisplay.c
===================================================================
RCS file: /cvs/dirsec/dsgw/entrydisplay.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- entrydisplay.c 28 Jan 2008 21:22:47 -0000 1.3
+++ entrydisplay.c 30 Jan 2008 17:16:45 -0000 1.4
@@ -2215,7 +2215,7 @@
static void
bool_display( struct dsgw_attrdispinfo *adip )
{
- int boolval, free_onclick, pre_idx;
+ int boolval, pre_idx;
char *usestr, *truestr, *falsestr, *checked;
char *nameprefix, *onclick;
@@ -2227,7 +2227,6 @@
if (( adip->adi_opts & DSGW_ATTROPT_EDITABLE ) == 0 ) {
nameprefix = onclick = "";
- free_onclick = 0;
} else {
char *onclickfmt = " onClick=\"aChg('%s')\"";
@@ -2241,7 +2240,6 @@
onclick = dsgw_ch_malloc( strlen( onclickfmt ) +
strlen( adip->adi_attr ) + 1 );
sprintf( onclick, onclickfmt, adip->adi_attr );
- free_onclick = 1;
}
if (( truestr = get_arg_by_name( DSGW_ATTRARG_TRUESTR, adip->adi_argc,
Index: configure
===================================================================
RCS file: /cvs/dirsec/dsgw/configure,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- configure 30 Jan 2008 02:22:46 -0000 1.9
+++ configure 30 Jan 2008 17:16:45 -0000 1.10
@@ -21059,6 +21059,106 @@
done
+# check for lockf
+echo "$as_me:$LINENO: checking for lockf" >&5
+echo $ECHO_N "checking for lockf... $ECHO_C" >&6
+if test "${ac_cv_func_lockf+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define lockf to an innocuous variant, in case <limits.h> declares lockf.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define lockf innocuous_lockf
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char lockf (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef lockf
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char lockf ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_lockf) || defined (__stub___lockf)
+choke me
+#else
+char (*f) () = lockf;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != lockf;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_func_lockf=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_lockf=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_lockf" >&5
+echo "${ECHO_T}$ac_cv_func_lockf" >&6
+if test $ac_cv_func_lockf = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_LOCKF 1
+_ACEOF
+
+fi
+
+
PACKAGE_BASE_NAME=`echo $PACKAGE_NAME | sed -e s/-gw//`
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/dsgw/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.in 30 Jan 2008 02:22:46 -0000 1.9
+++ Makefile.in 30 Jan 2008 17:16:45 -0000 1.10
@@ -504,7 +504,7 @@
# add more here for localized bundles
nodist_property_DATA = root.res en.res en_US.res
MOSTLYCLEANFILES = dsgw.conf root.res dsgw.properties setup dsgw-httpd.conf en.res en_US.res
-@WINNT_FALSE@ICU_GENRB = sh $(srcdir)/genrb_wrapper.sh @icu_bin@ @icu_lib@
+@WINNT_FALSE@ICU_GENRB = sh $(srcdir)/genrb_wrapper.sh @icu_bin@ @icu_libdir@
# Resource Bundle Compiler
@WINNT_TRUE@ICU_GENRB = @icu_bin(a)/genrb.exe
16 years, 1 month