# HG changeset patch # User adb014 # Date 1156377264 0 # Node ID cca5145797cdb960f01a3216446df9905a8e319c # Parent 243cc4891c6904a9e6e6a63db71930e929bcf444 clean-up image package diff --git a/Makefile b/Makefile new file mode 100644 --- /dev/null +++ b/Makefile @@ -0,0 +1,5 @@ +sinclude ../../Makeconf +sinclude ../../pkg.mk + +PKG_FILES = $(patsubst %,image/%, COPYING DESCRIPTION INDEX \ + $(wildcard devel/*) $(wildcard inst/*) $(wildcard src/*)) diff --git a/src/.cvsignore b/src/.cvsignore --- a/src/.cvsignore +++ b/src/.cvsignore @@ -1,3 +1,3 @@ -PKG_ADD -*.octlink *.oct +configure +autom4te.cache diff --git a/src/Makeconf.add b/src/Makeconf.add deleted file mode 100644 --- a/src/Makeconf.add +++ /dev/null @@ -1,3 +0,0 @@ -@DEFHAVE_JPEG@ -@DEFHAVE_PNG@ -@DEFHAVE_MAGICKXX@ diff --git a/src/Makeconf.base b/src/Makeconf.base deleted file mode 100644 --- a/src/Makeconf.base +++ /dev/null @@ -1,92 +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@ -MKOCTLINK = @MKOCTLINK@ -OCTLINK= @OCTLINK@ - -AWK = @AWK@ - -# 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@ - -@DEFHAVE_X@ -X_CFLAGS = @X_CFLAGS@ -X_LIBS = @X_LIBS@ - -ver = @ver@ -MPATH = @mpath@ -OPATH = @opath@ -XPATH = @xpath@ -ALTMPATH = @altmpath@ -ALTOPATH = @altopath@ - -HAVE_DO_FORTRAN_INDEXING = @HAVE_DO_FORTRAN_INDEXING@ -HAVE_PROPAGATE_EMPTY_MATRICES = @HAVE_PROPAGATE_EMPTY_MATRICES@ -HAVE_OK_TO_LOSE_IMAGINARY_PART = @HAVE_OK_TO_LOSE_IMAGINARY_PART@ -HAVE_ND_ARRAYS = @HAVE_ND_ARRAYS@ -TYPEID_HAS_CLASS = @TYPEID_HAS_CLASS@ -CLASS_HAS_LOAD_SAVE = @CLASS_HAS_LOAD_SAVE@ -HAVE_OCTAVE_MAP_INDEX = @HAVE_OCTAVE_MAP_INDEX@ -HAVE_OCTAVE_CONCAT = @HAVE_OCTAVE_CONCAT@ -HAVE_SWAP_BYTES = @HAVE_SWAP_BYTES@ -HAVE_OCTAVE_UPLUS = @HAVE_OCTAVE_UPLUS@ - -MAKEINFO = @MAKEINFO@ -TEXI2DVI = @TEXI2DVI@ -TEXI2HTML = @TEXI2HTML@ -DVIPDF = @DVIPDF@ -DVIPS = @DVIPS@ - -MKDOC = @MKDOC@ -MKTEXI = @MKTEXI@ - -%.o: %.c ; $(MKOCTFILE) -c $< -%.o: %.f ; $(MKOCTFILE) -c $< -%.o: %.cc ; $(MKOCTFILE) -c $< -%.oct: %.cc ; $(MKOCTFILE) $< diff --git a/src/Makeconf.in b/src/Makeconf.in --- a/src/Makeconf.in +++ b/src/Makeconf.in @@ -28,8 +28,6 @@ RANLIB = @RANLIB@ STRIP = @STRIP@ LN_S = @LN_S@ -MKOCTLINK = @MKOCTLINK@ -OCTLINK= @OCTLINK@ AWK = @AWK@ @@ -55,10 +53,6 @@ MKOCTFILE = @MKOCTFILE@ -DHAVE_OCTAVE_$(ver) -v SHLEXT = @SHLEXT@ -@DEFHAVE_X@ -X_CFLAGS = @X_CFLAGS@ -X_LIBS = @X_LIBS@ - ver = @ver@ MPATH = @mpath@ OPATH = @opath@ @@ -66,30 +60,11 @@ ALTMPATH = @altmpath@ ALTOPATH = @altopath@ -HAVE_DO_FORTRAN_INDEXING = @HAVE_DO_FORTRAN_INDEXING@ -HAVE_PROPAGATE_EMPTY_MATRICES = @HAVE_PROPAGATE_EMPTY_MATRICES@ -HAVE_OK_TO_LOSE_IMAGINARY_PART = @HAVE_OK_TO_LOSE_IMAGINARY_PART@ -HAVE_ND_ARRAYS = @HAVE_ND_ARRAYS@ -TYPEID_HAS_CLASS = @TYPEID_HAS_CLASS@ -CLASS_HAS_LOAD_SAVE = @CLASS_HAS_LOAD_SAVE@ -HAVE_OCTAVE_MAP_INDEX = @HAVE_OCTAVE_MAP_INDEX@ -HAVE_OCTAVE_CONCAT = @HAVE_OCTAVE_CONCAT@ -HAVE_SWAP_BYTES = @HAVE_SWAP_BYTES@ -HAVE_OCTAVE_UPLUS = @HAVE_OCTAVE_UPLUS@ - -MAKEINFO = @MAKEINFO@ -TEXI2DVI = @TEXI2DVI@ -TEXI2HTML = @TEXI2HTML@ -DVIPDF = @DVIPDF@ -DVIPS = @DVIPS@ - -MKDOC = @MKDOC@ -MKTEXI = @MKTEXI@ +@DEFHAVE_JPEG@ +@DEFHAVE_PNG@ +@DEFHAVE_MAGICKXX@ %.o: %.c ; $(MKOCTFILE) -c $< %.o: %.f ; $(MKOCTFILE) -c $< %.o: %.cc ; $(MKOCTFILE) -c $< %.oct: %.cc ; $(MKOCTFILE) $< -@DEFHAVE_JPEG@ -@DEFHAVE_PNG@ -@DEFHAVE_MAGICKXX@ diff --git a/src/autogen.sh b/src/autogen.sh --- a/src/autogen.sh +++ b/src/autogen.sh @@ -4,10 +4,6 @@ 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 <> configure.in AC_OUTPUT(\$CONFIGURE_OUTPUTS) dnl XXX FIXME XXX chmod is not in autoconf's list of portable functions @@ -22,12 +18,3 @@ 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 - diff --git a/src/configure.add b/src/configure.add deleted file mode 100644 --- a/src/configure.add +++ /dev/null @@ -1,56 +0,0 @@ - -if test -e main/image/NOINSTALL ; then - - dnl Not installing so don't test for libjpeg/libpng/libMagick++. - STATUS=none - -else - - AC_DEFINE(have_jpeg) - AC_CHECK_HEADER(jpeglib.h, have_jpeg=yes, have_jpeg=no) - if test $have_jpeg = yes ; then - OF_CHECK_LIB(jpeg, jpeg_std_error, have_jpeg=yes, have_jpeg=no) - if test $have_jpeg = no ; then - STATUS="libjpeg not found" - else - STATUS="jpeg" - AC_SUBST(DEFHAVE_JPEG) - DEFHAVE_JPEG="HAVE_JPEG=1" - fi - else - STATUS="jpeglib.h not found" - fi - - AC_DEFINE(have_png) - AC_CHECK_HEADER(png.h, have_png=yes, have_png=no) - if test $have_png = yes ; then - OF_CHECK_LIB(png, png_set_sig_bytes, have_png=yes, have_png=no) - if test $have_png = no ; then - STATUS="$STATUS, libpng not found" - else - STATUS="$STATUS, png" - AC_SUBST(DEFHAVE_PNG) - DEFHAVE_PNG="HAVE_PNG=1" - fi - else - STATUS="$STATUS, png.h not found" - fi - - AC_CHECK_PROG(HAVE_MAGICKXX, Magick++-config, yes) - if test $HAVE_MAGICKXX ; then - STATUS="$STATUS, ImageMagick++" - AC_SUBST(DEFHAVE_MAGICKXX) - DEFHAVE_MAGICKXX="HAVE_MAGICKXX=1" - else - STATUS="$STATUS, ImageMagick++ not found" - fi - - -fi - -dnl Append the status message to the global status message. This will -dnl be displayed at the end of configuration so that the user doesn't -dnl have to scan the list for critical details. - -STATUS_MSG="$STATUS_MSG - read/write image formats: $STATUS" diff --git a/src/configure.base b/src/configure.base --- a/src/configure.base +++ b/src/configure.base @@ -326,170 +326,45 @@ ;; esac -dnl Things needed to link to X11 programs -dnl defines X_CFLAGS, X_LIBS -AC_SUBST(DEFHAVE_X) -AC_SUBST(X_LIBS) -AC_SUBST(X_CFLAGS) -AC_PATH_XTRA -if test "$no_x" = yes ; then - DEFHAVE_X= - XSTATUS="no (plot/g{input,text,zoom,rab} will not work)" +AC_DEFINE(have_jpeg) +AC_CHECK_HEADER(jpeglib.h, have_jpeg=yes, have_jpeg=no) +if test $have_jpeg = yes ; then + OF_CHECK_LIB(jpeg, jpeg_std_error, have_jpeg=yes, have_jpeg=no) + if test $have_jpeg = no ; then + IMAGESTATUS="libjpeg not found" + else + IMAGESTATUS="jpeg" + AC_SUBST(DEFHAVE_JPEG) + DEFHAVE_JPEG="HAVE_JPEG=1" + fi else - DEFHAVE_X="HAVE_X=1" - X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" - XSTATUS="yes" + IMAGESTATUS="jpeglib.h not found" fi -OCTAVE_CHECK_EXIST(autoload,[ - HAVE_AUTOLOAD="yes" - OCTLINK=.octlink - MKOCTLINK=$TOPDIR/admin/octlink.sh -],[ - HAVE_AUTOLOAD="no" - OCTLINK=.oct - MKOCTLINK=$LN_S -]) -AC_SUBST(HAVE_AUTOLOAD) -AC_SUBST(OCTLINK) -AC_SUBST(MKOCTLINK) - -OCTAVE_CHECK_EXIST(do_fortran_indexing, - [HAVE_DO_FORTRAN_INDEXING="-DHAVE_DO_FORTRAN_INDEXING"],) -AC_SUBST(HAVE_DO_FORTRAN_INDEXING) - -OCTAVE_CHECK_EXIST(propagate_empty_matrices, - [PROPAGATE_EMPTY_MATRICES="-DHAVE_PROPAGATE_EMPTY_MATRICES"],) -AC_SUBST(HAVE_PROPAGATE_EMPTY_MATRICES) - -OCTAVE_CHECK_EXIST(ok_to_lose_imaginary_part, - [HAVE_OK_TO_LOSE_IMAGINARY_PART="-DHAVE_OK_TO_LOSE_IMAGINARY_PART"],) -AC_SUBST(HAVE_OK_TO_LOSE_IMAGINARY_PART) - -dnl Test for N-dimensional Arrays -TRY_MKOCTFILE([for N-dim arrays], -[#include ], -[HAVE_ND_ARRAYS="-DHAVE_ND_ARRAYS"],) -AC_SUBST(HAVE_ND_ARRAYS) - -OCTAVE_CHECK_EXIST(class,[TYPEID_HAS_CLASS="-DTYPEID_HAS_CLASS"],) -AC_SUBST(TYPEID_HAS_CLASS) - -dnl Test for load/save functions in class -TRY_MKOCTFILE([for load/save functions in class], -[#include -int main (void) { octave_scalar a; a.load_ascii(std::cin); }], -[CLASS_HAS_LOAD_SAVE="-DCLASS_HAS_LOAD_SAVE"],) -AC_SUBST(CLASS_HAS_LOAD_SAVE) - -TRY_MKOCTFILE([for Octave_map indexing], -[#include -int main(void) { Octave_map a; a[["key"]]; }], -[HAVE_OCTAVE_MAP_INDEX="-DHAVE_OCTAVE_MAP_INDEX"],) -AC_SUBST(HAVE_OCTAVE_MAP_INDEX) - -TRY_MKOCTFILE([for old Octave concatenation], -[#include -int main(void) { NDArray a(dim_vector(1,1)); Array idx(2,0); a=concat(a,a,idx); }], -[HAVE_OCTAVE_CONCAT="-DHAVE_OLD_OCTAVE_CONCAT"],) - -TRY_MKOCTFILE([for Octave concatenation], -[#include -int main(void) { NDArray a(dim_vector(1,1)); Array idx(2,0); a=a.concat(a,idx); }], -[HAVE_OCTAVE_CONCAT="-DHAVE_OCTAVE_CONCAT"],) -AC_SUBST(HAVE_OCTAVE_CONCAT) - -TRY_MKOCTFILE([for swap_8_bytes], -[#include -#include -#include -int main(void) {long long a = 1; swap_8_bytes (&a,1);}],, -[HAVE_SWAP_BYTES="-DHAVE_SWAP_BYTES"]) -AC_SUBST(HAVE_SWAP_BYTES) - -TRY_MKOCTFILE([for op_uplus], -[#include -#include -int main(void) {int i = octave_value::op_uplus;}], -[HAVE_OCTAVE_UPLUS="-DHAVE_OCTAVE_UPLUS"],) -AC_SUBST(HAVE_OCTAVE_UPLUS) - -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.* +AC_DEFINE(have_png) +AC_CHECK_HEADER(png.h, have_png=yes, have_png=no) +if test $have_png = yes ; then + OF_CHECK_LIB(png, png_set_sig_bytes, have_png=yes, have_png=no) + if test $have_png = no ; then + IMAGESTATUS="$IMAGESTATUS, libpng not found" + else + IMAGESTATUS="$IMAGESTATUS, png" + AC_SUBST(DEFHAVE_PNG) + DEFHAVE_PNG="HAVE_PNG=1" + fi +else + IMAGESTATUS="$IMAGESTATUS, png.h not found" fi -dnl Test for the texi2dvi program -AC_CHECK_PROG(TEXI2DVI,texi2dvi,texi2dvi) -if [ test -n "$TEXI2DVI" ]; then - dnl Check whether the texi2dvi command accepts the - dnl "--clean" option - cat > conftest.texi <