	Move urbi-with-libdir in build-aux 	* automerge: More checks. 	* sdk/urbi-with-libdir.m4: Move to... 	* project-template/trunk/build-aux/urbi-with-libdir.m4: here.
	Move urbi-with-libdir in build-aux
	* automerge: More checks.
	* sdk/urbi-with-libdir.m4: Move to...
	* project-template/trunk/build-aux/urbi-with-libdir.m4: here.

git-svn-id: a15b1a68d1eb0b178e64880bb702e768ba372808@982 f9a80dcf-8710-0410-9714-9a4fb6817a1c

aldebaran/libport,aldebaran/libport,aldebaran/libport,aldebaran/libport,aldebaran/libport