commit 4f3d9d0092cbc82dc3b1228344ef0300e88efe06
Author: Jean-Marc Lasgouttes <[email protected]>
Date: Mon May 4 16:19:44 2015 +0200
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 <[email protected]>.
diff --git a/.gitignore b/.gitignore
index f8855ce..09ea96f 100644
--- 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 1fe551b..d19f74d 100644
--- 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 c9b36ed..f97622a 100644
--- 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
