Mingw needs -liberty, but Cygwin cannot tolerate it.

aclocal.m4

@@ -14,7 +14,7 @@
 AC_DEFUN([AX_CPP_IDENT],
 [AC_CACHE_CHECK([for ident support in C compiler], ax_cv_cpp_ident,
 [AC_TRY_COMPILE([
-#ident "$Id: aclocal.m4,v 1.3 2004/02/15 03:17:36 steve Exp $"
+#ident "$Id: aclocal.m4,v 1.4 2004/03/11 06:06:59 steve Exp $"
 ],[while (0) {}],
 [AS_VAR_SET(ax_cv_cpp_ident, yes)],
 [AS_VAR_SET(ax_cv_cpp_ident, no)])])
@@ -84,3 +84,20 @@ AC_SUBST(MINGW32)
 AC_SUBST(WIN32)
 AC_MSG_RESULT($WIN32)
 ])# AX_WIN32
+
+# AX_LD_EXTRALIBS
+# ---------------
+# mingw needs to link with libiberty.a, but cygwin alone can't tolerate it
+AC_DEFUN([AX_LD_EXTRALIBS],
+[AC_MSG_CHECKING([for extra libs needed])
+EXTRALIBS=
+case "${host}" in
+     *-*-cygwin* )
+        if test "$MINGW32" = "yes"; then
+            EXTRALIBS="-liberty"
+        fi
+        ;;
+esac
+AC_SUBST(EXTRALIBS)
+AC_MSG_RESULT($EXTRALIBS)
+])# AX_LD_EXTRALIBS

cadpli/Makefile.in

@@ -16,7 +16,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.9 2004/02/10 19:25:00 steve Exp $"
+#ident "$Id: Makefile.in,v 1.10 2004/03/11 06:06:59 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -75,7 +75,7 @@ O = cadpli.o
 
 SYSTEM_VPI_LDFLAGS = -L../vvp -lvpi
 ifeq (@WIN32@,yes)
-    SYSTEM_VPI_LDFLAGS += -liberty
+    SYSTEM_VPI_LDFLAGS += @EXTRALIBS@
 endif
 
 cadpli.vpl: $O ../vvp/libvpi.a ../libveriuser/libveriuser.o

cadpli/configure.in

@@ -119,15 +119,7 @@ esac
 AC_SUBST(shared)
 AC_MSG_RESULT($shared)
 
-AC_MSG_CHECKING("for extra libs needed")
-EXTRALIBS=
-case "${host}" in
-     *-*-cygwin*)
-	EXTRALIBS="-liberty"
-	;;
-esac
-AC_SUBST(EXTRALIBS)
-AC_MSG_RESULT($EXTRALIBS)
+AX_LD_EXTRALIBS
 
 #######################
 ## test for underscores. The vpi module loader in vvm needs to know this

configure.in

@@ -111,18 +111,8 @@ AC_SUBST(PICFLAG)
 AC_MSG_RESULT($PICFLAG)
 
 
-# mingw needs to link with libiberty.a, cygwin can tolerate it
-
-AC_MSG_CHECKING(for extra libs needed)
-EXTRALIBS=
-case "${host}" in
-     *-*-cygwin*)
-	EXTRALIBS="-liberty"
-	;;
-esac
-AC_SUBST(EXTRALIBS)
-AC_MSG_RESULT($EXTRALIBS)
-   
+AX_LD_EXTRALIBS
+ 
 # Darwin requires -no-cpp-precomp
 case "${host}" in
     *-*-darwin*)

vpi/Makefile.in

@@ -16,7 +16,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.53 2004/02/10 19:25:01 steve Exp $"
+#ident "$Id: Makefile.in,v 1.54 2004/03/11 06:06:59 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -74,7 +74,7 @@ endif
 LIBS = @LIBS@
 SYSTEM_VPI_LDFLAGS = $(LIBS)
 ifeq (@WIN32@,yes)
-    SYSTEM_VPI_LDFLAGS += -liberty
+    SYSTEM_VPI_LDFLAGS += @EXTRALIBS@
 endif
 
 system.vpi: $O ../vvp/libvpi.a

vpi/configure.in

@@ -96,19 +96,8 @@ esac
 AC_SUBST(PICFLAG)
 AC_MSG_RESULT($PICFLAG)
 
+AX_LD_EXTRALIBS
 
-# mingw needs to link with libiberty.a, cygwin can tolerate it
-
-AC_MSG_CHECKING("for extra libs needed")
-EXTRALIBS=
-case "${host}" in
-     *-*-cygwin*)
-	EXTRALIBS="-liberty"
-	;;
-esac
-AC_SUBST(EXTRALIBS)
-AC_MSG_RESULT($EXTRALIBS)
-   
 # Darwin requires -no-cpp-precomp
 case "${host}" in
     *-*-darwin*)

vvp/configure.in

@@ -113,15 +113,7 @@ esac
 AC_SUBST(rdynamic)
 AC_MSG_RESULT($rdynamic)
 
-AC_MSG_CHECKING(for extra libs needed)
-EXTRALIBS=
-case "${host}" in
-     *-*-cygwin*)
-	EXTRALIBS="-liberty"
-	;;
-esac
-AC_SUBST(EXTRALIBS)
-AC_MSG_RESULT($EXTRALIBS)
+AX_LD_EXTRALIBS
 
 #######################
 ## test for underscores. The vpi module loader in vvm needs to know this