From: John Ellson <ellson@research.att.com>
Date: Thu, 16 Aug 2012 12:20:46 +0000 (-0400)
Subject: build with regex_win32.c on Windows
X-Git-Tag: LAST_LIBGRAPH~32^2~346
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6dcc42a4d83d157ec8637dc6a78235c746bd53b6;p=graphviz

build with regex_win32.c on Windows
---

diff --git a/configure.ac b/configure.ac
index 0888a323f..cb7eec325 100644
--- a/configure.ac
+++ b/configure.ac
@@ -475,7 +475,7 @@ AC_FUNC_ALLOCA
 AC_CHECK_FUNCS([lrand48 drand48 srand48 setmode setenv getenv \
 	__freadable _sysconf getrusage strerror cbrt lsqrt vsnprintf \
 	strtoul strtoll strtoull uname memset nl_langinfo pow sqrt \
-	strchr strdup strerror strstr strtok_r _NSGetEnviron])
+	strchr strdup strerror strstr strtok_r regexec _NSGetEnviron])
 
 AC_REPLACE_FUNCS([strcasecmp strncasecmp strcasestr])
 
diff --git a/lib/gvc/Makefile.am b/lib/gvc/Makefile.am
index d5e3404e6..b2f88b61c 100644
--- a/lib/gvc/Makefile.am
+++ b/lib/gvc/Makefile.am
@@ -23,6 +23,7 @@ AM_CPPFLAGS = \
 if WITH_WIN32
 AM_CFLAGS = -D_BLD_gvc=1
 AM_CPPFLAGS += -O0
+REGEX_SRC=regex_win32.c
 endif
 
 LIBS = $(SOCKET_LIBS) $(Z_LIBS) $(MATH_LIBS)
@@ -30,7 +31,7 @@ LIBS = $(SOCKET_LIBS) $(Z_LIBS) $(MATH_LIBS)
 pkginclude_HEADERS = gvc.h gvcext.h gvplugin.h gvcjob.h \
 	gvcommon.h gvplugin_render.h gvplugin_layout.h gvconfig.h \
 	gvplugin_textlayout.h gvplugin_device.h gvplugin_loadimage.h
-noinst_HEADERS = gvcint.h gvcproc.h gvio.h
+noinst_HEADERS = gvcint.h gvcproc.h gvio.h regex_win32.h
 noinst_LTLIBRARIES = libgvc_C.la
 lib_LTLIBRARIES = libgvc.la
 pkgconfig_DATA = libgvc.pc
@@ -40,7 +41,7 @@ pdf_DATA = gvc.3.pdf
 
 libgvc_C_la_SOURCES = gvrender.c gvlayout.c gvdevice.c gvloadimage.c \
 	gvcontext.c gvjobs.c gvevent.c gvplugin.c gvconfig.c \
-	gvtextlayout.c gvusershape.c gvc.c
+	gvtextlayout.c gvusershape.c gvc.c $(REGEX_SRC)
 libgvc_C_la_LIBADD = \
 	$(top_builddir)/lib/pack/libpack_C.la \
 	$(top_builddir)/lib/xdot/libxdot_C.la \