aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Lillqvist <tml@novell.com>2005-06-16 03:32:40 +0800
committerTor Lillqvist <tml@src.gnome.org>2005-06-16 03:32:40 +0800
commit44fef559359ef02284e894979035beec5e016f26 (patch)
treeeb61734d2bbc3a1bc87965f2e0b1de20fe04977e
parent039812d8add16b44e9fdb2918e692e1a5e2458df (diff)
downloadgsoc2013-evolution-44fef559359ef02284e894979035beec5e016f26.tar
gsoc2013-evolution-44fef559359ef02284e894979035beec5e016f26.tar.gz
gsoc2013-evolution-44fef559359ef02284e894979035beec5e016f26.tar.bz2
gsoc2013-evolution-44fef559359ef02284e894979035beec5e016f26.tar.lz
gsoc2013-evolution-44fef559359ef02284e894979035beec5e016f26.tar.xz
gsoc2013-evolution-44fef559359ef02284e894979035beec5e016f26.tar.zst
gsoc2013-evolution-44fef559359ef02284e894979035beec5e016f26.zip
Check for Win32. Define Automake conditional OS_WIN32. Define autoconf
2005-06-15 Tor Lillqvist <tml@novell.com> * configure.in: Check for Win32. Define Automake conditional OS_WIN32. Define autoconf substitutions SOEXT (.so vs. .dll) and NO_UNDEFINED (empty vs. -no-undefined). Check for regexec, perhaps in a separate -lregex. Expand win32/Makefile. svn path=/trunk/; revision=29509
-rw-r--r--ChangeLog5
-rw-r--r--configure.in28
2 files changed, 32 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2ff1892aad..b2aa08058a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2005-06-15 Tor Lillqvist <tml@novell.com>
+ * configure.in: Check for Win32. Define Automake conditional
+ OS_WIN32. Define autoconf substitutions SOEXT (.so vs. .dll) and
+ NO_UNDEFINED (empty vs. -no-undefined). Check for regexec, perhaps
+ in a separate -lregex. Expand win32/Makefile.
+
* win32/README
* win32/Makefile.am
* win32/dummy.la
diff --git a/configure.in b/configure.in
index 9bb06f91f9..c0130a4a3b 100644
--- a/configure.in
+++ b/configure.in
@@ -92,6 +92,25 @@ dnl Initialize libtool
AM_DISABLE_STATIC
AM_PROG_LIBTOOL
+dnl Win32
+AC_MSG_CHECKING([for Win32])
+case "$host" in
+*-mingw*)
+ os_win32=yes
+ NO_UNDEFINED='-no-undefined'
+ SOEXT='.dll'
+ ;;
+*) os_win32=no
+ NO_UNDEFINED=''
+ SOCKET_LIBS=''
+ SOEXT='.so'
+ ;;
+esac
+AC_MSG_RESULT([$os_win32])
+AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes])
+AC_SUBST(NO_UNDEFINED)
+AC_SUBST(SOEXT)
+
dnl alloca()
AC_CHECK_HEADERS(alloca.h)
@@ -511,6 +530,12 @@ dnl *********
dnl Libraries
dnl *********
+AC_CHECK_FUNCS(regexec,,[AC_CHECK_LIB(regex,regexec,
+ [REGEX_LIBS=-lregex
+ AC_DEFINE(HAVE_REGEXEC,1,[Define to 1 if you have the regexec function.])],
+ [AC_MSG_ERROR([No regex library found])])])
+AC_SUBST(REGEX_LIBS)
+
PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.8)
AC_SUBST(GTKHTML_CFLAGS)
AC_SUBST(GTKHTML_LIBS)
@@ -1189,7 +1214,7 @@ EVO_SET_COMPILE_FLAGS(E_WIDGETS, glib-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED
AC_SUBST(E_WIDGETS_CFLAGS)
AC_SUBST(E_WIDGETS_LIBS)
-EVO_SET_COMPILE_FLAGS(IMPORTERS, camel-$EDS_PACKAGE gconf-2.0 libglade-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED libgnomeui-2.0 libebook-$EDS_PACKAGE >= $EDS_REQUIRED)
+EVO_SET_COMPILE_FLAGS(IMPORTERS, camel-provider-$EDS_PACKAGE camel-$EDS_PACKAGE gconf-2.0 libglade-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED libgnomeui-2.0 libebook-$EDS_PACKAGE >= $EDS_REQUIRED)
AC_SUBST(IMPORTERS_CFLAGS)
AC_SUBST(IMPORTERS_LIBS)
@@ -1538,6 +1563,7 @@ AC_SUBST(EVOLUTION_DIR)
AC_OUTPUT([ po/Makefile.in
Makefile
+win32/Makefile
a11y/Makefile
a11y/addressbook/Makefile
a11y/calendar/Makefile