--- config.macosx-bigsur	2022-02-07 05:36:13.000000000 -0500
+++ config.macosx	2022-02-24 15:32:37.000000000 -0500
@@ -1,15 +1,16 @@
-COMPILE_OPTS =		$(INCLUDES) -I. -I/usr/local/include $(EXTRA_LDFLAGS) -DBSD=1 -O -DSOCKLEN_T=socklen_t -DHAVE_SOCKADDR_LEN=1 -DTIME_BASE=int -DNEED_XLOCALE_H=1
+ARCHFLAGS =		@ARCHFLAGS@
+COMPILE_OPTS =	$(INCLUDES) -I. $(EXTRA_LDFLAGS) -DBSD=1 -O -DSOCKLEN_T=socklen_t -DHAVE_SOCKADDR_LEN=1 -DTIME_BASE=int -DNEED_XLOCALE_H=1 @CPPFLAGS@
 C =			c
-C_COMPILER =		cc
-C_FLAGS =		$(COMPILE_OPTS)
+C_COMPILER =	@CC@ $(ARCHFLAGS)
+C_FLAGS =		$(COMPILE_OPTS) @CFLAGS@
 CPP =			cpp
-CPLUSPLUS_COMPILER =	c++
-CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) -Wall
+CPLUSPLUS_COMPILER =	@CXX@ $(ARCHFLAGS)
+CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) -Wall @CXXFLAGS@
 OBJ =			o
-LINK =			c++ -o 
-LINK_OPTS =		-L. -L/usr/local/ssl/lib
+LINK =			$(CPLUSPLUS_COMPILER) -o 
+LINK_OPTS =		-L. @LDFLAGS@
 CONSOLE_LINK_OPTS =	$(LINK_OPTS)
-LIBRARY_LINK =		libtool -s -o 
+LIBRARY_LINK =		@LIBTOOL@ -s -o 
 LIBRARY_LINK_OPTS =	
 LIB_SUFFIX =			a
 LIBS_FOR_CONSOLE_APPLICATION = -lssl -lcrypto