libtool upgrade to include m4 directory

Signed-off-by: Martin-Éric Racine <martin-eric.racine@iki.fi>

Makefile.am

@@ -18,6 +18,8 @@
 #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4
+
 SUBDIRS = src
 
 MAINTAINERCLEANFILES = ChangeLog INSTALL

autogen.sh

@@ -9,4 +9,6 @@ cd $srcdir
 autoreconf -v --install || exit 1
 cd $ORIGDIR || exit $?
 
-$srcdir/configure --enable-maintainer-mode "$@"
+if test -z "$NOCONFIGURE"; then
+    $srcdir/configure --enable-maintainer-mode "$@"
+fi

configure.ac

@@ -30,6 +30,7 @@ AC_INIT([xf86-video-geode],
 
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR(.)
 
 # Initialize Automake

m4/.gitignore

@@ -0,0 +1,7 @@
+libtool
+libtool.m4
+ltmain.sh
+lt~obsolete.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4