From 9fbd42d09b0211bfb97367d35a4d163f0955311e Mon Sep 17 00:00:00 2001 From: Christian Stimming Date: Mon, 28 Aug 2006 11:29:22 +0000 Subject: [PATCH] Move win32 check out of libgsf-1.12.3 configure section into the general configure section git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@14744 57a11ea4-9604-0410-9ed3-97b8803252fd --- configure.in | 74 ++++++++++++++++++++++++++-------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/configure.in b/configure.in index 18f81ec820..d67d369917 100644 --- a/configure.in +++ b/configure.in @@ -1266,6 +1266,43 @@ then AC_SUBST(GOFFICE_CFLAGS) AC_SUBST(GOFFICE_LIBS) + ################################################## + # Check for win32 platform + ################################################## + AC_MSG_CHECKING([for native Win32]) + case $host in + *-*-mingw*) + native_win32=yes + ;; + *) + native_win32=no + ;; + esac + AC_MSG_RESULT([$native_win32]) + AM_CONDITIONAL(OS_WIN32, test "$native_win32" = yes) + + AC_MSG_CHECKING([for Win32 platform in general]) + case $host in + *-*-mingw*|*-*-cygwin*) + platform_win32=yes + ;; + *) + platform_win32=no + ;; + esac + AC_MSG_RESULT($platform_win32) + AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = yes) + + ################################################## + # regex needs its own linker flag on win32 platform + ################################################## + if test "$platform_win32" = yes; then + REGEX_LIBS="-lregex" + else + REGEX_LIBS="" + fi + AC_SUBST(REGEX_LIBS) + ### ------------------------------------------------------------------------ ### Checks when building internal LIBGSF ### +libgsf-1.12.3 @@ -1401,43 +1438,6 @@ then macro_s_isreg=no]) AC_MSG_RESULT($macro_s_isreg) - ################################################## - # Check for win32 platform - ################################################## - AC_MSG_CHECKING([for native Win32]) - case $host in - *-*-mingw*) - native_win32=yes - ;; - *) - native_win32=no - ;; - esac - AC_MSG_RESULT([$native_win32]) - AM_CONDITIONAL(OS_WIN32, test "$native_win32" = yes) - - AC_MSG_CHECKING([for Win32 platform in general]) - case $host in - *-*-mingw*|*-*-cygwin*) - platform_win32=yes - ;; - *) - platform_win32=no - ;; - esac - AC_MSG_RESULT($platform_win32) - AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = yes) - - ################################################## - # regex needs its own linker flag on win32 platform - ################################################## - if test "$platform_win32" = yes; then - REGEX_LIBS="-lregex" - else - REGEX_LIBS="" - fi - AC_SUBST(REGEX_LIBS) - ################################################## # Checks for gtk-doc and docbook-tools ##################################################