Commit Graph

347 Commits

Author SHA1 Message Date
Jean-Marc Lasgouttes
d2be1432a1 Fix the following annoying problem: when
using --with-version-suffix (without value), config.status will be
written wrongly and try to run
  ./configure--with-qt4-lib= [...]

This is because the code that adds automatically the version number eats
the leading space.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@27152 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-27 14:54:18 +00:00
Jean-Marc Lasgouttes
33d93b32db new configure option --enable-build-type
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@23614 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-10 10:27:34 +00:00
Jürgen Spitzmüller
fe4dbab025 Backport revision 19473:
* config/lyxinclude.m4: more verbose message.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@20206 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-11 06:26:02 +00:00
Enrico Forestieri
e70cf8eec0 Add version information to the lyx executable on Windows.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@19538 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-14 01:38:12 +00:00
Jean-Marc Lasgouttes
5490330431 small tweak of configure help messages (2)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@19465 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-12 18:30:52 +00:00
Jean-Marc Lasgouttes
90b40c468f * config/lyxinclude (LYX_VERSION_SUFFIX): make $with_version available
* development/MacOSX/lyxrc.dist.in: use it here instead of program_suffix



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@19393 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-10 08:35:58 +00:00
Jean-Marc Lasgouttes
eee9800ce4 [the "translation" patch series] Part 1: upgrading to gettext 0.14.6
* m4/*:
	* intl/*:
	* ABOUT-NLS:
	* po/Makefile.in.in:
	* po/POTFILES.in:
	* po/Makevars.template:
	* config/mkinstalldirs:
	* config/config.rpath: update from gettext 0.14.6 source. This enables
	translation to system language on Mac OS X



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@19348 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-07 20:20:49 +00:00
Jean-Marc Lasgouttes
37f4a3dad1 honor all the link flags coming from pkg-config
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@19286 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-03 10:37:33 +00:00
Jean-Marc Lasgouttes
a7039727c3 * configure.ac: check earlier for -liconv and -lz, since Qt4 needs them;
put LIBICONV in LIBS.

	* src/Makefile.am: 
	* src/client/Makefile.am: update accordingly.

	* config/qt4.m4: do not try to run pkg-config tests when pkg-config 
	is not installed.

	* INSTALL.MacOSX: advise to use pkg-config; remove -lz from LDFLAGS;
	remove --with-frontend=qt4 from configure line; in the svn case, remove
	also --disable-stdlib-debug and --disable-concept-checks (and explain 
	why --disable-stdlib-debug may be needed).



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19056 a592a061-630c-0410-9148-cb99ea01b6c8
2007-07-12 12:57:59 +00:00
José Matox
fbd205e70d Allow rc as suffix for releases
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18610 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-31 23:41:30 +00:00
Jean-Marc Lasgouttes
b5c00e2464 * config/qt4.m4 (QT4_DO_PKG_CONFIG): use = instead of == to check for equality with 'test' (bug 3770)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18575 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-30 06:00:31 +00:00
Enrico Forestieri
90ef6ed709 Fix typo due to the massive rename.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18053 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-26 21:50:16 +00:00
Bo Peng
00e305c9d9 Rename .C ==> .cpp for files in src, part one
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18018 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-26 04:41:58 +00:00
Jean-Marc Lasgouttes
00cd32985a stupid typo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17989 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-25 14:56:41 +00:00
Jean-Marc Lasgouttes
8d0e191aa3 * config/lyxinclude.m4 (LYX_USE_PACKAGING): define automake conditional
INSTALL_MACOSX when packaging is macosx.

	* development/Makefile.am: only install MacOSX when needed.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17988 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-25 14:33:54 +00:00
Jean-Marc Lasgouttes
5971c1a9f1 * config/qt.m4: remove (unused)
* config/lyxinclude25x.m4: remove (move contents to lyxinclude.m4)

	* autogen.sh:
	* config/Makefile.am: adapt.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17980 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-25 10:40:50 +00:00
Jean-Marc Lasgouttes
b6bc406d56 fix setting of PKG_CONFIG_PATH for qt 4.3
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17973 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-25 07:53:19 +00:00
José Matox
958458d6f0 Add test for beta release
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17249 a592a061-630c-0410-9148-cb99ea01b6c8
2007-02-18 22:41:19 +00:00
Georg Baum
04debb8056 Revert unwanted stuff from last commit
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16932 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-29 18:37:13 +00:00
Georg Baum
a76050219a Fix LyX paste from system clipboard when the file format does not match
* src/buffer.C
	(Buffer::readString): Tell readFile that we do not have a file
	(Buffer::readString): readFile(name) returns a bool, not an enum


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16931 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-29 18:35:56 +00:00
Georg Baum
b89f97f0b4 fix manual qt configuration in these cases:
- pkgconfig is missing
- pkgconfig is available, but it does not have any qt information
by Jean-Marc and me


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16271 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-13 21:18:44 +00:00
Georg Baum
fe5c73915e Make libQtCore a support library like boost and implement encoding conversion
from/to the local 8bit encoding with it.
Only the autotools build system is updated, scons and cmake users need to
add qt4 cpp flags when compiling libsupport, and link libsupport against
libQtCore.

	* src/frontends/qt4/qt_helpers.[Ch]
	(toqstr, qchar_to_ucs4, ucs4_to_qchar, ucs4_to_qstring,
	 qstring_to_ucs4, fromqstr): Move these qstring conversion functions
	from here ...

	* src/support/qstring_helpers.[Ch] ... to these new files

	* src/support/docstring.[Ch]
	(from_local8bit): new conversion function from local 8bit encoding
	to ucs4
	(to_local8bit): new conversion function from ucs4 to local 8bit
	encoding to ucs4
	(to_local8bit_failure): exception that is thrown by to_local8bit if
	the argument cannot be converted to the local encoding

	* src/support/filename.C
	(FileName::toFilesystemEncoding): implement with the help of QFile

	* src/support/Makefile.am: Add new files, qt4 cpp flags and link
	against libQtCore

	* src/client/client.C: Convert commandline input from local encoding
	to ucs4. Convert stuff that is sent to to the server to utf8,
	because LyX interprets it as utf8 on the other end of the pipe.

	* src/lyx_main.C
	(LyX::exec): convert commandline input from local encoding to utf8
	(LyX::init): ditto
	(LyX::easyParse): ditto

	* development/scons/scons_manifest.py: Add new files

	* config/qt4.m4: Define new variables QT4_CORE_INCLUDES,
	QT4_CORE_LDFLAGS and QT4_CORE_LIB


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16257 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-12 20:19:46 +00:00
Georg Baum
a781d8c98d add missing file
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16210 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-08 18:43:59 +00:00
Jean-Marc Lasgouttes
23c3ed57f1 --with-frontend=qt4 is not required anymore
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16202 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-07 16:17:40 +00:00
José Matox
8bc788c598 Remove usage from egrep, cleaner code (Jean-Marc)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15939 a592a061-630c-0410-9148-cb99ea01b6c8
2006-11-15 23:10:24 +00:00
José Matox
288775e945 Fix typo (fix by Jean-Marc).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15938 a592a061-630c-0410-9148-cb99ea01b6c8
2006-11-15 21:47:55 +00:00
José Matox
6e22254244 Allow alpha as suffix for development releases
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15934 a592a061-630c-0410-9148-cb99ea01b6c8
2006-11-15 15:46:45 +00:00
Lars Gullik Bjønnes
8f261b1529 The Gtk removal from trunk.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15488 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-22 18:05:16 +00:00
Michael Schmitt
83c80a051c * lyxinclude.m4: qt3 isn't a valid frontend any longer
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15434 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-21 08:57:32 +00:00
André Pönitz
a63cddf51c remove qt3 frontend
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15432 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-21 08:35:47 +00:00
Lars Gullik Bjønnes
38f49a6004 Remove deleted files
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14949 a592a061-630c-0410-9148-cb99ea01b6c8
2006-09-09 11:08:19 +00:00
Abdelrazak Younes
b486b53f8f Patch from Enrico:
Avoids the crash when quitting LyX on Cygwin/qt4


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14860 a592a061-630c-0410-9148-cb99ea01b6c8
2006-09-01 13:49:03 +00:00
Jean-Marc Lasgouttes
fa2a87de9b Qt4 autoconf cleanup.
* config/qt4.m4 
	(QT4_FIND_PATH, QT_FIND_UIC4, QT_FIND_MOC4): remove,
	AC_PATH_PROGS does this very well. 
	(QT4_DO_PKG_CONFIG): add $QT4DIR/lib to pkg-config search path;
	do not run QT4_DO_MANUAL_CONFIG on failure. 
	(QT4_DO_MANUAL_CONFIG): remove some code.
	(QT4_DO_IT_ALL): move code to handle --with-foo here; move
	code to search for moc/uic here; call QT4_DO_PKG_CONFIG first,
	and QT4_DO_MANUAL_CONFIG on failure.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14829 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-24 09:33:14 +00:00
Abdelrazak Younes
3942d5eac1 get rid of QT3_SUPPORT
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14774 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-17 09:11:14 +00:00
Jean-Marc Lasgouttes
f8a5da9048 * configure.ac: add LYX_DATE variable for release date.
* config/lyxinclude.m4: reset release date for development versions.

	* src/version.C.in: make lyx_release_date a placeholder.

	* src/lyx_main.C (parse_version): 
	* src/frontends/controllers/ControlAboutlyx.C (getVersion): change a 
	bit the display of LyX release date.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14712 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-16 21:54:55 +00:00
Jean-Marc Lasgouttes
8d3ef3a4ca LYX_CHECK_ERRORS: exit with status 1 if there is an error
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14680 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-14 20:14:41 +00:00
Lars Gullik Bjønnes
c30c9a9e47 Add pkg.m4 to config/ and autogen.sh.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14543 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-06 20:45:31 +00:00
Lars Gullik Bjønnes
96313cdcb5 Make QT4 config use pgk-config if available
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14520 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-30 21:33:59 +00:00
Georg Baum
104a09f014 Set CPPFLAGS only if not already set by the user (and ignore CXXFLAGS for
setting CPPFLAGS)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14516 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-30 14:56:01 +00:00
Lars Gullik Bjønnes
d291109ec3 Let gcc 4.x be handled.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14515 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-30 13:58:10 +00:00
Lars Gullik Bjønnes
38cca58f71 Remove old outdated pkg.m4, newer one is automatically picked up by autogen.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14509 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-29 10:41:00 +00:00
Lars Gullik Bjønnes
fdb9b989f7 Remove some old files belonging to the old (now removed) gnome frontend
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14508 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-29 10:34:49 +00:00
Lars Gullik Bjønnes
110a4f1117 split the qt.m4 in two, separate file for qt4
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14491 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-22 11:23:41 +00:00
Michael Schmitt
131f9b0b62 * configure.ac: qt becomes qt3
* INSTALL: remove xforms description; update
        --with-frontend args
        * config/lyxinclude.m4: update possible values
        of --with-frontend


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14373 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-08 11:16:17 +00:00
Michael Schmitt
0be696bff0 * remove various xforms relicts, in particular:
* src/frontends/controllers/ControlPreamble.[Ch]:
        remove files, since this controller was only used
        by the xforms frontend


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14352 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-06 19:28:59 +00:00
Lars Gullik Bjønnes
22861453fe Remove the XForms frontend, update the autotools files, and fixup po.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14320 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-03 19:20:25 +00:00
Lars Gullik Bjønnes
d2b2aa8124 Make signals and slots to not be defined, and replace them with Q_SIGNALS and Q_SLOTS
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14277 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-30 14:37:33 +00:00
Lars Gullik Bjønnes
96a7b5d0af Do not use the qt "keyword" emit. Make qt not emit it at all. (pun intended)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14269 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-30 11:57:17 +00:00
Jean-Marc Lasgouttes
64b8bcd2ff * config/qt.m4 (QT_DO_IT_ALL): add test for Qt-without-X11-under-cygwin.
* config/Makefile.am:
	* config/cygwin.m4: remove special cygwin tests

	* configure.ac: check for shlwapi and gdi32 libraries (needed in
	windows); do not check special cygwin features.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13841 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-12 15:26:05 +00:00
Bo Peng
bee53b6c8d Scons-build system moves to development/scons, from Bo Peng (ben.bob@gmail.com)
* remove SConstruct config/scons_utils.py config/qt4.py
	* add development/scons/qt4.py SConscript SConstruct scons_utils.py


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13829 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-10 21:53:31 +00:00