diff --git a/configure.in b/configure.in index be86bbc4dd..18f81ec820 100644 --- a/configure.in +++ b/configure.in @@ -1401,6 +1401,9 @@ 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*) @@ -1425,6 +1428,16 @@ then 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 ################################################## diff --git a/lib/libqof/backend/file/Makefile.am b/lib/libqof/backend/file/Makefile.am index d4901acfb4..11bf44dd70 100644 --- a/lib/libqof/backend/file/Makefile.am +++ b/lib/libqof/backend/file/Makefile.am @@ -18,6 +18,7 @@ libgncqof_backend_qsf_la_LDFLAGS = -module -avoid-version libgncqof_backend_qsf_la_LIBADD = \ ${QOF_LIBS} \ ${GLIB_LIBS} \ + ${REGEX_LIBS} \ ${LIBXML2_LIBS} qsfschemadir = $(QOF_XML_DIR) diff --git a/lib/libqof/qof/Makefile.am b/lib/libqof/qof/Makefile.am index b70f8177b2..0af4d21a5b 100644 --- a/lib/libqof/qof/Makefile.am +++ b/lib/libqof/qof/Makefile.am @@ -3,6 +3,7 @@ lib_LTLIBRARIES = libgncqof.la libgncqof_la_LDFLAGS= -version-info $(LIBQOF_LIBRARY_VERSION) libgncqof_la_LIBADD= \ $(GLIB_LIBS) \ + $(REGEX_LIBS) \ $(top_builddir)/lib/libc/libc-missing.la AM_CFLAGS = \ diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am index 90e8d20977..bdbe8b7e9d 100644 --- a/src/engine/Makefile.am +++ b/src/engine/Makefile.am @@ -109,6 +109,7 @@ libgncmod_engine_la_LIBADD = \ ../core-utils/libcore-utils.la \ ${G_WRAP_LINK_ARGS} \ ${QOF_LIBS} \ + ${REGEX_LIBS} \ ${GNUCASH_ENGINE_BASE_LIBS} \ ${top_builddir}/lib/libc/libc-missing.la diff --git a/src/gnome-search/Makefile.am b/src/gnome-search/Makefile.am index 7db0cda020..03862f0925 100644 --- a/src/gnome-search/Makefile.am +++ b/src/gnome-search/Makefile.am @@ -62,6 +62,7 @@ libgncmod_gnome_search_la_LIBADD = \ ${GTKHTML_LIBS} \ ${GLADE_LIBS} \ ${GLIB_LIBS} \ + ${REGEX_LIBS} \ ${QOF_LIBS} \ ${GNOME_PRINT_LIBS} diff --git a/src/gnome-utils/Makefile.am b/src/gnome-utils/Makefile.am index c6b4182510..a942b8f4b5 100644 --- a/src/gnome-utils/Makefile.am +++ b/src/gnome-utils/Makefile.am @@ -189,6 +189,7 @@ libgncmod_gnome_utils_la_LIBADD = \ ${GSF_LIBS} \ ${QOF_LIBS} \ ${GOFFICE_LIBS} \ + ${REGEX_LIBS} \ ${LIBXML2_LIBS} nodist_libgw_gnome_utils_la_SOURCES = gw-gnome-utils.c diff --git a/src/import-export/Makefile.am b/src/import-export/Makefile.am index 78dc19b7f5..3502025d47 100644 --- a/src/import-export/Makefile.am +++ b/src/import-export/Makefile.am @@ -48,6 +48,7 @@ libgncmod_generic_import_la_LIBADD = \ ${GNOME_LIBS} \ ${GLADE_LIBS} \ ${QOF_LIBS} \ + ${REGEX_LIBS} \ ${GLIB_LIBS} gladedir = ${GNC_GLADE_DIR} diff --git a/src/import-export/qif/Makefile.am b/src/import-export/qif/Makefile.am index 8ea14538d6..99373919a8 100644 --- a/src/import-export/qif/Makefile.am +++ b/src/import-export/qif/Makefile.am @@ -23,6 +23,7 @@ libgncmod_qif_la_LIBADD = \ ${top_builddir}/src/import-export/libgncmod-generic-import.la \ ${top_builddir}/src/engine/libgncmod-engine.la \ ${QOF_LIBS} \ + ${REGEX_LIBS} \ ${GLIB_LIBS} AM_CFLAGS = \