build: prefer our set-up to the usual one.

	* build-aux/m4/urbi-libtool.m4: New.
	* build-aux/m4/urbi-win32.m4: New.
	* configure.ac: Use them.
	* .gitignore: Adjust.

Author: akimd

.gitignore

@@ -7,7 +7,8 @@ build-aux/depcomp
 build-aux/install-sh
 build-aux/missing
 build-aux/ltmain.sh
-build-aux/m4
+build-aux/m4/libtool.m4
+build-aux/m4/lt*.m4
 config.hin
 config.hin~
 configure

build-aux/m4/urbi-libtool.m4

@@ -0,0 +1,47 @@
+#                                               -*- autoconf -*-
+# urbi-libtool.m4: This file is part of build-aux.
+# Copyright (C) 2008, 2009, Gostai S.A.S.
+#
+# This software is provided "as is" without warranty of any kind,
+# either expressed or implied, including but not limited to the
+# implied warranties of fitness for a particular purpose.
+#
+# See the LICENSE file for more information.
+# For comments, bug reports and feedback: http://www.urbiforge.com
+#
+
+# Don't call before the creation of libtool.  There is no means to
+# control the order in which AC_CONFIG_COMMANDS are run, so just call
+# this macro after the invocation to LT_INIT.
+AC_DEFUN([URBI_LIBTOOL],
+[# If you need to create a library, use libtool.
+AC_REQUIRE([URBI_WIN32])dnl
+LT_PREREQ([2.2.6])
+LT_INIT([pic-only shared disable-static dlopen win32-dll])
+AC_SUBST([LIBTOOL_DEPS])
+
+if $windows; then
+  # It is perfectly possible to link with static libraries when building dlls.
+  # Also for some reason archive_cmds ends up empty for C++ tag.
+  # It wants to use cygpath, but we are using wine, and anyway our
+  # path are correct.
+  AC_CONFIG_COMMANDS([libtool-quirk],
+  [sed -i -r                                                    \
+       -e 's/^archive_cmds=""/#&/'                              \
+       -e 's/^(deplibs_check_method)=.*/#&\n\1=pass_all/'       \
+       -e 's/^fix_srcfile_path="..*"/#&/'                       \
+       libtool])
+fi
+
+case $host_alias in
+     (*mingw*)
+       # Let the compiler handle the standard libraries itself
+       AC_CONFIG_COMMANDS([mingw-hacks],
+           [sed -i -r                           \
+               -e 's/^predep_objects=/#&/'      \
+               -e 's/^postdeps=/#&/'            \
+               -e 's/-nostdlib//g'              \
+            libtool])
+     ;;
+esac
+])

build-aux/m4/urbi-win32.m4

@@ -0,0 +1,30 @@
+#                                               -*- autoconf -*-
+# urbi-win32.m4: This file is part of build-aux.
+# Copyright (C) 2006-2008, 2011, Gostai S.A.S.
+#
+# This software is provided "as is" without warranty of any kind,
+# either expressed or implied, including but not limited to the
+# implied warranties of fitness for a particular purpose.
+#
+# See the LICENSE file for more information.
+# For comments, bug reports and feedback: http://www.urbiforge.com
+#
+
+# URBI_WIN32
+# ----------
+# Look for windows. Define the automake conditional WIN32 as well
+# as $windows.
+AC_DEFUN([URBI_WIN32],
+[AC_CHECK_HEADERS([windows.h], [windows=true], [windows=false])
+AM_CONDITIONAL([WIN32], [$windows])
+
+case $host_alias in
+   (*mingw*)
+    # Remove windows-style paths from dependencies files
+    AC_CONFIG_COMMANDS([mingw-fix-path],
+      [sed -i "\/mv.*Pl\?o$/{;h;s/$/ \\&\\&\\\\/;p;g;s,.*\.Tpo \(.*\),	sed -i s/c:\\\\\\\\\\\\\\\\/\\\\\\\\\\\\\\\\/g \1,;};" \
+       Makefile
+       ])
+    ;;
+esac
+])

configure.ac

@@ -270,9 +270,7 @@ AC_DEFINE([DONT_USE_B_MODE],[1],[Don't open files in binary mode.])],
 AC_MSG_RESULT(Assuming that it does.))
 
 # Configure libtool.
-LT_PREREQ([2.2.6])
-LT_INIT([win32-dll])
-AC_SUBST([LIBTOOL_DEPS])
+URBI_LIBTOOL
 
 # The name of the library to build (not including the "lib" prefix).
 # Defaults to "jpeg", but can be changed to another name to avoid