aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIOhannes m zmölnig <zmoelnig@users.sourceforge.net>2007-10-22 10:18:48 +0000
committerIOhannes m zmölnig <zmoelnig@users.sourceforge.net>2007-10-22 10:18:48 +0000
commit21ff032fa838b3aa2adf2db77ce2a27d12813c4b (patch)
treed3adaaa5680bffa594b6c9c07d9cbdfcb1bd26b7
parentfb31e01fd646ef0538a3c54ab1a52e4c51a043b8 (diff)
removed zexyconf.h as it was too easy to enable the wrong stuff when not
using copnfigure (e.g. in ./externals/build/src) instead we just do it ordinarily: configure will define HAVE_CONFIG_H in Make.config, and if this is set we include zexyconf.h, else we don't svn path=/trunk/externals/zexy/; revision=8857
-rw-r--r--src/Make.config.in2
-rw-r--r--src/configure.ac1
-rw-r--r--src/zexy.c6
-rw-r--r--src/zexy.h16
-rw-r--r--src/zexyconf.h21
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)
diff --git a/src/zexy.c b/src/zexy.c
index 0d8311b..62bc003 100644
--- a/src/zexy.c
+++ b/src/zexy.c
@@ -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, ...){
diff --git a/src/zexy.h b/src/zexy.h
index 091fd5e..357b412 100644
--- a/src/zexy.h
+++ b/src/zexy.h
@@ -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_ */
-