--- parser3/src/targets/cgi/Makefile.am	2003/03/05 13:16:20	1.46.2.2
+++ parser3/src/targets/cgi/Makefile.am	2020/12/11 14:17:35	1.72
@@ -1,18 +1,18 @@
-#this read configure.in comment on stdc++ about next line
-if DO_NOT_LINK_LIBSTDCPP
-CXXLDtrue=$(CC)
-else
-CXXLDfalse=$(CXX)
-endif
+# Parser has circular library dependencies, thus libmain.a is linked twice and --preserve-dup-deps libtool option is used
+PA_LIBS = ../../main/.libs/libmain.a ../../classes/.libs/libclasses.a ../../types/.libs/libtypes.a ../../main/.libs/libmain.a \
+	  ../../lib/gd/libgd.la ../../lib/cord/libcord.la ../../lib/md5/libmd5.la ../../lib/sdbm/libsdbm.la \
+	  ../../lib/pcre/libpcre_internal.la ../../lib/smtp/libsmtp.la ../../lib/json/libjson.la \
+	  ../../lib/punycode/libpunycode.la ../../lib/memcached/libmemcached.la
 
-CXXLD=$(CXXLDtrue) $(CXXLDfalse)
+AM_CPPFLAGS = -I../../classes -I../../types @PCRE_INCLUDES@ @XML_INCLUDES@
 
-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 ../../types/libtypes.a ../../main/libmain.a ../../classes/gd/libgd.a ../../lib/pcre/libpcre.a ../../lib/md5/libmd5.a $(LIBLTDL)
+# Automake 1.9 does not support LIBTOOLFLAGS
+CXXLINK = $(LIBTOOL) --preserve-dup-deps --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+
+noinst_HEADERS = pa_sapi_info.h
 
 bin_PROGRAMS = parser3
-noinst_HEADERS = getopt.h
 parser3_DEPENDENCIES=Makefile $(PA_LIBS)
-parser3_SOURCES = pa_threads.C parser3.C getopt.c
-parser3_LDADD= $(PA_LIBS) $(LIBADD_DL) @XML_LIBS@ @MIME_LIBS@
-EXTRA_DIST = parser3.dsp
+parser3_SOURCES = parser3.C
+parser3_LDADD = $(PA_LIBS) $(LIBLTDL) @GC_LIBS@ @PCRE_LIBS@ @XML_LIBS@ @MIME_LIBS@
+EXTRA_DIST = parser3.vcproj