[Nagiosplug-checkins] CVS: nagiosplug Makefile.am,1.13,1.14 autogen.sh,1.1,1.2 configure.in,1.71,1.72

[Jeremy T. Bouse]

Update of /cvsroot/nagiosplug/nagiosplug
In directory sc8-pr-cvs1:/tmp/cvs-serv14281

Modified Files:
	Makefile.am autogen.sh configure.in 
Log Message:
Solaris package build system


Index: Makefile.am
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** Makefile.am	19 Mar 2003 02:28:12 -0000	1.13
--- Makefile.am	23 Mar 2003 07:01:19 -0000	1.14
***************
*** 4,8 ****
  
  EXTRA_DIST = CODING FAQ LEGAL REQUIREMENTS SUPPORT \
! 	Helper.pm	contrib nagios-plugins.spec.in
  
  ACLOCAL_AMFLAGS = -I lib
--- 4,8 ----
  
  EXTRA_DIST = CODING FAQ LEGAL REQUIREMENTS SUPPORT \
! 	Helper.pm contrib pkg nagios-plugins.spec.in
  
  ACLOCAL_AMFLAGS = -I lib
***************
*** 19,48 ****
  
  # Solaris pkgmk
! PACKDIR=build-pkg
  VERSION=@PACKAGE_VERSION@
  
! Prototype:
  	if [ ! -d $(PACKDIR) ] ; then mkdir $(PACKDIR); fi
- 	cd build-solaris
  	$(MAKE) all
! 	$(MAKE) DESTDIR=../$(PACKDIR) install
! 	cd ..
! 	echo i pkginfo> Prototype
! 	if [ -f checkinstall ] ; then echo i checkinstall>> Prototype; fi
! 	if [ -f preinstall ] ; then echo i preinstall>> Prototype; fi
! 	if [ -f postinstall ] ; then echo i postinstall>> Prototype; fi
! 	pkgproto $(PACKDIR)=/ | sed -e "s|$(LOGNAME) $(GROUP)$$|root root|" | egrep -v "(s|d) none (/|/etc|/var|/usr|/usr/local) " >> Prototype
! 
! pkgmap: ../Prototype
! 	mkdir -p $(PACKDIR)/nagiosp
! 	cd $(PACKDIR)/nagiosp
! 	pkgmk -o -r / -f ../Prototype -d $(PACKDIR) nagiosp
! 	cd ..
! 
! nagios.SPARC.pkg.tar.gz: pkgmap
! 	cd $(PACKDIR) && tar -cf - nagiosp | gzip -9 -c > ../nagiosp.SPARC.pkg.tar.gz
! 
! pkgset: nagiosp.SPARC.pkg.tar.gz
  
  pkgclean:
! 	rm -rf Prototype nagiosp.SPARC.pkg.tar.gz
--- 19,34 ----
  
  # Solaris pkgmk
! BUILDDIR=`pwd`/build-solaris
! PACKDIR=`pwd`/build-pkg
  VERSION=@PACKAGE_VERSION@
  
! solpkg:
! 	if [ ! -d $(BUILDDIR) ] ; then mkdir $(BUILDDIR); fi
  	if [ ! -d $(PACKDIR) ] ; then mkdir $(PACKDIR); fi
  	$(MAKE) all
! 	$(MAKE) DESTDIR=$(BUILDDIR) install
! 	$(INSTALL) pkg/solaris/pkginfo $(BUILDDIR)
! 	$(cd $(BUILDDIR) && `pwd`/pkg/solaris/solpkg $(PACKDIR))
  
  pkgclean:
! 	rm -rf $(BUILDDIR) $(PACKDIR)

Index: autogen.sh
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/autogen.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** autogen.sh	12 Mar 2003 17:11:18 -0000	1.1
--- autogen.sh	23 Mar 2003 07:01:19 -0000	1.2
***************
*** 20,35 ****
  
  # Refresh GNU autotools toolchain.
! for i in config.guess config.sub missing install-sh mkinstalldirs ; do
  	test -r /usr/share/automake/${i} && {
  		rm -f ${i}
- 		cp /usr/share/automake/${i} .
  	}
- 	chmod 755 ${i}
  done
  
! aclocal -I lib
! autoheader
! automake -c -a
! autoconf
  
  # For the Debian build
--- 20,30 ----
  
  # Refresh GNU autotools toolchain.
! for i in config.guess config.sub missing install-sh mkinstalldirs depcomp; do
  	test -r /usr/share/automake/${i} && {
  		rm -f ${i}
  	}
  done
  
! tools/setup
  
  # For the Debian build

Index: configure.in
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/configure.in,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -r1.71 -r1.72
*** configure.in	21 Mar 2003 14:04:51 -0000	1.71
--- configure.in	23 Mar 2003 07:01:19 -0000	1.72
***************
*** 100,103 ****
--- 100,111 ----
  ac_cv_uname_v=`uname -v`
  
+ PKG_ARCH=`uname -p`
+ REV_DATESTAMP=`date '+%Y.%m.%d.%H.%M'`
+ REV_TIMESTAMP=`date '+%Y%m%d%H%M%S'`
+ 
+ AC_SUBST(PKG_ARCH)
+ AC_SUBST(REV_DATESTAMP)
+ AC_SUBST(REV_TIMESTAMP)
+ 
  dnl Checks for programs.
  AC_PATH_PROG(PYTHON,python)
***************
*** 1470,1474 ****
  AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"${VERSION}",[package version])
  
! AC_OUTPUT(Makefile lib/Makefile plugins/Makefile plugins-scripts/Makefile plugins-scripts/subst plugins-scripts/utils.pm plugins-scripts/utils.sh command.cfg test.pl,PATH=.:..:$PATH command.cfg)
  
  ACX_FEATURE([with],[cgiurl])
--- 1478,1482 ----
  AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"${VERSION}",[package version])
  
! AC_OUTPUT(Makefile lib/Makefile plugins/Makefile plugins-scripts/Makefile plugins-scripts/subst plugins-scripts/utils.pm plugins-scripts/utils.sh command.cfg test.pl pkg/solaris/pkginfo)
  
  ACX_FEATURE([with],[cgiurl])