summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPadraig O'Briain <padraig.obriain@sun.com>2004-03-22 10:38:42 +0000
committerPadraig O'Briain <padraigo@src.gnome.org>2004-03-22 10:38:42 +0000
commita8a8fdc318f1ab912747b2eaa0b34002e9aeca4a (patch)
treef6bed72730da5a616366a89c1db2a5d4cf5539cf
parent8b14910196be06e48a2eecd8317b481ddce0f18b (diff)
downloadatk-a8a8fdc318f1ab912747b2eaa0b34002e9aeca4a.tar.gz
Update to build on Cygwin. Fixes bug #137666. Patch from Roger Leigh.
2004-03-22 Padraig O'Briain <padraig.obriain@sun.com> * configure.in: * atk/Makefile.am: Update to build on Cygwin. Fixes bug #137666. Patch from Roger Leigh.
-rw-r--r--ChangeLog6
-rw-r--r--atk/Makefile.am10
-rw-r--r--configure.in14
3 files changed, 28 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2b9c502..ac23f2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-22 Padraig O'Briain <padraig.obriain@sun.com>
+
+ * configure.in:
+ * atk/Makefile.am: Update to build on Cygwin. Fixes bug #137666.
+ Patch from Roger Leigh.
+
2004-03-18 Guntupalli Karunakar <karunakar@freedomink.org>
* configure.in: Added "mr" for Marathi to ALL_LINGUAS.
diff --git a/atk/Makefile.am b/atk/Makefile.am
index e768029..2de2629 100644
--- a/atk/Makefile.am
+++ b/atk/Makefile.am
@@ -2,6 +2,12 @@
# which are more like other make's VPATH.
GPATH = $(srcdir)
+if PLATFORM_WIN32
+no_undefined = -no-undefined
+else
+no_undefined =
+endif
+
INCLUDES = \
-I$(top_srcdir) \
-DG_DISABLE_DEPRECATED \
@@ -9,7 +15,9 @@ INCLUDES = \
lib_LTLIBRARIES = libatk-1.0.la
-libatk_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO)
+libatk_1_0_la_LDFLAGS = \
+ -version-info $(LT_VERSION_INFO) \
+ $(no_undefined)
libatk_1_0_la_LIBADD = $(DEP_LIBS)
libatk_1_0_la_SOURCES = \
diff --git a/configure.in b/configure.in
index ac0caf7..5e18f01 100644
--- a/configure.in
+++ b/configure.in
@@ -91,7 +91,19 @@ AM_DISABLE_STATIC
AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL
-AC_MSG_CHECKING([for Win32])
+AC_MSG_CHECKING([for some Win32 platform])
+case "$host" in
+ *-*-mingw*|*-*-cygwin*)
+ platform_win32=yes
+ ;;
+ *)
+ platform_win32=no
+ ;;
+esac
+AC_MSG_RESULT([$platform_win32])
+AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
+
+AC_MSG_CHECKING([for native Win32 platform])
case "$host" in
*-*-mingw*)
atk_native_win32=yes