r14743 - gnucash/trunk - Add REGEX_LIBS linker flag that is needed on win32 platform

Christian Stimming cstim at cvs.gnucash.org
Mon Aug 28 05:31:30 EDT 2006


Author: cstim
Date: 2006-08-28 05:31:29 -0400 (Mon, 28 Aug 2006)
New Revision: 14743
Trac: http://svn.gnucash.org/trac/changeset/14743

Modified:
   gnucash/trunk/configure.in
   gnucash/trunk/lib/libqof/backend/file/Makefile.am
   gnucash/trunk/lib/libqof/qof/Makefile.am
   gnucash/trunk/src/engine/Makefile.am
   gnucash/trunk/src/gnome-search/Makefile.am
   gnucash/trunk/src/gnome-utils/Makefile.am
   gnucash/trunk/src/import-export/Makefile.am
   gnucash/trunk/src/import-export/qif/Makefile.am
Log:
Add REGEX_LIBS linker flag that is needed on win32 platform

Modified: gnucash/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in	2006-08-28 08:56:29 UTC (rev 14742)
+++ gnucash/trunk/configure.in	2006-08-28 09:31:29 UTC (rev 14743)
@@ -1401,6 +1401,9 @@
   	 macro_s_isreg=no])
   AC_MSG_RESULT($macro_s_isreg)
   
+  ##################################################
+  # Check for win32 platform
+  ##################################################
   AC_MSG_CHECKING([for native Win32])
   case $host in
     *-*-mingw*)
@@ -1426,6 +1429,16 @@
   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

Modified: gnucash/trunk/lib/libqof/backend/file/Makefile.am
===================================================================
--- gnucash/trunk/lib/libqof/backend/file/Makefile.am	2006-08-28 08:56:29 UTC (rev 14742)
+++ gnucash/trunk/lib/libqof/backend/file/Makefile.am	2006-08-28 09:31:29 UTC (rev 14743)
@@ -18,6 +18,7 @@
 libgncqof_backend_qsf_la_LIBADD = \
  ${QOF_LIBS} \
  ${GLIB_LIBS} \
+ ${REGEX_LIBS} \
  ${LIBXML2_LIBS}
 
 qsfschemadir = $(QOF_XML_DIR)

Modified: gnucash/trunk/lib/libqof/qof/Makefile.am
===================================================================
--- gnucash/trunk/lib/libqof/qof/Makefile.am	2006-08-28 08:56:29 UTC (rev 14742)
+++ gnucash/trunk/lib/libqof/qof/Makefile.am	2006-08-28 09:31:29 UTC (rev 14743)
@@ -3,6 +3,7 @@
 libgncqof_la_LDFLAGS= -version-info $(LIBQOF_LIBRARY_VERSION)
 libgncqof_la_LIBADD= \
   $(GLIB_LIBS) \
+  $(REGEX_LIBS) \
   $(top_builddir)/lib/libc/libc-missing.la
 
 AM_CFLAGS = \

Modified: gnucash/trunk/src/engine/Makefile.am
===================================================================
--- gnucash/trunk/src/engine/Makefile.am	2006-08-28 08:56:29 UTC (rev 14742)
+++ gnucash/trunk/src/engine/Makefile.am	2006-08-28 09:31:29 UTC (rev 14743)
@@ -109,6 +109,7 @@
   ../core-utils/libcore-utils.la \
   ${G_WRAP_LINK_ARGS} \
   ${QOF_LIBS} \
+  ${REGEX_LIBS} \
   ${GNUCASH_ENGINE_BASE_LIBS} \
   ${top_builddir}/lib/libc/libc-missing.la
 

Modified: gnucash/trunk/src/gnome-search/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-search/Makefile.am	2006-08-28 08:56:29 UTC (rev 14742)
+++ gnucash/trunk/src/gnome-search/Makefile.am	2006-08-28 09:31:29 UTC (rev 14743)
@@ -62,6 +62,7 @@
   ${GTKHTML_LIBS} \
   ${GLADE_LIBS} \
   ${GLIB_LIBS} \
+  ${REGEX_LIBS} \
   ${QOF_LIBS} \
   ${GNOME_PRINT_LIBS}
 

Modified: gnucash/trunk/src/gnome-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-utils/Makefile.am	2006-08-28 08:56:29 UTC (rev 14742)
+++ gnucash/trunk/src/gnome-utils/Makefile.am	2006-08-28 09:31:29 UTC (rev 14743)
@@ -189,6 +189,7 @@
   ${GSF_LIBS} \
   ${QOF_LIBS} \
   ${GOFFICE_LIBS} \
+  ${REGEX_LIBS} \
   ${LIBXML2_LIBS}
 
 nodist_libgw_gnome_utils_la_SOURCES = gw-gnome-utils.c

Modified: gnucash/trunk/src/import-export/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/Makefile.am	2006-08-28 08:56:29 UTC (rev 14742)
+++ gnucash/trunk/src/import-export/Makefile.am	2006-08-28 09:31:29 UTC (rev 14743)
@@ -48,6 +48,7 @@
   ${GNOME_LIBS} \
   ${GLADE_LIBS} \
   ${QOF_LIBS} \
+  ${REGEX_LIBS} \
   ${GLIB_LIBS}
 
 gladedir = ${GNC_GLADE_DIR}

Modified: gnucash/trunk/src/import-export/qif/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/qif/Makefile.am	2006-08-28 08:56:29 UTC (rev 14742)
+++ gnucash/trunk/src/import-export/qif/Makefile.am	2006-08-28 09:31:29 UTC (rev 14743)
@@ -23,6 +23,7 @@
   ${top_builddir}/src/import-export/libgncmod-generic-import.la \
   ${top_builddir}/src/engine/libgncmod-engine.la \
   ${QOF_LIBS} \
+  ${REGEX_LIBS} \
   ${GLIB_LIBS}
 
 AM_CFLAGS = \



More information about the gnucash-changes mailing list