diff options
| -rw-r--r-- | src/Make.config.in | 2 | ||||
| -rw-r--r-- | src/configure.ac | 1 | ||||
| -rw-r--r-- | src/zexy.c | 6 | ||||
| -rw-r--r-- | src/zexy.h | 16 | ||||
| -rw-r--r-- | src/zexyconf.h | 21 |
5 files changed, 12 insertions, 34 deletions
diff --git a/src/Make.config.in b/src/Make.config.in index dcc972a..e1748db 100644 --- a/src/Make.config.in +++ b/src/Make.config.in @@ -11,7 +11,7 @@ INSTALL_BIN=$(DESTDIR)$(PREFIX)/lib/pd/extra/$(LIBNAME) INSTALL_DOC=$(DESTDIR)$(PREFIX)/lib/pd/@REFERENCEPATH@$(LIBNAME) EXT = @EXT@ -DEFS = @DFLAGS@ +DEFS = @DFLAGS@ @DEFS@ IFLAGS = -I. @INCLUDES@ CC = @CC@ diff --git a/src/configure.ac b/src/configure.ac index 04101f5..28d5d97 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -10,6 +10,7 @@ AC_PROG_CC AC_SUBST(STK) AC_SUBST(CFLAGS) +AC_SUBST(DEFS) AC_SUBST(DFLAGS) AC_SUBST(LFLAGS) AC_SUBST(EXT) @@ -132,8 +132,7 @@ static void *zexy_new(void) void zexy_setup(void) { int i; - z_zexy_setup(); - /* ************************************** */ + startpost("\n\t"); for (i=0; i<28; i++) startpost("%c", HEARTSYMBOL); endpost(); @@ -149,6 +148,9 @@ void zexy_setup(void) class_addmethod(zexy_class, zexy_help, gensym("help"), 0); zexy_register("zexy"); + + /* ************************************** */ + z_zexy_setup(); } void verbose(int level, const char *fmt, ...){ @@ -39,13 +39,13 @@ # endif #endif -/* usually the re-inclusion magic is done in the header-file itself - * however, we do it outside, so we can force zexyconf.h to not be used - * (e.g. from by definig the INCLUDE_SH1T in externals/build/src/...) +/* + * to use the zexyconf.h compile-time configurations, you have to set HAVE_CONFIG_H + * usually this is done in Make.config by configure */ -#ifndef INCLUDE_ZEXYCONF_H__ +#ifdef HAVE_CONFIG_H # include "zexyconf.h" -#endif /* INCLUDE_ZEXYCONF_H__ */ +#endif /* HAVE_CONFIG_H */ #include "m_pd.h" @@ -121,11 +121,7 @@ static void zexy_register(char*object){object=0;} void verbose(int level, const char *fmt, ...); #else /* - * this might not work on compilers other than gcc - * is it ISO-C99 or just a gnu-cpp thing ? - # define z_verbose(level, format, ...) post(format, ## __VA_ARGS__) - * - * so we make it simpler: on older version we just shut up! + * on older version we just shut up! */ # define z_verbose #endif diff --git a/src/zexyconf.h b/src/zexyconf.h deleted file mode 100644 index e05a568..0000000 --- a/src/zexyconf.h +++ /dev/null @@ -1,21 +0,0 @@ -/* zexyconf.h. Generated from zexyconf.h.in by configure. */ -#ifndef _ZEXYCONF_H_ -#define _ZEXYCONF_H_ - -/* Define if you have the <regex.h> header file. */ -#define HAVE_REGEX_H 1 - -/* Define if you have the <alloca.h> header file. */ -/* #undef HAVE_ALLOCA_H */ - -/* define if you want parallelport-support (direct access to the port address) */ -#define Z_WANT_LPT 1 - -/* define if you have the <linux/ppdev.h> header file. - * (for parport _device_ support) - * you need Z_WANT_LPT for this to have an effect ! - */ -#define HAVE_LINUX_PPDEV_H 1 - -#endif /* _ZEXYCONF_H_ */ - |