[Ekiga-devel-list] fixes for win32 build

[Matthias Schneider <matthias schneider TU-Ilmenau DE>]

Hi Kilian,

After having spent quite a while on cross-compiling ekiga for win32 I would like
to ask for advice
for the following fixes whose absence prevented the successful
cross-compilation. Basicallly I
encountered three small issues with the compile script:

1. localcharset.h that is needed for regexp library was not downloaded
2. openldap required a  --with-yielding_select option passed to the configure
script
3. for some reason the regexp library was found in the correct place but got
rejected, as a quick
workaround I commented out the respective check...

Enclosed are two patches with the mentioned fixes/workarounds. What I do not
understand is why I
myself need these fixes while the build server seems to do without them - since
the libraries are
downloaded automatically by the script (I dont have any libraries compiled for
win32 on my linux
box) it should be the same, should it?

Thank you in advance for helping me on this topic,

bye,
Matthias

----------------------------------------------------------------
This message was sent using IMP, the Internet Messaging Program.

--- Makefile	2007-01-15 22:14:00.000000000 +0100
+++ Makefile.new	2007-02-26 20:32:09.000000000 +0100
@@ -152,7 +152,7 @@
 	echo "--- Getting libregex..."
 	rm -f lib/libregex.a regex/regex.h $(INCLUDE_DIR)/regex.h
 	mkdir -p regex
-	cd regex/;for i in regex.c regexec.c regex.h regex_internal.c regex_internal.h regcomp.c alloca_.h alloca.c strcase.h;do \
+	cd regex/;for i in regex.c regexec.c regex.h regex_internal.c regex_internal.h regcomp.c alloca_.h alloca.c strcase.h localcharset.h;do \
 		$(WGET) http://cvs.savannah.nongnu.org/viewcvs/*checkout*/gnulib/gnulib/lib/$$i ;\
 	done
 	mv regex/alloca_.h regex/alloca.h
@@ -219,7 +219,8 @@
 	#-$(MAKE) -C $(OPENLDAP_DIR) clean
 	rm -f lib/libldap_r.dll
 	ln -sf $(INCLUDE_DIR)/regex.h $(OPENLDAP_DIR)/include/
-	cd $(OPENLDAP_DIR);./configure --with-cyrus-sasl=no --enable-bdb=no --enable-hdb=no $(confflags)
+	echo "$(MAKE) $(MAKEOPTS) -C $(OPENLDAP_DIR) depend"
+	cd $(OPENLDAP_DIR);./configure --with-cyrus-sasl=no --enable-bdb=no --enable-hdb=no --with-yielding_select=yes $(confflags)
 	$(MAKE) $(MAKEOPTS) -C $(OPENLDAP_DIR) depend
 	touch $@
 

--- configure.in.sav	2006-07-28 16:53:03.000000000 +0200
+++ configure.in	2007-02-25 00:36:40.000000000 +0100
@@ -1025,8 +1025,8 @@
 if test "$ac_cv_header_regex_h" != yes ; then
 	AC_MSG_ERROR([POSIX regex.h required.])
 fi
-AC_SEARCH_LIBS(regfree, [regex gnuregex],
-	:, AC_MSG_ERROR([POSIX regex required.]))
+dnl AC_SEARCH_LIBS(regfree, [regex gnuregex],
+dnl 	:, AC_MSG_ERROR([POSIX regex required.]))
 
 OL_POSIX_REGEX
 if test "$ol_cv_c_posix_regex" = no ; then