Commit Graph

335 Commits

Author SHA1 Message Date
Scott Kostyshak
bcf4c78845 Back to development 2015-11-13 23:05:13 -05:00
Scott Kostyshak
41cf01e9b6 This is LyX 2.2.0alpha1 2015-11-13 23:02:34 -05:00
Jean-Marc Lasgouttes
67385e69fc Improve detection of C++11 mode
This replaces commit 329eae56 with a better solution. Indeed, while
__cpluplus is useless with g++ 4.[3-6] because its value is always 1,
these compilers define __GXX_EXPERIMENTAL_CXX0X__ when "-std c++0x" is used.

Therefore the code now relies on both macros to detect C++11 mode
instead of setting it when --enable-cxx11 is used.

Also, use pure c++ mode instead of gnu++ extensions on gcc
2015-09-03 10:22:56 +02:00
Jessica Hamilton
e02f0a0bab configure: also search for sockets in libnetwork
This is required for Haiku support.

See bug #7568 for details.
2015-06-08 17:00:38 +02:00
Jean-Marc Lasgouttes
4f3d9d0092 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>.
2015-05-06 17:08:56 +02:00
Jean-Marc Lasgouttes
3d7ec5e25f Autotool python support: allow to set version in configure.ac. 2015-03-24 12:09:21 +01:00
Jean-Marc Lasgouttes
babe5e05f8 Autotools: check for python >= 2.7.0 or >= 3.3.0
A new macro adapted from AM_PROG_PYTHON is defined. It does the dual version testing for python 2 and python 3. The rest of the functionnality of AM_PROG_PYTHON has been stripped off.

Once our special macro has been invoked, we use the usual AM_PROG_PYTHON.
2015-03-24 10:34:08 +01:00
José Matos
631bbab889 First step to support python 2(.7) and 3(.3+)
When the work is finished the moniker "work in progress" should be removed.
2015-03-10 13:55:59 +00:00
Jean-Marc
8fcbba8596 Fix --with-extra-inc and --with-extra-prefix.
From Enrico.
2015-01-27 23:09:56 +01:00
Enrico Forestieri
10be0c43f2 Adjust indentation after ff42fea8. 2015-01-13 18:05:31 +01:00
Jean-Marc Lasgouttes
33ff0f276a More tweaks to C++ compiler detection
Now CXXFLAGS is left alone by autoconf: only the user can override it.

Properly set -g and -O options, which were overriden.

Try to put the arguments in a more reasonable ordering.
2015-01-13 15:59:30 +01:00
Jean-Marc Lasgouttes
ff42fea8ab Cleanup autoconf compiler support
Get rid of some old useless compiler checking code

Do not touch CXXFLAGS and friends, only the AM_* version

Let the gcc-related options for latest known version be the default (assume they will still be fine in future versions)

Try to take clang in account in a better way (to be continued):
 * use proper option for C++11,
 * use -Wno-deprecated-register in this case because Qt has a lot of these
 * define version as being clang for internal testing (there is no real way to get the clang version)
2015-01-13 12:06:55 +01:00
Jean-Marc Lasgouttes
41405babc5 Cleanup support for std::regex with autotools
Do not link against system boost regex lib or build included boost regex when not needed.
2015-01-06 18:47:00 +01:00
Enrico Forestieri
dd2a8b616e Adjust autotools default configure options for Qt5.
* Disable concept-checks unless explicitly required (errors out with Qt5).
* Add -fPIC to CPPFLAGS for elf targets (required with Qt5).
2015-01-04 18:07:11 +01:00
Georg Baum
394e1bf99c Use std::regex if possible
It works with gcc >= 4.9.0 and clang (with libc++ or gcc libstdc++ from gcc
>= 4.9.0). The MSVC parg is missing, because I cannot test it, and the
autotools build still link against boost::regex even if it is not needed, but
I don't know how to fix that.
2014-12-28 18:08:18 +01:00
Georg Baum
6f34a8a640 Get rid of tr1 support
As discussed on the list. We don't need it anymore, either we have a modern
compiler that supports C++11, or we fall back to boost. I kept and adjusted
the regex #define, since we cannot use std regex completely yet.
2014-12-23 22:18:08 +01:00
Georg Baum
90b1f084bf Improve C++11 support
If we compile in C++11 mode, do not use the boost replacements for bind,
functional and shared_ptr. regex is excluded, since it misses match_partial, and
gcc does not provide a usable one in versions less than 4.9.0.
I also removed the #define for match_partial, since this is dangerous. Now you
get a compile error instead of subtle runtime differences.
2014-12-21 20:22:16 +01:00
Georg Baum
0842aa06e4 Do not use tr1 with libc++
clang defines __GNUC__ but libc++ does not have tr1, so we either need to use
boost, or std and compile in c++11 mode.
2014-12-21 18:22:33 +01:00
Jean-Marc Lasgouttes
0b09424017 Autotools: read git commit hash at compile time
Also do as cmake to avoid full recompilation when the hash changes.
2014-11-24 22:00:21 +01:00
Jean-Marc Lasgouttes
dc7ef3c81f Implement "callstack printing" checking for autotools
Contrary to cmake, we do not rely on platform/compiler check, but on the
availability of the reauired API.
2014-11-04 23:48:03 +01:00
Jean-Marc Lasgouttes
8ecb96c09a Add the git commit (if applicable) to LyX version
This only works for autotools right now, but adding that to cmake is trivial
2014-10-10 12:12:17 +02:00
Enrico Forestieri
4bdeae2733 Update autotools for building with Qt5.
The option --enable-qt5 allows configuring for Qt5. The default is Qt4.
Nothing special is done with respect to Qt4, apart from pulling in the
correct libraries. Indeed, other than the core and gui libraries, now
also the concurrent and widgets libraries are needed.
2014-07-19 03:34:28 +02:00
Enrico Forestieri
bc00159530 Fix compilation on Solaris after last boost upgrade. 2014-05-29 22:31:56 +02:00
Vincent van Ravesteijn
a25c946b31 boost: Turn off warning that signals are deprecated 2014-04-29 17:25:38 +02:00
Jean-Marc Lasgouttes
6c8a775c73 Use subdir-objects for automake 1.14 or newer
This option is going to be mandatory starting with automake 2.0.
LyX is able to use this since version 2.1, but it turns out that it is
badly implemented in versions of automake older than 1.14.

We rely on some (undocumented) symbol to detect automake 1.14 and
use the subdirs-objects option in this case.

For more details, see:
https://www.mail-archive.com/lyx-devel@lists.lyx.org/msg181023.html

Making everything work with autotools required making a copy of two
files from support/tests. It seems that we should not point to source files
that are handled by another Makefile.am.
2014-04-21 11:52:00 -04:00
Vincent van Ravesteijn
f0f8157099 Start the 2.2 development cycle 2014-04-18 12:03:13 +02:00
Vincent van Ravesteijn
fde16219ca This is LyX 2.1.0. 2014-04-13 19:26:04 +02:00
Vincent van Ravesteijn
5d66e91de8 configure.ac: back to development version 2014-04-01 21:41:13 +02:00
Vincent van Ravesteijn
fd7c0c2993 This is LyX 2.1.0rc1 2014-03-24 18:54:57 +01:00
Vincent van Ravesteijn
e83606c98a Not yet rc1: Revert "This is LyX 2.1.0rc1"
This reverts commit c571866e7f.
2014-03-20 22:15:33 +01:00
Vincent van Ravesteijn
c571866e7f This is LyX 2.1.0rc1 2014-03-20 22:11:14 +01:00
Kornel Benko
805e51eff8 Implement file locking and apply to configure
Functions for file locking are added. They are used for ensuring that
for specified userdir only one LyX process runs configure.
2013-11-20 19:40:32 +01:00
Vincent van Ravesteijn
86205f4ba2 Back to development version 2013-11-13 21:54:37 +01:00
Vincent van Ravesteijn
86efb5938d This is lyx2.1.0beta2 2013-11-10 21:08:39 +01:00
Raphael Kubo da Costa
ca7214b410 Remove FreeBSD checks when defining USE_WCHAR_T.
The problems the comments in the build systems refer to seem to have been
fixed for years. [1] says the checks in libstdc++ have been improved, and
all supported FreeBSD versions enable wchar_t support unconditionally in
libstdc++. Additionally, this needlessly impacts FreeBSD when libc++ is used
instead of libstdc++.

[1] http://gcc.gnu.org/onlinedocs/libstdc++/faq.html#faq.freebsd_wchar
2013-10-18 03:07:30 +02:00
Vincent van Ravesteijn
e117361638 Revert "This is lyx2.1.0beta2"
This was committed by accident.

This reverts commit c85ff678c3.
2013-10-12 02:41:44 +02:00
Vincent van Ravesteijn
c85ff678c3 This is lyx2.1.0beta2 2013-10-12 02:38:15 +02:00
Vincent van Ravesteijn
26df0977d1 Revert "Enable automake subdir-objects"
The reason for adding this option is to kill a warning with automake 1.14. However, the "make distclean" target does not work with the subdir-objects options for older versions of automake. To still allow older versions of automake, we remove this option and live with the warning when using automake 1.14.

This reverts commit 03343bd4e6.
2013-10-05 16:40:18 +02:00
Vincent van Ravesteijn
03343bd4e6 Enable automake subdir-objects 2013-09-29 15:26:25 +02:00
Jean-Marc Lasgouttes
56e2448546 Fix compilation on Solaris 11.1 (bug #8783)
Make sure that the configure script only checks features using the C++ compiler.

Also get rid of our last C files, since they are not compiled nor distributed anyway.
2013-09-09 11:02:14 +02:00
Juergen Spitzmueller
3698fde0d8 Revert part of 16cdf70d0c
Our source is not yet ready for subdir-objects (causes bad lyx/tex2lyx interferences). See http://marc.info/?l=lyx-devel&m=137673178123427&w=2 for details
2013-08-19 10:47:42 +02:00
Enrico Forestieri
b885b80bc0 Fix compiling on platforms lacking setenv
Using autotools, the availability of putenv is not checked, so
the macro HAVE_PUTENV is not defined and compiling stops with
the error "No environment-setting function has been defined."
Thus, also check for putenv.
2013-07-26 20:48:34 +02:00
Stephan Witt
16cdf70d0c enable automake version 1.14 2013-07-26 13:04:32 +02:00
Vincent van Ravesteijn
6386ed4812 Back to development 2013-07-13 23:54:07 +02:00
Vincent van Ravesteijn
290f3af862 This is LyX 2.1.0beta1 2013-07-13 23:13:12 +02:00
Richard Heck
34e3aa4ca2 Fix comment in configure.ac. This was causing a warning during
configuration.
2013-06-11 11:05:31 -04:00
Jean-Marc Lasgouttes
6b8d47a203 Add some more m4 macro files for gettext 2013-06-03 15:37:13 +02:00
Jean-Marc Lasgouttes
d7e2705228 Get rid of all traces of libintl.
This requires to re-add some tests in configure.ac.

Note that the code to generate a Makefile in po/ has been kept.
2013-05-30 22:10:01 +02:00
Jean-Marc Lasgouttes
3ef4db2ce4 Continue pre-spring cleaning of configure script
* build-type=profiling implies -fno-omit-frame-pointer in gcc. This allows sysprof to yield proper call trees
 * remove --enable-grpof option (the build type is enough)
 * remove --with-frontend option since we have only one frontend. Move stuff around and generally simplify the Qt detection code
 * do not check for bc anymore.
 * Update README.
2013-03-19 16:41:14 +01:00
Jean-Marc Lasgouttes
d9cbac2fd3 Small updates to the configure script
Remove some tests that are not needed. Put --enable and --with options together in help output.
2013-03-19 15:38:47 +01:00