From: <ha...@us...> - 2011-06-09 11:25:33
|
Revision: 8328 http://octave.svn.sourceforge.net/octave/?rev=8328&view=rev Author: hauberg Date: 2011-06-09 11:25:26 +0000 (Thu, 09 Jun 2011) Log Message: ----------- Remove autoconf stuff Removed Paths: ------------- trunk/octave-forge/Makeconf.base trunk/octave-forge/Makefile trunk/octave-forge/autogen.sh trunk/octave-forge/configure.base trunk/octave-forge/install-sh trunk/octave-forge/octinst.sh.in Deleted: trunk/octave-forge/Makeconf.base =================================================================== --- trunk/octave-forge/Makeconf.base 2011-06-08 18:30:21 UTC (rev 8327) +++ trunk/octave-forge/Makeconf.base 2011-06-09 11:25:26 UTC (rev 8328) @@ -1,139 +0,0 @@ -## Makeconf is automatically generated from Makeconf.base and Makeconf.add -## in the various subdirectories. To regenerate, use ./autogen.sh to -## create a new ./Makeconf.in, then use ./configure to generate a new -## Makeconf. - -OCTAVE_FORGE = 1 - -SHELL = @SHELL@ - -canonical_host_type = @canonical_host_type@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ -bindir = @bindir@ -mandir = @mandir@ -libdir = @libdir@ -datadir = @datadir@ -infodir = @infodir@ -includedir = @includedir@ -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALLOCT=octinst.sh - -DESTDIR = - -RANLIB = @RANLIB@ -STRIP = @STRIP@ -LN_S = @LN_S@ - -# Most octave programs will be compiled with $(MKOCTFILE). Those which -# cannot use mkoctfile directly can request the flags that mkoctfile -# would use as follows: -# FLAG = $(shell $(MKOCTFILE) -p FLAG) -# The following flags are for compiling programs that are independent -# of Octave. How confusing. -CC = @CC@ -CFLAGS = @CFLAGS@ -CPPFLAGS = @CPPFLAGS@ -CPICFLAG = @CPICFLAG@ -CXX = @CXX@ -CXXFLAGS = @CXXFLAGS@ -CXXPICFLAG = @CXXPICFLAG@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -FPICFLAG = @FPICFLAG@ - -OCTAVE = @OCTAVE@ -OCTAVE_VERSION = @OCTAVE_VERSION@ -MKOCTFILE = @MKOCTFILE@ -DHAVE_OCTAVE_$(ver) -v -SHLEXT = @SHLEXT@ - -ver = @ver@ -MPATH = @mpath@ -OPATH = @opath@ -XPATH = @xpath@ -ALTMPATH = @altmpath@ -ALTOPATH = @altopath@ - -MAKEINFO = @MAKEINFO@ -TEXI2PDF = @TEXI2PDF@ -TEXI2DVI = @TEXI2DVI@ -TEXI2HTML = @TEXI2HTML@ -DVIPDF = @DVIPDF@ -DVIPS = @DVIPS@ - -MKDOC = @MKDOC@ -MKTEXI = @MKTEXI@ -TOPDIR = @TOPDIR@ - -SVN2CL = @SVN2CL@ - -%.o: %.c ; $(MKOCTFILE) -c $< -%.o: %.f ; $(MKOCTFILE) -c $< -%.o: %.cc ; $(MKOCTFILE) -c $< -%.oct: %.cc ; $(MKOCTFILE) $< - -# These are stub rules for the construction of packages - -opkg = $(filter-out %/,$(subst /,/ ,$@)) -ifeq ($(PKG_FILE),) -# Use the wildcard on INDEX and PKG_ADD as well to allow for their absence -PKG_FILES = COPYING DESCRIPTION $(wildcard ChangeLog) $(wildcard INDEX) \ - $(wildcard PKG_ADD) $(wildcard PKG_DEL) $(wildcard post_install.m) \ - $(wildcard pre_install.m) $(wildcard on_uninstall.m) \ - $(wildcard inst/*) $(wildcard src/*) \ - $(wildcard doc/*) $(wildcard bin/*) -endif -REAL_PKG_FILES = $(filter-out %/.svn %/.svnignore %~ %/autom4te.cache, $(PKG_FILES)) - -pkg/%: - @ver=`grep "Version:" DESCRIPTION | sed -e "s/Version: *//" | \ - sed -e "s/^[[:space:]]*//" | sed -e "s/[[:space:]]*$$//"`; \ - name=`grep "Name:" DESCRIPTION | sed -e "s/^Name: *//" | \ - sed -e "s/^[[:space:]]*//" | sed -e "s/[[:space:]]*$$//" | \ - sed -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`; \ - if [ -e "../$(PKGDIR)/$$name-$$ver.tar.gz" ]; then \ - newer=`find . -type f -newer ../$(PKGDIR)/$$name-$$ver.tar.gz`; \ - if test "X$${newer}X" != "XX"; then \ - build="yes"; \ - else \ - build="no"; \ - fi; \ - else \ - build="yes"; \ - fi; \ - if test "X$${build}X" = "XyesX"; then \ - mkdir ../$(PKGDIR)/$$name-$$ver; \ - if [ ! -f ChangeLog ]; then \ - if test "x$(SVN2CL)" != "x"; then \ - $(SVN2CL) --file=../$(PKGDIR)/$$name-$$ver/ChangeLog.tmp; \ - if [ -f ../$(PKGDIR)/$$name-$$ver/ChangeLog.tmp ]; then \ - echo "# Automatically generated file --- DO NOT EDIT" | \ - cat - ../$(PKGDIR)/$$name-$$ver/ChangeLog.tmp > \ - ../$(PKGDIR)/$$name-$$ver/ChangeLog; \ - rm ../$(PKGDIR)/$$name-$$ver/ChangeLog.tmp; \ - fi; \ - fi; \ - fi; \ - tar -cf - $(REAL_PKG_FILES) | (cd ../$(PKGDIR)/$$name-$$ver; tar -xf -); \ - cd ../$(PKGDIR); \ - cp ../package_configure.in $$name-$$ver/configure; \ - cp ../package_Makefile.in $$name-$$ver/Makefile; \ - (cd $$name-$$ver; find . -name .svn -a -type d | xargs rm -fr); \ - tar -zcf $$name-$$ver.tar.gz $$name-$$ver; \ - rm -fr $$name-$$ver; \ - fi - -pre-pkg:: - @if [ -f src/autogen.sh ]; then \ - cd src; \ - sh ./autogen.sh; \ - cd ..; \ - fi - -# By default do nothing post packaging -post-pkg:: - @true - Deleted: trunk/octave-forge/Makefile =================================================================== --- trunk/octave-forge/Makefile 2011-06-08 18:30:21 UTC (rev 8327) +++ trunk/octave-forge/Makefile 2011-06-09 11:25:26 UTC (rev 8328) @@ -1,99 +0,0 @@ - -sinclude Makeconf - -ifeq ($(MPATH),$(OPATH)) - LOADPATH = $(MPATH)//: -else - LOADPATH = $(MPATH)//:$(OPATH)//: -endif -RUN_OCTAVE=admin/run_forge $(OCTAVE) --norc - -SUBMAKEDIRS = $(dir $(wildcard */Makefile)) -.PHONY: subdirs clearlog $(SUBMAKEDIRS) - -ifdef OCTAVE_FORGE - -.PHONY: all install packages package check icheck srpms www doxygen compare - -all: clearlog packages - @echo "Packaging finished." - @if test -f build.fail ; then cat build.fail ;\ - echo "Some functions failed to be packed (search build.log for errors)." ;\ - echo "This should not happen and if it does it is a bug in the package creation" ; \ - echo "process."; \ - false; fi - @echo "You can find the individual packages in the sub-directories of packages/"; - @echo "and bundles of these packages in packages/ itself. Please run 'make check' to" - @echo "ensure that the packages are useable and that all dependencies are correct." - -# Use the structure below to change MAKECMDGOALS to "package" -package: subdirs -packages: - @$(MAKE) -k package - @$(MAKE) -C packages all - -install: installpause - @$(MAKE) -C packages $(MAKECMDGOALS) - @echo "Type \"pkg('load','all')\" at the octave prompt to start" - @echo "using the installed packages" - -installpause: - @echo "*** The install target is deprecated and the individual ***" - @echo "*** packages should be installed using the Octave package ***" - @echo "*** manager. Press any key to continue. ***" - @read -n 1 - -check: - @$(MAKE) -C packages $(MAKECMDGOALS) - -icheck: - @$(MAKE) -C packages $(MAKECMDGOALS) - -srpms: - @$(MAKE) -C packages $(MAKECMDGOALS) - @echo "*** You can find the built SRPMs in packages/RPM/SRPMS ***" - -www: - @$(MAKE) -C doc - -doxygen: - @$(MAKE) -C doc doxygen - -compare: - $(MAKE) -C packages $(MAKECMDGOALS) -else - -.PHONY: all install srpms - -all install srpms: - @echo "./configure ; make" - -endif - -.PHONY: clean distclean dist checkindist - -clean: clearlog subdirs - -$(RM) fntests.m fntests.log packages.md5 - -$(RM) core octave-core octave configure.in - -distclean: subdirs - -$(MAKE) clean - -$(RM) Makeconf octinst.sh config.cache config.status config.log \ - build.log build.fail *~ - -dist: checkindist subdirs - -$(RM) build.log build.fail - admin/get_authors - ./autogen.sh - -checkindist: - @if test -d CVS; then \ - echo Follow the instructions in octave-forge/release.sh && false; \ - else true; fi - -subdirs: $(SUBMAKEDIRS) -clearlog: ; @-$(RM) build.log build.fail -$(SUBMAKEDIRS): - @echo Processing $@ | tee -a build.log - @($(MAKE) -C $@ -k $(MAKECMDGOALS) 2>&1 || \ - echo "$@ not complete." >>build.fail ) | tee -a build.log Deleted: trunk/octave-forge/autogen.sh =================================================================== --- trunk/octave-forge/autogen.sh 2011-06-08 18:30:21 UTC (rev 8327) +++ trunk/octave-forge/autogen.sh 2011-06-09 11:25:26 UTC (rev 8328) @@ -1,33 +0,0 @@ -#! /bin/sh - -## Generate ./configure -rm -f configure.in -echo "dnl --- DO NOT EDIT --- Automatically generated by autogen.sh" > configure.in -cat configure.base >> configure.in -files=`find . -name configure.add -print` -if test ! -z "$files" ; then - cat $files >> configure.in -fi -cat <<EOF >> configure.in - AC_OUTPUT(\$CONFIGURE_OUTPUTS) - dnl XXX FIXME XXX chmod is not in autoconf's list of portable functions - chmod 0771 octinst.sh - echo " " - echo " \"\\\$prefix\" is \$prefix" - echo " \"\\\$exec_prefix\" is \$exec_prefix" - AC_MSG_RESULT([\$STATUS_MSG - -find . -name NOINSTALL -print # shows which toolboxes won't be installed -]) -EOF - -autoconf && rm -f configure.in - -## Generate ./Makeconf.in -rm -f Makeconf.in -cp Makeconf.base Makeconf.in -files=`find . -name Makeconf.add -print` -if test ! -z "$files" ; then - cat $files >> Makeconf.in -fi - Deleted: trunk/octave-forge/configure.base =================================================================== --- trunk/octave-forge/configure.base 2011-06-08 18:30:21 UTC (rev 8327) +++ trunk/octave-forge/configure.base 2011-06-09 11:25:26 UTC (rev 8328) @@ -1,449 +0,0 @@ -dnl The configure script is generated by autogen.sh from configure.base -dnl and the various configure.add files in the source tree. Edit -dnl configure.base and reprocess rather than modifying ./configure. - -dnl autoconf 2.13 certainly doesn't work! What is the minimum requirement? -AC_PREREQ(2.2) - -AC_INIT(configure.base) - -PACKAGE=octave-forge -MAJOR_VERSION=0 -MINOR_VERSION=1 -PATCH_LEVEL=0 - -dnl Kill caching --- this ought to be the default -define([AC_CACHE_LOAD], )dnl -define([AC_CACHE_SAVE], )dnl - -dnl uncomment to put support files in another directory -dnl AC_CONFIG_AUX_DIR(admin) - -VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL -AC_SUBST(PACKAGE) -AC_SUBST(VERSION) - -dnl need to find admin files, so keep track of the top dir. -TOPDIR=`pwd` -AC_SUBST(TOPDIR) - -dnl if mkoctfile doesn't work, then we need the following: -dnl AC_PROG_CXX -dnl AC_PROG_F77 - -dnl Need C compiler regardless so define it in a way that -dnl makes autoconf happy and we can override whatever we -dnl need with mkoctfile -p. -dnl XXX FIXME XXX should use mkoctfile to get CC and CFLAGS -AC_PROG_CC - -dnl XXX FIXME XXX need tests for -p -c -s in mkoctfile. - -dnl ******************************************************************* -dnl Sort out mkoctfile version number and install paths - -dnl XXX FIXME XXX latest octave has octave-config so we don't -dnl need to discover things here. Doesn't have --exe-site-dir -dnl but defines --oct-site-dir and --m-site-dir - -dnl Check for mkoctfile -AC_CHECK_PROG(MKOCTFILE,mkoctfile,mkoctfile) -test -z "$MKOCTFILE" && AC_MSG_WARN([no mkoctfile found on path]) - -AC_SUBST(ver) -AC_SUBST(subver) -AC_SUBST(mpath) -AC_SUBST(opath) -AC_SUBST(xpath) -AC_SUBST(altpath) -AC_SUBST(altmpath) -AC_SUBST(altopath) - -AC_ARG_WITH(path, - [ --with-path install path prefix], - [ path=$withval ]) -AC_ARG_WITH(mpath, - [ --with-mpath override path for m-files], - [mpath=$withval]) -AC_ARG_WITH(opath, - [ --with-opath override path for oct-files], - [opath=$withval]) -AC_ARG_WITH(xpath, - [ --with-xpath override path for executables], - [xpath=$withval]) -AC_ARG_WITH(altpath, - [ --with-altpath alternative functions install path prefix], - [ altpath=$withval ]) -AC_ARG_WITH(altmpath, - [ --with-altmpath override path for alternative m-files], - [altmpath=$withval]) -AC_ARG_WITH(altopath, - [ --with-altopath override path for alternative oct-files], - [altopath=$withval]) - -if test -n "$path" ; then - test -z "$mpath" && mpath=$path - test -z "$opath" && opath=$path/oct - test -z "$xpath" && xpath=$path/bin - test -z "$altpath" && altpath=$path-alternatives -fi - -if test -n "$altpath" ; then - test -z "$altmpath" && altmpath=$altpath - test -z "$altopath" && altopath=$altpath/oct -fi - -dnl Don't query if path/ver are given in the configure environment -#if test -z "$mpath" || test -z "$opath" || test -z "$xpath" || test -z "$altmpath" || test -z "$altopath" || test -z "$ver" ; then -if test -z "$mpath" || test -z "$opath" || test -z "$xpath" || test -z "$ver" ; then - dnl Construct program to get mkoctfile version and local install paths - cat > conftest.cc <<EOF -#include <octave/config.h> -#include <octave/version.h> -#include <octave/defaults.h> - -#define INFOV "\nINFOV=" OCTAVE_VERSION "\n" - -#define INFOH "\nINFOH=" OCTAVE_CANONICAL_HOST_TYPE "\n" - -#ifdef OCTAVE_LOCALVERFCNFILEDIR -# define INFOM "\nINFOM=" OCTAVE_LOCALVERFCNFILEDIR "\n" -#else -# define INFOM "\nINFOM=" OCTAVE_LOCALFCNFILEPATH "\n" -#endif - -#ifdef OCTAVE_LOCALVEROCTFILEDIR -# define INFOO "\nINFOO=" OCTAVE_LOCALVEROCTFILEDIR "\n" -#else -# define INFOO "\nINFOO=" OCTAVE_LOCALOCTFILEPATH "\n" -#endif - -#ifdef OCTAVE_LOCALVERARCHLIBDIR -# define INFOX "\nINFOX=" OCTAVE_LOCALVERARCHLIBDIR "\n" -#else -# define INFOX "\nINFOX=" OCTAVE_LOCALARCHLIBDIR "\n" -#endif - -const char *infom = INFOM; -const char *infoo = INFOO; -const char *infox = INFOX; -const char *infoh = INFOH; -const char *infov = INFOV; -EOF - - dnl Compile program perhaps with a special version of mkoctfile - $MKOCTFILE conftest.cc || AC_MSG_ERROR(Could not run $MKOCTFILE) - - dnl Strip the config info from the compiled file - eval `strings conftest.o | grep "^INFO.=" | sed -e "s,//.*$,,"` - rm -rf conftest* - - dnl set the appropriate variables if they are not already set - ver=`echo $INFOV | sed -e "s/\.//" -e "s/\..*$//"` - subver=`echo $INFOV | sed -e "[s/^[^.]*[.][^.]*[.]//]"` - alt_mbase=`echo $INFOM | sed -e "[s,\/[^\/]*$,,]"` - alt_obase=`echo $INFOO | sed -e "[s,/site.*$,/site,]"` - test -z "$mpath" && mpath=$INFOM/octave-forge - test -z "$opath" && opath=$INFOO/octave-forge - test -z "$xpath" && xpath=$INFOX - test -z "$altmpath" && altmpath=$alt_mbase/octave-forge-alternatives/m - test -z "$altopath" && altopath=$alt_obase/octave-forge-alternatives/oct/$INFOH -fi - -dnl ******************************************************************* - -dnl XXX FIXME XXX Should we allow the user to override these? -dnl Do we even need them? The individual makefiles can call mkoctfile -p -dnl themselves, so the only reason to keep them is for configure, and -dnl for those things which are not built using mkoctfile (e.g., aurecord) -dnl but it is not clear we should be using octave compile flags for those. - -dnl C compiler and flags -AC_MSG_RESULT([retrieving compile and link flags from $MKOCTFILE]) -CC=`$MKOCTFILE -p CC` -CFLAGS=`$MKOCTFILE -p CFLAGS` -CPPFLAGS=`$MKOCTFILE -p CPPFLAGS` -CPICFLAG=`$MKOCTFILE -p CPICFLAG` -LDFLAGS=`$MKOCTFILE -p LDFLAGS` -LIBS=`$MKOCTFILE -p LIBS` -AC_SUBST(CC) -AC_SUBST(CFLAGS) -AC_SUBST(CPPFLAGS) -AC_SUBST(CPICFLAG) - -dnl Fortran compiler and flags -F77=`$MKOCTFILE -p F77` -FFLAGS=`$MKOCTFILE -p FFLAGS` -FPICFLAG=`$MKOCTFILE -p FPICFLAG` -AC_SUBST(F77) -AC_SUBST(FFLAGS) -AC_SUBST(FPICFLAG) - -dnl C++ compiler and flags -CXX=`$MKOCTFILE -p CXX` -CXXFLAGS=`$MKOCTFILE -p CXXFLAGS` -CXXPICFLAG=`$MKOCTFILE -p CXXPICFLAG` -AC_SUBST(CXX) -AC_SUBST(CXXFLAGS) -AC_SUBST(CXXPICFLAG) - -dnl ******************************************************************* - -dnl Check for features of your version of mkoctfile. -dnl All checks should be designed so that the default -dnl action if the tests are not performed is to do whatever -dnl is appropriate for the most recent version of Octave. - -dnl Define the following macro: -dnl OF_CHECK_LIB(lib,fn,true,false,helpers) -dnl This is just like AC_CHECK_LIB, but it doesn't update LIBS -AC_DEFUN(OF_CHECK_LIB, -[save_LIBS="$LIBS" -AC_CHECK_LIB($1,$2,$3,$4,$5) -LIBS="$save_LIBS" -]) - -dnl Define the following macro: -dnl TRY_MKOCTFILE(msg,program,action_if_true,action_if_false) -dnl -AC_DEFUN(TRY_MKOCTFILE, -[AC_MSG_CHECKING($1) -cat > conftest.cc << EOF -#include <octave/config.h> -$2 -EOF -ac_try="$MKOCTFILE -c conftest.cc" -if AC_TRY_EVAL(ac_try) ; then - AC_MSG_RESULT(yes) - $3 -else - AC_MSG_RESULT(no) - $4 -fi -]) - -dnl -dnl Check if F77_FUNC works with MKOCTFILE -dnl -TRY_MKOCTFILE([for F77_FUNC], -[int F77_FUNC (hello, HELLO) (const int &n);],, -[MKOCTFILE="$MKOCTFILE -DF77_FUNC=F77_FCN"]) - -dnl ********************************************************** - -dnl Evaluate an expression in octave -dnl -dnl OCTAVE_EVAL(expr,var) -> var=expr -dnl -AC_DEFUN(OCTAVE_EVAL, -[AC_MSG_CHECKING([for $1 in Octave]) -$2=`echo "disp($1)" | $OCTAVE -qf` -AC_MSG_RESULT($$2) -AC_SUBST($2) -]) - -dnl Check status of an octave variable -dnl -dnl OCTAVE_CHECK_EXIST(variable,action_if_true,action_if_false) -dnl -AC_DEFUN(OCTAVE_CHECK_EXIST, -[AC_MSG_CHECKING([for $1 in Octave]) -if test `echo 'disp(exist("$1"))' | $OCTAVE -qf`X != 0X ; then - AC_MSG_RESULT(yes) - $2 -else - AC_MSG_RESULT(no) - $3 -fi -]) - -dnl should check that $(OCTAVE) --version matches $(MKOCTFILE) --version -AC_CHECK_PROG(OCTAVE,octave,octave) -OCTAVE_EVAL(OCTAVE_VERSION,OCTAVE_VERSION) - -dnl grab canonical host type so we can write system specific install stuff -OCTAVE_EVAL(octave_config_info('canonical_host_type'),canonical_host_type) - -dnl grab SHLEXT from octave config -OCTAVE_EVAL(octave_config_info('SHLEXT'),SHLEXT) - -AC_PROG_LN_S -AC_PROG_INSTALL -AC_PROG_RANLIB - -dnl Use $(COPY_FLAGS) to set options for cp when installing .oct files. -COPY_FLAGS="-Rfp" -case "$canonical_host_type" in - *-*-linux*) - COPY_FLAGS="-fdp" - ;; -esac -AC_SUBST(COPY_FLAGS) - -dnl Use $(STRIP) in the makefile to strip executables. If not found, -dnl STRIP expands to ':', which in the makefile does nothing. -dnl Don't need this for .oct files since mkoctfile handles them directly -STRIP=${STRIP-strip} -AC_CHECK_PROG(STRIP,$STRIP,$STRIP,:) - -dnl Strip on windows, don't strip on Mac OS/X or IRIX -dnl For the rest, you can force strip using MKOCTFILE="mkoctfile -s" -dnl or avoid strip using STRIP=: before ./configure -case "$canonical_host_type" in - powerpc-apple-darwin*|*-sgi-*) - STRIP=: - ;; - *-cygwin-*|*-mingw-*) - MKOCTFILE="$MKOCTFILE -s" - ;; -esac - -dnl Test for the makeinfo program -AC_CHECK_PROG(MAKEINFO,makeinfo,makeinfo) -if [ test -n "$MAKEINFO" ]; then - dnl Check whether the makeinfo command accepts the - dnl "--no-split" option - touch conftest.texi - AC_MSG_CHECKING([for makeinfo --no-split]) - ac_try="$MAKEINFO --no-split conftest.texi" - if AC_TRY_EVAL(ac_try) ; then - MAKEINFO="$MAKEINFO --no-split" - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - fi - rm -f conftest.* -fi - -dnl Test for the texi2dvi program -AC_CHECK_PROG(TEXI2DVI,texi2dvi,texi2dvi) -if [ test -n "$TEXI2DVI" ]; then - if test -n "$COMSPEC"; then - TEXI2DVI="COMSPEC= $TEXI2DVI" - fi - dnl Check whether the texi2dvi command accepts the - dnl "--clean" option - cat > conftest.texi <<EOF -\input texinfo -@bye -EOF - AC_MSG_CHECKING([that texi2dvi runs]) - ac_try="$TEXI2DVI conftest.texi > /dev/null" - if AC_TRY_EVAL(ac_try) ; then - AC_MSG_RESULT(yes) - if test -z "$COMSPEC"; then - AC_MSG_CHECKING([for texi2dvi --clean]) - ac_try="$TEXI2DVI --clean conftest.texi > /dev/null" - if AC_TRY_EVAL(ac_try) ; then - TEXI2DVI="$TEXI2DVI --clean" - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - fi - fi - else - TEXI2DVI="" - AC_MSG_RESULT(no) - fi - rm -f conftest.* -fi - -dnl Test for the texi2pdf program -AC_CHECK_PROG(TEXI2PDF,texi2pdf,texi2pdf) -if [ test -n "$TEXI2PDF" ]; then - if test -n "$COMSPEC"; then - TEXI2PDF="COMSPEC= $TEXI2PDF" - fi - dnl Check whether the texi2pdf command accepts the - dnl "--clean" option - cat > conftest.texi <<EOF -\input texinfo -@bye -EOF - AC_MSG_CHECKING([that texi2pdf runs]) - ac_try="$TEXI2PDF conftest.texi > /dev/null" - if AC_TRY_EVAL(ac_try) ; then - AC_MSG_RESULT(yes) - if test -z "$COMSPEC"; then - AC_MSG_CHECKING([for texi2pdf --clean]) - ac_try="$TEXI2PDF --clean conftest.texi > /dev/null" - if AC_TRY_EVAL(ac_try) ; then - TEXI2PDF="$TEXI2PDF --clean" - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - fi - fi - else - TEXI2PDF="" - AC_MSG_RESULT(no) - fi - rm -f conftest.* -fi - -dnl Test for the texi2html program -AC_CHECK_PROG(TEXI2HTML,texi2html,texi2html) -if [ test -n "$TEXI2HTML" ]; then - STATUS="yes" - dnl Check whether the texi2html command accepts the - dnl "-split_chapter -number" option - touch conftest.texi - AC_MSG_CHECKING([for texi2html --clean]) - ac_try="$TEXI2HTML -split_chapter -number conftest.texi" - if AC_TRY_EVAL(ac_try) ; then - TEXI2HTML="$TEXI2HTML -split_chapter -number" - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - fi - rm -f conftest.* - dnl TeTex 3.0 on Suse is leaving a conftest directory - rm -rf conftest -fi - -dnl Test for the dvipdf program -AC_CHECK_PROG(DVIPDF,dvipdf,dvipdf) -if test -z "$DVIPDF"; then - AC_CHECK_PROG(DVIPDF,dvipdfm,dvipdfm) -fi - -dnl Test for the dvips program -AC_CHECK_PROG(DVIPS,dvips,dvips) - -MKDOC=$TOPDIR/admin/mkdoc -AC_SUBST(MKDOC) - -MKTEXI=$TOPDIR/admin/mktexi -AC_SUBST(MKTEXI) - -dnl Test for the svn2cl program -AC_CHECK_PROGS(SVN2CL,svn2cl svn2cl.pl) - -CONFIGURE_OUTPUTS="doc/macros.m4 Makeconf octinst.sh" -STATUS_MSG=" -octave commands will install into the following directories: - m-files: $mpath - oct-files: $opath - binaries: $xpath -alternatives: - m-files: $altmpath - oct-files: $altopath - -shell commands will install into the following directories: - binaries: $bindir - man pages: $mandir - libraries: $libdir - headers: $includedir - -octave-forge is configured with - octave: $OCTAVE (version $OCTAVE_VERSION) - mkoctfile: $MKOCTFILE for Octave $subver - makeinfo: $MAKEINFO - texi2pdf: $TEXI2PDF - texi2dvi: $TEXI2DVI - texi2html: $TEXI2HTML - mkdoc: $MKDOC - mktexi: $MKTEXI - dvips: $DVIPS - dvipdf: $DVIPDF - svn2cl: $SVN2CL" Deleted: trunk/octave-forge/install-sh =================================================================== --- trunk/octave-forge/install-sh 2011-06-08 18:30:21 UTC (rev 8327) +++ trunk/octave-forge/install-sh 2011-06-09 11:25:26 UTC (rev 8328) @@ -1,251 +0,0 @@ -#!/bin/sh -# -# install - install a program, script, or datafile -# This comes from X11R5 (mit/util/scripts/install.sh). -# -# Copyright 1991 by the Massachusetts Institute of Technology -# -# Permission to use, copy, modify, distribute, and sell this software and its -# documentation for any purpose is hereby granted without fee, provided that -# the above copyright notice appear in all copies and that both that -# copyright notice and this permission notice appear in supporting -# documentation, and that the name of M.I.T. not be used in advertising or -# publicity pertaining to distribution of the software without specific, -# written prior permission. M.I.T. makes no representations about the -# suitability of this software for any purpose. It is provided "as is" -# without express or implied warranty. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. It can only install one file at a time, a restriction -# shared with many OS's install programs. - - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" - - -# put in absolute paths if you don't have them in your path; or use env. vars. - -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" -mkdirprog="${MKDIRPROG-mkdir}" - -transformbasename="" -transform_arg="" -instcmd="$mvprog" -chmodcmd="$chmodprog 0755" -chowncmd="" -chgrpcmd="" -stripcmd="" -rmcmd="$rmprog -f" -mvcmd="$mvprog" -src="" -dst="" -dir_arg="" - -while [ x"$1" != x ]; do - case $1 in - -c) instcmd="$cpprog" - shift - continue;; - - -d) dir_arg=true - shift - continue;; - - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; - - -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; - - -s) stripcmd="$stripprog" - shift - continue;; - - -t=*) transformarg=`echo $1 | sed 's/-t=//'` - shift - continue;; - - -b=*) transformbasename=`echo $1 | sed 's/-b=//'` - shift - continue;; - - *) if [ x"$src" = x ] - then - src=$1 - else - # this colon is to work around a 386BSD /bin/sh bug - : - dst=$1 - fi - shift - continue;; - esac -done - -if [ x"$src" = x ] -then - echo "install: no input file specified" - exit 1 -else - true -fi - -if [ x"$dir_arg" != x ]; then - dst=$src - src="" - - if [ -d $dst ]; then - instcmd=: - chmodcmd="" - else - instcmd=mkdir - fi -else - -# Waiting for this to be detected by the "$instcmd $src $dsttmp" command -# might cause directories to be created, which would be especially bad -# if $src (and thus $dsttmp) contains '*'. - - if [ -f $src -o -d $src ] - then - true - else - echo "install: $src does not exist" - exit 1 - fi - - if [ x"$dst" = x ] - then - echo "install: no destination specified" - exit 1 - else - true - fi - -# If destination is a directory, append the input filename; if your system -# does not like double slashes in filenames, you may need to add some logic - - if [ -d $dst ] - then - dst="$dst"/`basename $src` - else - true - fi -fi - -## this sed command emulates the dirname command -dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` - -# Make sure that the destination directory exists. -# this part is taken from Noah Friedman's mkinstalldirs script - -# Skip lots of stat calls in the usual case. -if [ ! -d "$dstdir" ]; then -defaultIFS=' -' -IFS="${IFS-${defaultIFS}}" - -oIFS="${IFS}" -# Some sh's can't handle IFS=/ for some reason. -IFS='%' -set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` -IFS="${oIFS}" - -pathcomp='' - -while [ $# -ne 0 ] ; do - pathcomp="${pathcomp}${1}" - shift - - if [ ! -d "${pathcomp}" ] ; - then - $mkdirprog "${pathcomp}" - else - true - fi - - pathcomp="${pathcomp}/" -done -fi - -if [ x"$dir_arg" != x ] -then - $doit $instcmd $dst && - - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi -else - -# If we're going to rename the final executable, determine the name now. - - if [ x"$transformarg" = x ] - then - dstfile=`basename $dst` - else - dstfile=`basename $dst $transformbasename | - sed $transformarg`$transformbasename - fi - -# don't allow the sed command to completely eliminate the filename - - if [ x"$dstfile" = x ] - then - dstfile=`basename $dst` - else - true - fi - -# Make a temp file name in the proper directory. - - dsttmp=$dstdir/#inst.$$# - -# Move or copy the file name to the temp name - - $doit $instcmd $src $dsttmp && - - trap "rm -f ${dsttmp}" 0 && - -# and set any options; do chmod last to preserve setuid bits - -# If any of these fail, we abort the whole thing. If we want to -# ignore errors from any of these, just make sure not to ignore -# errors from the above "$doit $instcmd $src $dsttmp" command. - - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && - -# Now rename the file to the real destination. - - $doit $rmcmd -f $dstdir/$dstfile && - $doit $mvcmd $dsttmp $dstdir/$dstfile - -fi && - - -exit 0 Deleted: trunk/octave-forge/octinst.sh.in =================================================================== --- trunk/octave-forge/octinst.sh.in 2011-06-08 18:30:21 UTC (rev 8327) +++ trunk/octave-forge/octinst.sh.in 2011-06-09 11:25:26 UTC (rev 8328) @@ -1,97 +0,0 @@ -#! /bin/sh - -# octinst.sh source mpath opath xpath [altmpath altopath] - -# Copies all m-files and oct-files from the source directory to the -# mpath and opath respectively. Preserves links. Files in -# source/data are copied to mpath. Files in the source/bin are copied -# to xpath. m-files and oct-files in source/alternatives are copied to -# altmpath and altopath respectively - -if test $# -lt 4 ; then - echo 'Not enough arguments' - exit 1 -fi - -# interpret input parameters -source=$1; shift -mpath=$1; shift -opath=$1; shift -xpath=$1; shift -if test $# -ge 1; then altmpath=$1; shift; fi -if test $# -ge 1; then altopath=$1; shift; fi -INSTALL="@INSTALL@" -INSTALL_DATA="@INSTALL_DATA@" -INSTALL_PROGRAM="@INSTALL_PROGRAM@" -INSTALL_SCRIPT="@INSTALL_SCRIPT@" -MKPKGADD="@TOPDIR@/admin/mkpkgadd" -COPY_FLAGS="@COPY_FLAGS@" - -# grab the m-files -files=`echo $source/*.m` -if test "$files" != "$source/*.m" ; then - $INSTALL -d $mpath - $INSTALL_DATA $files $mpath -fi - -# grab the oct-files -files=`echo $source/*.oct` -if test "$files" != "$source/*.oct" ; then - $INSTALL -d $opath -## Grrr... install doesn't preserve links. Hope this works. - cp $COPY_FLAGS $files $opath - files=`echo $source/*.octlink` - if test "$files" != "$sources/*.octlink"; then - $INSTALL -d $mpath - fi -fi - -# install alternatives -if test -d "$source/alternatives" ; then - # m-files - files=`echo $source/alternatives/*.m` - if test "$files" != "$source/alternatives/*.m" ; then - $INSTALL -d $altmpath - $INSTALL_DATA $files $altmpath - fi - # oct-files - files=`echo $source/alternatives/*.oct` - if test "$files" != "$source/alternatives/*.oct" ; then - $INSTALL -d $altopath - $INSTALL_DATA $files $altopath - fi -fi - -# Create PKG_ADD, and destroy it immediately if it is empty -# XXX FIXME XXX no PKG_ADD created if only oct-files and no m-files. -if test -d "$mpath" ; then - "$MKPKGADD" $source > $mpath/PKG_ADD - if test -z "`cat $mpath/PKG_ADD`" ; then rm -f $mpath/PKG_ADD; fi -fi -# PKG_ADD for alternatives -if test -d "$source/alternatives" -a -d "$altmpath" ; then - $MKPKGADD $source/alternatives > $altmpath/PKG_ADD - if test -z "`cat $altmpath/PKG_ADD`" ; then rm $altmpath/PKG_ADD; fi -fi - -# grab the data files, skipping the SVN directory -files=`echo $source/data/* | sed -e "s/[^ ]*.svn//"` -if test -n "$files" -a "$files" != "$source/data/*" ; then - $INSTALL -d $mpath - $INSTALL_DATA $files $mpath -fi - -# grab the executable files, skipping the SVN directory -files=`echo $source/bin/* | sed -e "s/[^ ]*.svn//"` -if test -n "$files" -a "$files" != "$source/bin/*" ; then - $INSTALL -d $xpath - $INSTALL_PROGRAM $files $xpath -fi - -# grab the script files, skipping the SVN directory -files=`echo $source/scripts/* | sed -e "s/[^ ]*.svn//"` -if test -n "$files" -a "$files" != "$source/scripts/*" ; then - $INSTALL -d $xpath - $INSTALL_SCRIPT $files $xpath -fi - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |