Re: [g-a-devel][PATCH] atk-1.2.4 some changes for Cygwin, similar as in glib or pango

["Padraig O'Briain" <Padraig Obriain Sun COM>]

Gerrit,

Can you send me a patch for atk from HEAD or atk-1.3.4?

I do not expect to make another release in the 1.2 branch.

Padraig

> Hallo gnome-accessibility-devel,
> 
> Need some flags for Cygwin, similar as for WIN32, but not all flags
> are needed, so defining a second conditional as it is in glib or pango
> is probably the best solution.  Patch below and attached.  Though, I'm
> getting srill some warnings when running automake:
> 
> atk/Makefile.am:84: MAINTAINERCLEANFILES must be set with `=' before using 
`+='
> atk/Makefile.am: installing `./depcomp'
> atk/Makefile.am:96: `LDFLAGS' is a user variable, you should not override it;
> atk/Makefile.am:96: use `AM_LDFLAGS' instead.
> docs/Makefile.am:65: EXTRA_DIST multiply defined in condition TRUE ...
> docs/Makefile.am:3: ... `EXTRA_DIST' previously defined here.
> atk/Makefile.am:84: MAINTAINERCLEANFILES must be set with `=' before using 
`+='
> atk/Makefile.am:96: `LDFLAGS' is a user variable, you should not override it;
> atk/Makefile.am:96: use `AM_LDFLAGS' instead.
> docs/Makefile.am:65: EXTRA_DIST multiply defined in condition TRUE ...
> docs/Makefile.am:3: ... `EXTRA_DIST' previously defined here.
> 
> 
> You should consider to upgrade to latest versions of libtool &
> automake et.al.
> 
> The patch is mainly to configure.in and atk/Makefile.am, inline here
> and also attached:
> 
> diff -urdp atk-1.2.4~/atk/Makefile.am atk-1.2.4/atk/Makefile.am
> --- atk-1.2.4~/atk/Makefile.am  2002-11-04 16:10:31.000000000 +0100
> +++ atk-1.2.4/atk/Makefile.am   2003-06-25 07:55:58.000000000 +0200
> @@ -16,6 +16,18 @@ install-libtool-import-lib:
>  uninstall-libtool-import-lib:
>  endif
>  
> +if PLATFORM_WIN32
> +no_undefined = -no-undefined
> +
> +install-libtool-import-lib:
> +       $(INSTALL) .libs/libatk-$(ATK_API_VERSION).dll.a $(DESTDIR)$(libdir)
> +uninstall-libtool-import-lib:
> +       -rm $(DESTDIR)$(libdir)/libatk-$(ATK_API_VERSION).dll.a
> +else
> +install-libtool-import-lib:
> +uninstall-libtool-import-lib:
> +endif
> +
>  lib_LTLIBRARIES = libatk-1.0.la
>  
>  if MS_LIB_AVAILABLE
> diff -urdp atk-1.2.4~/configure.in atk-1.2.4/configure.in
> --- atk-1.2.4~/configure.in     2003-05-12 09:36:25.000000000 +0200
> +++ atk-1.2.4/configure.in      2003-06-25 08:06:17.000000000 +0200
> @@ -1,7 +1,5 @@
>  dnl Process this file with autoconf to produce a configure script.
>  
> -AC_PREREQ(2.53)
> -
>  AC_INIT(ChangeLog)
>  
>  AM_CONFIG_HEADER(config.h)
> @@ -84,19 +82,31 @@ 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*)
> +    atk_platform_win32=yes
> +    ;;
> +  *)
> +    atk_platform_win32=no
> +    ;;
> +esac
> +AC_MSG_RESULT([$atk_platform_win32])
> +AM_CONDITIONAL(PLATFORM_WIN32, test "$atk_platform_win32" = "yes")
> +
> +AC_MSG_CHECKING([for native Win32])
>  case "$host" in
>    *-*-mingw*)
> -    atk_native_win32=yes
> +    atk_os_win32=yes
>      ;;
>    *)
> -    atk_native_win32=no
> +    atk_os_win32=no
>      ;;
>  esac
> -AC_MSG_RESULT([$atk_native_win32])
> -AM_CONDITIONAL(OS_WIN32, test "$atk_native_win32" = "yes")
> +AC_MSG_RESULT([$atk_os_win32])
> +AM_CONDITIONAL(OS_WIN32, test "$atk_os_win32" = "yes")
>  
> -if test "$atk_native_win32" = "yes"; then
> +if test "$atk_os_win32" = "yes"; then
>    AC_CHECK_PROG(ms_librarian, lib.exe, yes, no)
>  fi
>  AM_CONDITIONAL(MS_LIB_AVAILABLE, test x$ms_librarian = xyes)
> 
> # END
> 
> Gerrit
> -- 
> =^..^=