Update of /cvsroot/pure-data/externals/zexy/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20690

Modified Files: Make.config.in configure.ac zexy.c zexy.h Removed Files: zexyconf.h Log Message: 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

Index: configure.ac =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/configure.ac,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** configure.ac 14 Mar 2007 09:08:55 -0000 1.27 --- configure.ac 22 Oct 2007 10:18:48 -0000 1.28 *************** *** 11,14 **** --- 11,15 ---- AC_SUBST(STK) AC_SUBST(CFLAGS) + AC_SUBST(DEFS) AC_SUBST(DFLAGS) AC_SUBST(LFLAGS)

--- zexyconf.h DELETED ---

Index: zexy.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/zexy.c,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** zexy.c 5 Jul 2007 14:51:23 -0000 1.18 --- zexy.c 22 Oct 2007 10:18:48 -0000 1.19 *************** *** 133,138 **** { int i; ! z_zexy_setup(); ! /* ************************************** */ startpost("\n\t"); for (i=0; i<28; i++) startpost("%c", HEARTSYMBOL); --- 133,137 ---- { int i; ! startpost("\n\t"); for (i=0; i<28; i++) startpost("%c", HEARTSYMBOL); *************** *** 150,153 **** --- 149,155 ----

zexy_register("zexy"); + + /* ************************************** */ + z_zexy_setup(); }

Index: zexy.h =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/zexy.h,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** zexy.h 8 Mar 2007 13:10:54 -0000 1.25 --- zexy.h 22 Oct 2007 10:18:48 -0000 1.26 *************** *** 40,50 **** #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/...) */ ! #ifndef INCLUDE_ZEXYCONF_H__ # include "zexyconf.h" ! #endif /* INCLUDE_ZEXYCONF_H__ */

#include "m_pd.h" --- 40,50 ---- #endif

! /* ! * to use the zexyconf.h compile-time configurations, you have to set HAVE_CONFIG_H ! * usually this is done in Make.config by configure */ ! #ifdef HAVE_CONFIG_H # include "zexyconf.h" ! #endif /* HAVE_CONFIG_H */

#include "m_pd.h" *************** *** 122,130 **** #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! */ # define z_verbose --- 122,126 ---- #else /* ! * on older version we just shut up! */ # define z_verbose

Index: Make.config.in =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/Make.config.in,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Make.config.in 14 Mar 2007 09:08:55 -0000 1.7 --- Make.config.in 22 Oct 2007 10:18:48 -0000 1.8 *************** *** 12,16 ****

EXT = @EXT@ ! DEFS = @DFLAGS@ IFLAGS = -I. @INCLUDES@

--- 12,16 ----

EXT = @EXT@ ! DEFS = @DFLAGS@ @DEFS@ IFLAGS = -I. @INCLUDES@