From 081a6a408851a47994fcfd06b8e4486f8a5eaf02 Mon Sep 17 00:00:00 2001 From: steve Date: Sun, 15 Feb 2004 03:17:36 +0000 Subject: [PATCH] Cleanup configure detection of win32. --- aclocal.m4 | 19 ++++++++++++++++++- cadpli/configure.in | 5 +++-- configure.in | 16 +++------------- libveriuser/configure.in | 1 - tgt-fpga/configure.in | 16 +++------------- tgt-vvp/configure.in | 16 +++------------- vpi/configure.in | 16 +++------------- vpip/configure.in | 12 +++--------- vvp/configure.in | 5 +++-- 9 files changed, 39 insertions(+), 67 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index c5a24a876..91388b322 100644 --- a/aclocal.m4 +++ b/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.2 2004/01/15 06:05:20 steve Exp $" +#ident "$Id: aclocal.m4,v 1.3 2004/02/15 03:17:36 steve Exp $" ],[while (0) {}], [AS_VAR_SET(ax_cv_cpp_ident, yes)], [AS_VAR_SET(ax_cv_cpp_ident, no)])]) @@ -67,3 +67,20 @@ if test $ax_cv_c_underscores_trailing = yes; then fi ])# AX_C_UNDERSCORES_TRAILING +# AX_WIN32 +# -------- +# Combined check for several flavors of Microsoft Windows so +# their "issues" can be dealt with +AC_DEFUN([AX_WIN32], +[AC_CYGWIN +AC_MINGW32 +WIN32=no +AC_MSG_CHECKING([for Microsoft Windows]) +if test "$CYGWIN" = "yes" -o "$MINGW32" = "yes" +then + WIN32=yes +fi +AC_SUBST(MINGW32) +AC_SUBST(WIN32) +AC_MSG_RESULT($WIN32) +])# AX_WIN32 diff --git a/cadpli/configure.in b/cadpli/configure.in index e10b43c5f..fd1e28438 100644 --- a/cadpli/configure.in +++ b/cadpli/configure.in @@ -4,11 +4,12 @@ AC_PROG_CC AC_PROG_CXX AC_CHECK_TOOL(STRIP, strip, true) -AC_CYGWIN AC_EXEEXT -AC_MINGW32 AC_SUBST(EXEEXT) +# Combined check for Microsoft-related bogosities; sets WIN32 if found +AX_WIN32 + AC_PROG_INSTALL # vvp32 is by default disabled diff --git a/configure.in b/configure.in index c66acc06d..f82f3c8c3 100644 --- a/configure.in +++ b/configure.in @@ -35,22 +35,12 @@ then exit 1 fi -AC_CYGWIN AC_EXEEXT -AC_MINGW32 - -WIN32=no -AC_MSG_CHECKING("Checking for windows") -if test "$CYGWIN" = "yes" -o "$MINGW32" = "yes" -then - WIN32=yes -fi - -AC_SUBST(MINGW32) -AC_SUBST(WIN32) -AC_MSG_RESULT($WIN32) AC_SUBST(EXEEXT) +# Combined check for Microsoft-related bogosities; sets WIN32 if found +AX_WIN32 + # vvp32 is by default disabled #enable_vvp32=no AC_SUBST(enable_vvp32) diff --git a/libveriuser/configure.in b/libveriuser/configure.in index a9ceb220e..a5c80936b 100644 --- a/libveriuser/configure.in +++ b/libveriuser/configure.in @@ -5,7 +5,6 @@ AC_PROG_CC AC_PROG_INSTALL AC_PROG_RANLIB -AC_CYGWIN AC_EXEEXT AX_CPP_IDENT diff --git a/tgt-fpga/configure.in b/tgt-fpga/configure.in index cb5b39653..a61d602d4 100644 --- a/tgt-fpga/configure.in +++ b/tgt-fpga/configure.in @@ -9,8 +9,9 @@ AC_PROG_INSTALL AC_CANONICAL_HOST # $host -AC_CYGWIN -AC_SUBST(CYGWIN) +# Combined check for Microsoft-related bogosities; sets WIN32 if found +AX_WIN32 + AC_CHECK_HEADERS(malloc.h) # Darwin requires -no-cpp-precomp @@ -64,17 +65,6 @@ esac AC_SUBST(shared) AC_MSG_RESULT($shared) -AC_MSG_CHECKING("for Win32") -WIN32=no -case "${host}" in - - *-*-cygwin*) - WIN32=yes - ;; -esac -AC_SUBST(WIN32) -AC_MSG_RESULT($WIN32) - AX_CPP_IDENT AC_OUTPUT(Makefile) diff --git a/tgt-vvp/configure.in b/tgt-vvp/configure.in index c6ff0fab3..619135ed5 100644 --- a/tgt-vvp/configure.in +++ b/tgt-vvp/configure.in @@ -10,8 +10,9 @@ AC_PROG_INSTALL AC_CANONICAL_HOST # $host -AC_CYGWIN -AC_SUBST(CYGWIN) +# Combined check for Microsoft-related bogosities; sets WIN32 if found +AX_WIN32 + AC_CHECK_HEADERS(malloc.h) # Do some operating system specific setup. @@ -72,17 +73,6 @@ esac AC_SUBST(shared) AC_MSG_RESULT($shared) -AC_MSG_CHECKING("for Win32") -WIN32=no -case "${host}" in - - *-*-cygwin*) - WIN32=yes - ;; -esac -AC_SUBST(WIN32) -AC_MSG_RESULT($WIN32) - AX_CPP_IDENT AC_OUTPUT(Makefile) diff --git a/vpi/configure.in b/vpi/configure.in index de5f9e8c1..9a9865386 100644 --- a/vpi/configure.in +++ b/vpi/configure.in @@ -14,22 +14,12 @@ then exit 1 fi -AC_CYGWIN AC_EXEEXT -AC_MINGW32 - -WIN32=no -AC_MSG_CHECKING("Checking for windows") -if test "$CYGWIN" = "yes" -o "$MINGW32" = "yes" -then - WIN32=yes -fi - -AC_SUBST(MINGW32) -AC_SUBST(WIN32) -AC_MSG_RESULT($WIN32) AC_SUBST(EXEEXT) +# Combined check for Microsoft-related bogosities; sets WIN32 if found +AX_WIN32 + AX_CPP_IDENT # vvp32 is by default disabled diff --git a/vpip/configure.in b/vpip/configure.in index abc307fe5..174f020dd 100644 --- a/vpip/configure.in +++ b/vpip/configure.in @@ -4,10 +4,11 @@ AC_PROG_CC AC_CHECK_TOOL(STRIP, strip, true) AC_PROG_INSTALL - -AC_CYGWIN AC_EXEEXT +AC_SUBST(EXEEXT) +# Combined check for Microsoft-related bogosities; sets WIN32 if found +AX_WIN32 # Darwin requires -no-cpp-precomp case "${host}" in @@ -17,14 +18,12 @@ case "${host}" in ;; esac -WIN32=no AC_MSG_CHECKING("for shared library link flag") shared=-shared EXTRALIBS= case "${host}" in *-*-cygwin*) shared="-shared -Wl,--enable-auto-image-base" - WIN32=yes ;; *-*-hpux*) shared="-b" @@ -38,12 +37,7 @@ case "${host}" in esac AC_SUBST(shared) AC_MSG_RESULT($shared) -AC_MSG_CHECKING("for win 32") -AC_SUBST(WIN32) -AC_MSG_RESULT($WIN32) -AC_SUBST(WIN32) -AC_SUBST(EXEEXT) AC_SUBST(shared) AC_SUBST(EXTRALIBS) diff --git a/vvp/configure.in b/vvp/configure.in index 7c2a652e4..6cc76f4d8 100644 --- a/vvp/configure.in +++ b/vvp/configure.in @@ -6,11 +6,12 @@ AC_PROG_CXX AC_PROG_RANLIB AC_CHECK_TOOL(STRIP, strip, true) -AC_CYGWIN AC_EXEEXT -AC_MINGW32 AC_SUBST(EXEEXT) +# Combined check for Microsoft-related bogosities; sets WIN32 if found +AX_WIN32 + # vvp32 is by default disabled #enable_vvp32=no AC_SUBST(enable_vvp32)