pidgin.win32.autotools: 0c27aa30: Fixes from Fridrich Strba to make stuff ...

[datallah at pidgin.im]

----------------------------------------------------------------------
Revision: 0c27aa3026bc89dd1f9b0835fefde5a97404d0e8
Parent:   df6c2985ad2ffd21ee201882b834fe46826e9fcd
Author:   datallah at pidgin.im
Date:     11/03/10 17:29:31
Branch:   im.pidgin.pidgin.win32.autotools
URL: http://d.pidgin.im/viewmtn/revision/info/0c27aa3026bc89dd1f9b0835fefde5a97404d0e8

Changelog: 

Fixes from Fridrich Strba to make stuff work when we happen to find evolution
or a regex.h.

Changes against parent df6c2985ad2ffd21ee201882b834fe46826e9fcd

  patched  configure.ac
  patched  pidgin/plugins/gevolution/Makefile.am

-------------- next part --------------
============================================================
--- configure.ac	964e83aa1536282679c6bbf82fda3190a2fae0a4
+++ configure.ac	2f957b1c5905535645208b78d781afef58f1c461
@@ -153,10 +153,10 @@ AC_HEADER_SYS_WAIT
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(arpa/nameser_compat.h fcntl.h sys/time.h unistd.h locale.h stdint.h regex.h)
+AC_CHECK_HEADERS(arpa/nameser_compat.h fcntl.h sys/time.h unistd.h locale.h stdint.h)
 dnl signal.h is not good in mingw
 if test "$os_win32" != yes; then
-	AC_CHECK_HEADERS(signal.h)
+	AC_CHECK_HEADERS(signal.h regex.h)
 fi
 
 dnl Checks for typedefs, structures, and compiler characteristics.
============================================================
--- pidgin/plugins/gevolution/Makefile.am	be2c694b52d6f2ab189d0c2882e454ccfcd7040d
+++ pidgin/plugins/gevolution/Makefile.am	e06027e466db2f41085fef752366c2dfd4c8bd96
@@ -4,7 +4,7 @@ endif
 plugindir = $(libdir)/pidgin
 endif
 
-gevolution_la_LDFLAGS = -module -avoid-version
+gevolution_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 if PLUGINS
 
@@ -19,7 +19,7 @@ gevolution_la_SOURCES = \
 	new_person_dialog.c \
 	eds-utils.c
 
-gevolution_la_LIBADD = $(EVOLUTION_ADDRESSBOOK_LIBS) $(GTK_LIBS) $(PURPLE_LIBS) $(PIDGIN_LIBS)
+gevolution_la_LIBADD = $(EVOLUTION_ADDRESSBOOK_LIBS) $(GTK_LIBS) $(PURPLE_LIBS) $(PIDGIN_LIBS) $(GLIB_LIBS)
 
 endif
 
@@ -29,5 +29,12 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/libpurple \
 	-I$(top_srcdir)/pidgin \
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS) \
+	$(GLIB_CFLAGS) \
 	$(DEBUG_CFLAGS) \
 	$(GTK_CFLAGS)
+
+if OS_WIN32
+AM_CPPFLAGS += \
+	-I$(top_srcdir)/libpurple/win32 \
+	-I$(top_srcdir)/pidgin/win32
+endif