* src/ngspice.c src/devices/dev.c: Moved AN_* defines to

configure.in

@@ -244,6 +244,7 @@ src/maths/sparse/Makefile	\
 src/misc/Makefile		\
 src/parser/Makefile		\
 tests/Makefile			\
-tests/resistance/Makefile	\
 tests/filters/Makefile		\
+tests/polezero/Makefile		\
+tests/resistance/Makefile	\
 )

src/analysis/cktpzset.c

@@ -16,11 +16,6 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 #include "sperror.h"
 
 
-#define CKALLOC(var,size,type) \
-    if(size && (!(var =(type *)MALLOC((size)*sizeof(type))))){\
-            return(E_NOMEM);\
-}
-
 int
 CKTpzSetup(register CKTcircuit *ckt, int type)
 {

src/ngspice.c

@@ -3,21 +3,6 @@
 
 #include "conf.h"
 
-/*
- * Analyses
- */
-#define AN_op
-#define AN_dc
-#define AN_tf
-#define AN_ac
-#define AN_tran
-#define AN_pz
-#define AN_disto
-#define AN_noise
-#define AN_sense
-
-#define ANALYSES_USED "op dc tf ac tran pz disto noise sense"
-
 /**********
 Copyright 1990 Regents of the University of California.  All rights reserved.
 **********/

src/spicelib/devices/dev.c

@@ -66,6 +66,22 @@
 
 #define DEVICES_USED "asrc bjt bsim1 bsim2 bsim3 bsim3v2 bsim3v1 cap cccs ccvs csw dio ind isrc jfet ltra mes mos1 mos2 mos3 mos6 res sw tra urc vccs vcvs vsrc"
 
+/*
+ * Analyses
+ */
+#define AN_op
+#define AN_dc
+#define AN_tf
+#define AN_ac
+#define AN_tran
+#define AN_pz
+#define AN_disto
+#define AN_noise
+#define AN_sense
+
+#define ANALYSES_USED "op dc tf ac tran pz disto noise sense"
+
+
 #include "asrc/asrcitf.h"
 #include "bjt/bjtitf.h"
 #include "cap/capitf.h"

tests/Makefile.am

@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = resistance filters
+SUBDIRS = resistance filters polezero
 
 TESTS = \
 	diffpair.cir		\

tests/polezero/.cvsignore

@@ -0,0 +1,2 @@
+Makefile.in
+Makefile

tests/polezero/Makefile.am

@@ -0,0 +1,13 @@
+## Process this file with automake to produce Makefile.in
+
+TESTS = \
+	filt_multistage.cir	\
+	filt_rc.cir
+
+TESTS_ENVIRONMENT = $(SHELL) $(srcdir)/../check.sh $(top_builddir)/src/ngspice
+
+EXTRA_DIST = \
+	$(TESTS)		\
+	$(TESTS:.cir=.out)
+
+MAINTAINERCLEANFILES = Makefile.in

tests/polezero/filt_multistage.cir

@@ -0,0 +1,13 @@
+Multistage filter
+v1 1 0 0 ac 1.0
+r1 1 2 1k
+c1 2 0 10p
+e2 3 0 2 0 10
+r2 3 4 1k
+c2 4 0 1.25p
+e3 5 0 4 0 10
+r3 5 6 1k
+c3 6 0 .02p
+.pz 1 0 6 0 vol pz
+.print pz all
+.end

tests/polezero/filt_rc.cir

@@ -0,0 +1,7 @@
+RC filter
+v1 1 0 0 ac 1.0
+r1 1 2 1k
+c1 2 0 10p
+.pz 1 0 2 0 vol pz
+.print pz all
+.end