r14744 - gnucash/trunk - Move win32 check out of libgsf-1.12.3 configure section into the general configure section
Christian Stimming
cstim at cvs.gnucash.org
Mon Aug 28 07:29:23 EDT 2006
Author: cstim
Date: 2006-08-28 07:29:22 -0400 (Mon, 28 Aug 2006)
New Revision: 14744
Trac: http://svn.gnucash.org/trac/changeset/14744
Modified:
gnucash/trunk/configure.in
Log:
Move win32 check out of libgsf-1.12.3 configure section into the general configure section
Modified: gnucash/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in 2006-08-28 09:31:29 UTC (rev 14743)
+++ gnucash/trunk/configure.in 2006-08-28 11:29:22 UTC (rev 14744)
@@ -1266,6 +1266,43 @@
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
@@ -1402,43 +1439,6 @@
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
##################################################
# gtk_doc_installed=true
More information about the gnucash-changes
mailing list