--- parser3/configure.ac	2018/10/15 15:41:45	1.25
+++ parser3/configure.ac	2020/12/07 20:55:55	1.39
@@ -85,11 +85,16 @@ AC_ARG_WITH(assertions, [  --with-assert
 	AC_DEFINE(NDEBUG,,assertions disabled)
 )
 
-AC_ARG_WITH(sjlj-exceptions,[  --with-sjlj-exceptions  enable simple 'throw' from dynamic library],
+AC_ARG_WITH(sjlj-exceptions, [  --with-sjlj-exceptions  to enable simple 'throw' from dynamic library],
 	AC_DEFINE(PA_WITH_SJLJ_EXCEPTIONS,,one can throw from dynamic library)
 )
 
 
+AC_ARG_WITH(system-cfg, [  --with-system-cfg=FILE  to specify system-wide auto.p],
+	AC_DEFINE_UNQUOTED(SYSTEM_CONFIG_FILE,"$withval",system-wide auto.p)
+)
+
+
 dnl Safe mode argument
 AC_ARG_ENABLE(safe-mode, [  --disable-safe-mode	  to enable reading and executing
                           files belonging to group+user other then effective],
@@ -118,8 +123,8 @@ fi
 
 
 dnl String stream argument
-AC_ARG_ENABLE(stringstream, [  --disable-stringstream  to disable stringstream usage.
-                          when disabled table.save use more memory but it's safer on freebsd 4.x],
+AC_ARG_ENABLE(stringstream, [  --disable-stringstream to disable stringstream usage.
+                          when disabled table.save uses more memory, but more compilers are supported],
 [
 if test "$enableval" = "no"; then
 	AC_MSG_WARN(disabling stringstream usage)
@@ -130,7 +135,7 @@ fi
 
 
 dnl GC argument
-AC_ARG_WITH(gc,[  --with-gc[=D]             D is the directory where
+AC_ARG_WITH(gc,[  --with-gc[=DIR]           DIR is the directory where
                           Boehm garbage collecting library is installed],[
 
 	GC=$withval
@@ -161,7 +166,7 @@ if test -z "$GC_OK"; then
 	,
 		AC_MSG_RESULT(no)
 		if test -z "$GC"; then
-			AC_MSG_ERROR(please specify path to libgc: --with-gc=D)
+			AC_MSG_ERROR(please specify path to libgc: --with-gc=DIR)
 		else
 			AC_MSG_ERROR($GC does not seem to be valid libgc installation directory)
 		fi
@@ -173,7 +178,7 @@ AC_SUBST(GC_LIBS)
 
 
 dnl PCRE argument
-AC_ARG_WITH(pcre,[  --with-pcre=D           D is the directory where
+AC_ARG_WITH(pcre,[  --with-pcre=DIR         DIR is the directory where
                           PCRE library is installed],[
 	PCRE=$withval
 	PCRE_INCLUDES="-I$PCRE/include"
@@ -206,7 +211,7 @@ if test -z "$PCRE_OK"; then
 	,
 		AC_MSG_RESULT(no)
 		if test -z "$PCRE"; then
-			AC_MSG_ERROR(please specify path to PCRE: --with-pcre=D)
+			AC_MSG_ERROR(please specify path to PCRE: --with-pcre=DIR)
 		else
 			AC_MSG_ERROR($PCRE does not seem to be valid PCRE installation directory)
 		fi
@@ -219,7 +224,7 @@ AC_SUBST(PCRE_LIBS)
 
 
 dnl XML/XSLT argument
-AC_ARG_WITH(xml,[  --with-xml=D            D is the directory where
+AC_ARG_WITH(xml,[  --with-xml=DIR          DIR is the directory where
                           Gnome XML libraries are installed],[
 
 	XML=$withval
@@ -249,7 +254,7 @@ AC_ARG_WITH(xml,[  --with-xml=D
 		,
 			AC_MSG_RESULT(no)
 			if test -z "$XML"; then
-				AC_MSG_ERROR(please specify path to Gnome XML libraries: --with-xml=D)
+				AC_MSG_ERROR(please specify path to Gnome XML libraries: --with-xml=DIR)
 			else
 				AC_MSG_ERROR($XML does not seem to be valid Gnome XML installation directory)
 			fi
@@ -264,7 +269,7 @@ AC_SUBST(XML_LIBS)
 
 
 dnl Mail receive argument
-AC_ARG_WITH(mailreceive,[  --with-mailreceive=D is the directory where
+AC_ARG_WITH(mailreceive,[  --with-mailreceive=DIR  is the directory where
                           Gnome MIME library is installed],[
 	MIME=$withval
 	GLIB="glib-2.0"
@@ -274,6 +279,11 @@ AC_ARG_WITH(mailreceive,[  --with-mailre
 		MIME=""
 		MIME_INCLUDES=`pkg-config --cflags $GMIME 2>/dev/null`
 		MIME_LIBS=`pkg-config --libs $GMIME 2>/dev/null`
+		if test -z "$MIME_LIBS"; then
+			GMIME="gmime-3.0"
+			MIME_INCLUDES=`pkg-config --cflags $GMIME 2>/dev/null`
+			MIME_LIBS=`pkg-config --libs $GMIME 2>/dev/null`
+		fi
 		AC_MSG_WARN([--with-mailreceive value was not specified, hoping linker would find Gnome MIME library])
 	else
 		MIME_INCLUDES="-I$MIME/include/$GMIME"
@@ -299,7 +309,7 @@ AC_ARG_WITH(mailreceive,[  --with-mailre
 		,
 			AC_MSG_RESULT(no)
 			if test -z "$MIME"; then
-				AC_MSG_ERROR(please specify path to Gnome MIME library: --with-mailreceive=D)
+				AC_MSG_ERROR(please specify path to Gnome MIME library: --with-mailreceive=DIR)
 			else
 				AC_MSG_ERROR($MIME does not seem to be valid Gnome MIME installation directory)
 			fi
@@ -389,7 +399,10 @@ AC_CHECK_HEADERS(sys/socket.h netinet/in
 dnl Checks for libraries
 case "$host" in
   *-freebsd4*)
-	  AC_DEFINE(FREEBSD4,,FreeBSD4X target platform)
+	  AC_DEFINE(FREEBSD4,,FreeBSD4.X target platform)
+  ;;
+  *-freebsd1*)
+	  AC_DEFINE(FREEBSD1X,,FreeBSD1X.X target platform)
   ;;
   *-sunos5.6* | *-solaris2.6*)
 	  AC_CHECK_LIB(xnet, main)
@@ -499,5 +512,4 @@ AC_OUTPUT(
 	src/targets/isapi/Makefile
 	etc/Makefile
 	etc/parser3.charsets/Makefile
-	bin/Makefile
-	bin/auto.p.dist)
+	etc/auto.p)