diff --git a/cadpli/Makefile.in b/cadpli/Makefile.in
index 8f39f1c79..436e691e2 100644
--- a/cadpli/Makefile.in
+++ b/cadpli/Makefile.in
@@ -16,7 +16,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.1 2003/02/16 02:23:54 steve Exp $"
+#ident "$Id: Makefile.in,v 1.2 2003/02/22 04:29:14 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -55,7 +55,7 @@ all: cadpli.vpl
 
 O = cadpli.o
 
-SYSTEM_VPI_LDFLAGS = -Wl,-whole-archive ../libveriuser/libveriuser.a -Wl,-no-whole-archive -L../vvp -lvpi
+SYSTEM_VPI_LDFLAGS = @whole_archive@ ../libveriuser/libveriuser.a @no_whole_archive@ -L../vvp -lvpi
 ifeq (@WIN32@,yes)
     SYSTEM_VPI_LDFLAGS += -liberty
 endif
diff --git a/cadpli/configure.in b/cadpli/configure.in
index 197b44613..678d0b279 100644
--- a/cadpli/configure.in
+++ b/cadpli/configure.in
@@ -64,6 +64,8 @@ AC_MSG_RESULT($PICFLAG)
 AC_MSG_CHECKING("for -rdynamic compiler flag")
 
 rdynamic=-rdynamic
+whole_archive=-Wl,-whole-archive
+no_whole_archive=-Wl,-no-whole-archive
 case "${host}" in
 
     *-*-netbsd*)
@@ -84,12 +86,19 @@ case "${host}" in
 
     *-*-darwin*)
 	rdynamic="-Wl,-all_load"
+	whole_archive=""
+	no_whole_archive=""
 	;;
 
 esac
 AC_SUBST(rdynamic)
+AC_SUBST(whole_archive)
+AC_SUBST(no_whole_archive)
 AC_MSG_RESULT($rdynamic)
 
+AC_MSG_CHECKING("for -whole-archive compiler flags")
+AC_MSG_RESULT($whole_archive $no_whole_archive)
+
 AC_MSG_CHECKING("for shared library link flag")
 shared=-shared
 case "${host}" in