--- parser3/src/targets/cgi/Makefile.am	2003/01/09 16:49:47	1.46
+++ parser3/src/targets/cgi/Makefile.am	2003/03/26 13:47:00	1.46.2.5.2.1
@@ -1,18 +1,14 @@
-#this read configure.in comment on stdc++ about next line
-if DO_NOT_LINK_LIBSTDCPP
-CXXLDtrue=$(CC)
-else
-CXXLDfalse=$(CXX)
-endif
+#by default c++ when running linker adds -lstdc++ (and -lm) which overrides 
+#our [default] setting of linking that that lib should be linked statically
+#so we're switching linker to gcc, which does not add anything
+CXXLD=$(CC)
 
-CXXLD=$(CXXLDtrue) $(CXXLDfalse)
-
-INCLUDES = -I../../classes -I../../types -I../../sql -I../../lib/pcre -I../../lib/md5 -I$(INCLTDL) @XML_INCLUDES@
-PA_LIBS = ../../main/libmain.a ../../classes/libclasses.a ../../main/libmain.a ../../types/libtypes.a ../../classes/gd/libgd.a ../../lib/pcre/libpcre.a ../../lib/md5/libmd5.a $(LIBLTDL)
+INCLUDES = -I../../classes -I../../types -I../../sql -I../../lib/gc/include -I../../lib/cord/include -I../../lib/pcre -I../../lib/md5 -I$(INCLTDL) @XML_INCLUDES@
+PA_LIBS = ../../main/libmain.a ../../classes/libclasses.a ../../types/libtypes.a ../../main/libmain.a ../../classes/gd/libgd.a ../../lib/cord/libcord.a ../../lib/pcre/libpcre.a ../../lib/md5/libmd5.a $(LIBLTDL)
 
 bin_PROGRAMS = parser3
-noinst_HEADERS = pool_storage.h getopt.h
+noinst_HEADERS = getopt.h
 parser3_DEPENDENCIES=Makefile $(PA_LIBS)
-parser3_SOURCES = pa_pool.C pa_threads.C parser3.C getopt.c
-parser3_LDADD= $(PA_LIBS) $(LIBADD_DL) @XML_LIBS@ @MIME_LIBS@
+parser3_SOURCES = pa_threads.C parser3.C getopt.c
+parser3_LDADD= $(PA_LIBS) $(LIBADD_DL) @GC_LIBS@ @XML_LIBS@ @MIME_LIBS@ @CPP_LIBS@
 EXTRA_DIST = parser3.dsp