Autotools: configure AR program

Some distros may use target-specific prefix for ar program (like
x86_64-pc-linux-gnu-ar). Automake can handle that since version 1.12.

Since we still support automake 1.8 (not that it is really crucial,
but ubuntu 12.04 ships with automake 1.11.3), make the code
conditional.

Update a bit the gitignore files (automake creates some files in config/).

Based on a patch from Nikolay Orlyuk <virkony@gmail.com>.

diff --git a/.gitignore b/.gitignore
index f8855ceb4c990489b316bb4da72bc78fe93d1508..09ea96fc10b4b17a20f81637ce97cba7bea0058f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,6 @@ lyx.1
 stamp-h1
 *.old
 *.bak
-config/compile
 *.patch
 build/
 CMakeLists.txt.user

diff --git a/config/.gitignore b/config/.gitignore
index 1fe551b2519eca42712c38675d46c44417d4c2d4..d19f74da55ebcb7cc4e1271586b15244690822eb 100644 (file)
--- a/config/.gitignore
+++ b/config/.gitignore
@@ -1,3 +1,5 @@
+ar-lib
+compile
 config.guess
 config.sub
 depcomp

diff --git a/configure.ac b/configure.ac
index c9b36ed9f6a833eadf57324c55d9e9c1f2c0ae3e..f97622aafb1beed2d0c2dfa683a2a4684c4e4639 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -67,6 +67,9 @@ done
 LYX_PATH_PYTHON23([2.7.0], [3.3.0])
 # do the usual python setup stuff
 AM_PATH_PYTHON
+
+# Tools for creating libraries (note that we do not use libtool)
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) dnl AM_PROG_AR requires automake 1.12
 AC_PROG_RANLIB
 
 ### Check for a C++ compiler