anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-24 18:43:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Autotools: configure AR program

Browse Source 
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>.
This commit is contained in:
Jean-Marc Lasgouttes 2015-05-04 16:19:44 +02:00
parent 026b6ad29c
commit 4f3d9d0092
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -15,7 +15,6 @@ lyx.1
stamp-h1 stamp-h1
*.old *.old
*.bak *.bak
config/compile
*.patch *.patch
build/ build/
CMakeLists.txt.user CMakeLists.txt.user

2
config/.gitignore vendored
View File

@ -1,3 +1,5 @@
ar-lib
compile
config.guess config.guess
config.sub config.sub
depcomp depcomp

3
configure.ac
View File

@ -67,6 +67,9 @@ done
LYX_PATH_PYTHON23([2.7.0], [3.3.0]) LYX_PATH_PYTHON23([2.7.0], [3.3.0])
# do the usual python setup stuff # do the usual python setup stuff
AM_PATH_PYTHON 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 AC_PROG_RANLIB
### Check for a C++ compiler ### Check for a C++ compiler