[PD-cvs] externals/iem/iemmatrix/src Makefile.in, 1.1.1.1, 1.2 configure.in, 1.2, 1.3
IOhannes m zmölnig
zmoelnig at users.sourceforge.net
Wed May 11 18:50:58 CEST 2005
Update of /cvsroot/pure-data/externals/iem/iemmatrix/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28464/src
Modified Files:
Makefile.in configure.in
Log Message:
modified configure in get MinGW-crosscompilation (for w32) work
added a beautiful INSTALL.txt
Index: Makefile.in
===================================================================
RCS file: /cvsroot/pure-data/externals/iem/iemmatrix/src/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile.in 21 Mar 2005 14:33:31 -0000 1.1.1.1
--- Makefile.in 11 May 2005 16:50:56 -0000 1.2
***************
*** 8,15 ****
EXT = @EXT@
DEFS = @DFLAGS@
! IFLAGS = -I. @INCLUDES@
CC = @CC@
LD = @LD@
AFLAGS =
LFLAGS = @LFLAGS@
--- 8,17 ----
EXT = @EXT@
DEFS = @DFLAGS@
! IFLAGS = -I. @INCLUDES@ $(INCLUDES)
CC = @CC@
LD = @LD@
+ STRIP = @STRIP@
+
AFLAGS =
LFLAGS = @LFLAGS@
***************
*** 20,28 ****
.SUFFIXES: .$(EXT)
! PDCFLAGS = -g -O2 $(DEFS) $(IFLAGS) $(WFLAGS) $(LFLAGS) $(AFLAGS)
! CFLAGS = -g -O2 $(DEFS) $(IFLAGS) $(WFLAGS)
LIBS = @LIBS@
- #LIBS = -lpthread -lm -lc
include Make.source
TARGETS = $(SOURCES:.c=.o)
--- 22,28 ----
.SUFFIXES: .$(EXT)
! CFLAGS = -g -O2 $(DEFS) $(IFLAGS) $(WFLAGS) @CFLAGS@
LIBS = @LIBS@
include Make.source
TARGETS = $(SOURCES:.c=.o)
***************
*** 34,47 ****
$(LIBNAME): $(TARGETS)
$(LD) $(LFLAGS) -o $(LIBNAME).$(EXT) *.o $(LIBS)
! strip @STRIPFLAGS@ $(LIBNAME).$(EXT)
!
! .c.o:
! $(CC) -c -o $@ $(CFLAGS) -DPD $*.c
!
! # cp $@ $*_stat.o
!
! .o.$(EXT):
! $(CC) -o $@ $(PDCFLAGS) -DPD $*.o
!
clean:
--- 34,38 ----
$(LIBNAME): $(TARGETS)
$(LD) $(LFLAGS) -o $(LIBNAME).$(EXT) *.o $(LIBS)
! $(STRIP) @STRIPFLAGS@ $(LIBNAME).$(EXT)
clean:
Index: configure.in
===================================================================
RCS file: /cvsroot/pure-data/externals/iem/iemmatrix/src/configure.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** configure.in 10 May 2005 09:42:03 -0000 1.2
--- configure.in 11 May 2005 16:50:56 -0000 1.3
***************
*** 10,13 ****
--- 10,14 ----
AC_SUBST(EXT)
AC_SUBST(LD)
+ AC_SUBST(STRIP)
AC_SUBST(STRIPFLAGS)
AC_SUBST(IEMMATRIX_VERSION)
***************
*** 19,37 ****
AC_ARG_WITH(pdversion, [ --with-pdversion=<ver> enforce a certain pd-version (e.g. 0.37)])
- if test $includedir
- then
- for id in $includedir
- do
- if test -d $id
- then
- INCLUDES="-I$id $INCLUDES"
- fi
- done
- fi
dnl Checks for libraries.
dnl Replace `main' with a function in -lc:
AC_CHECK_LIB(c, main)
dnl Replace `main' with a function in -lm:
AC_CHECK_LIB(m, main)
--- 20,32 ----
AC_ARG_WITH(pdversion, [ --with-pdversion=<ver> enforce a certain pd-version (e.g. 0.37)])
+ AC_ARG_WITH(version, [ --with-version=<ver> enforce a certain iemmatrix-version (e.g. 0.1)])
+ AC_ARG_WITH(extension, [ --with-extension=<ext> enforce a certain extension for the dynamic library (e.g. dll)])
dnl Checks for libraries.
dnl Replace `main' with a function in -lc:
AC_CHECK_LIB(c, main)
+ AC_CHECK_LIB(crtdll, fclose)
+
dnl Replace `main' with a function in -lm:
AC_CHECK_LIB(m, main)
***************
*** 41,44 ****
--- 36,57 ----
dnl AC_CHECK_LIB(stk, main, STK=yes)
+
+ if test $includedir
+ then
+ for id in $includedir
+ do
+ if test -d $id; then INCLUDES="-I$id $INCLUDES"; fi
+ done
+ fi
+ if test $libdir
+ then
+ for id in $libdir
+ do
+ if test -d $id; then LIBS="-L$id $LIBS"; fi
+ done
+ fi
+
+ AC_CHECK_LIB(pd, nullfn)
+
dnl Checks for header files.
AC_HEADER_STDC
***************
*** 53,57 ****
! LD=ld
DFLAGS=""
--- 66,72 ----
! LD=${LD:=$CC}
! STRIP=${STRIP:=strip}
!
DFLAGS=""
***************
*** 74,85 ****
EXT=pd_darwin
STRIPFLAGS=
- if test "$enable_lpt" = "yes"; then
- AC_MSG_ERROR("lpt not supported on this platform");
- fi
- if test "$enable_lpt" = ""; then
- AC_MSG_WARN("lpt not supported on this platform - disabling");
- enable_lpt="no";
- fi
fi
if test `uname | sed -e 's/^MINGW.*/NT/'` = NT;
then
--- 89,94 ----
EXT=pd_darwin
STRIPFLAGS=
fi
+
if test `uname | sed -e 's/^MINGW.*/NT/'` = NT;
then
***************
*** 91,96 ****
else
PDLIBDIR="/lib/pd"
- LIBS="-lc -lm"
fi
if test `uname -s` = IRIX64;
then
--- 100,105 ----
else
PDLIBDIR="/lib/pd"
fi
+
if test `uname -s` = IRIX64;
then
***************
*** 101,111 ****
dnl DFLAGS="-DUNIX -DIRIX6"
STRIPFLAGS="--strip-unneeded"
- if test "$enable_lpt" = "yes"; then
- AC_MSG_ERROR("lpt not supported on this platform");
- fi
- if test "$enable_lpt" = ""; then
- AC_MSG_WARN("lpt not supported on this platform - disabling");
- enable_lpt="no";
- fi
fi
--- 110,113 ----
***************
*** 117,129 ****
dnl DFLAGS="-DUNIX -DIRIX5"
STRIPFLAGS="--strip-unneeded"
- if test "$enable_lpt" = "yes"; then
- AC_MSG_ERROR("lpt not supported on this platform");
- fi
- if test "$enable_lpt" = ""; then
- AC_MSG_WARN("lpt not supported on this platform - disabling");
- enable_lpt="no";
- fi
fi
dnl Checks for pd-version, to set the correct help-path
AC_MSG_CHECKING("pd\>=0.37")
--- 119,131 ----
dnl DFLAGS="-DUNIX -DIRIX5"
STRIPFLAGS="--strip-unneeded"
fi
+
+ if test "x$with_extension" != "x"
+ then
+ EXT=$with_extension
+ fi
+
+
dnl Checks for pd-version, to set the correct help-path
AC_MSG_CHECKING("pd\>=0.37")
***************
*** 134,137 ****
--- 136,142 ----
PD_VERSION="$with_pdversion"
else
+ if test "x$cross_compiling" = "xno"
+ then
+
cat > conftest.c << EOF
#include <stdio.h>
***************
*** 142,145 ****
--- 147,151 ----
}
EOF
+
if $CC $INCLUDES -o conftest.o conftest.c > /dev/null 2>&1
then
***************
*** 148,151 ****
--- 154,163 ----
PD_VERSION=""
fi
+ echo -n $PD_VERSION
+ else
+ dnl we are cross-compiling...
+ echo -n "(X)..."
+ PD_VERSION="0.38"
+ fi
fi
***************
*** 153,167 ****
let PD_MINORVERSION=`echo $PD_VERSION | cut -d"." -f2`+0
if test "$PD_MAJORVERSION" -gt 0 || test "$PD_MINORVERSION" -ge 37
then
REFERENCEPATH=extra/help-
! echo "yes"
else
REFERENCEPATH=doc/5.reference/
! echo "no"
fi
dnl check for iemmatrix-version (but why...)
AC_MSG_CHECKING("iemmatrix-version")
cat > conftest.c << EOF
#include <stdio.h>
--- 165,191 ----
let PD_MINORVERSION=`echo $PD_VERSION | cut -d"." -f2`+0
+
+
if test "$PD_MAJORVERSION" -gt 0 || test "$PD_MINORVERSION" -ge 37
then
REFERENCEPATH=extra/help-
! echo " yes"
else
REFERENCEPATH=doc/5.reference/
! echo " no"
fi
+
dnl check for iemmatrix-version (but why...)
AC_MSG_CHECKING("iemmatrix-version")
+
+ if test "$with_version" != ""
+ then
+ echo -n "($with_version)... "
+ IEMMATRIX_VERSION="$with_version"
+ else
+
+ if test "x$cross_compiling" = "xno"
+ then
cat > conftest.c << EOF
#include <stdio.h>
***************
*** 181,184 ****
--- 205,213 ----
echo "(unknown)"
fi
+ else
+ IEMMATRIX_VERSION="X"
+ echo "(X)"
+ fi
+ fi
echo "SOURCES = \\"> Make.source
More information about the Pd-cvs
mailing list