diff options
| author | IOhannes m zmölnig <zmoelnig@users.sourceforge.net> | 2006-07-25 14:11:31 +0000 |
|---|---|---|
| committer | IOhannes m zmölnig <zmoelnig@users.sourceforge.net> | 2006-07-25 14:11:31 +0000 |
| commit | 43c7ec7dd8d4efc9a3ab556f44b41b15a43f1084 (patch) | |
| tree | 679017e4be7bdfeefbe49f95c7ab0806f37aed5a /src | |
| parent | 861a3fcd22eeacc76497bcc96bbbfdae67f95f34 (diff) | |
we no longer support a different help-file location for pd<0.37; now everything goes into extra/iemmatrix/ (also the binary!)
svn path=/trunk/externals/iem/iemmatrix/; revision=5405
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.in | 4 | ||||
| -rw-r--r-- | src/configure.ac | 52 |
2 files changed, 2 insertions, 54 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index ac80b61..6512897 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -2,8 +2,8 @@ LIBNAME =iemmatrix PREFIX =@prefix@@PDLIBDIR@ -INSTALL_BIN=$(PREFIX)/extra -INSTALL_DOC=$(PREFIX)/@REFERENCEPATH@$(LIBNAME) +INSTALL_BIN=$(PREFIX)/extra/$(LIBNAME) +INSTALL_DOC=$(INSTALL_BIN) EXT = @EXT@ DEFS = @DFLAGS@ diff --git a/src/configure.ac b/src/configure.ac index c3119b9..03036be 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -16,8 +16,6 @@ AC_SUBST(REFERENCEPATH) AC_SUBST(PDLIBDIR) AC_SUBST(INCLUDES) - -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)]) AC_ARG_WITH(pdpath, [ --with-pd=</path/to/pd> where to look for pd-headers and and -libs]) @@ -203,56 +201,6 @@ then EXT=$with_extension fi - -dnl Checks for pd-version, to set the correct help-path -AC_MSG_CHECKING("pd\>=0.37") - -if test "$with_pdversion" != "" -then -echo -n "($with_pdversion)... " - PD_VERSION="$with_pdversion" -else -if test "x$cross_compiling" = "xno" -then - -cat > conftest.c << EOF -#include <stdio.h> -#include "m_pd.h" -int main(){ - printf("%d.%d\n", PD_MAJOR_VERSION, PD_MINOR_VERSION); - return 0; -} -EOF - - if $CC $INCLUDES -o conftest.o conftest.c > /dev/null 2>&1 - then - PD_VERSION=`./conftest.o` - else - PD_VERSION="" - fi - echo -n $PD_VERSION -else -dnl we are cross-compiling... - echo -n "(X)..." - PD_VERSION="0.38" -fi -fi - -let PD_MAJORVERSION=`echo $PD_VERSION | cut -d"." -f1`+0 -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") |