66 Commits

Author SHA1 Message Date
Mike Kaganski
c10e82ada2 autogen.sh: Use STDOUT for --help output (as configure does)
Without this, first lines (up to "Other arguments passed directly
to configure:" inclusive) go to STDERR, while the rest to STDOUT

Change-Id: I95327d1ebe7941e5eb89f941ff1f9dc59297946b
Reviewed-on: https://gerrit.libreoffice.org/31999
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2016-12-14 14:45:18 +00:00
Norbert Thiebaud
4c23184a11 lode: make sure LODE_HOME/opt/bin is in the PATH for aclocal
When using a LODE setup, LODE_HOME must be defined in the environment
but setting LODE_HOME/opt/bin in the PATH is optional
and really only necessary as a convinience to get the right
'make' in the PATH.
configure.ac has code do deal with the absence of LODE_HOME/opt/bin
in the PATH but autogen.sh did not hence was failing in this
case, not finding aclocal.

Change-Id: I7a4449504dc539bb055798a6e1aea5268c5fb046
Reviewed-on: https://gerrit.libreoffice.org/21003
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2015-12-31 00:09:57 +00:00
Samuel Mehrbrodt
3526da14b7 autogen.sh: Display arguments for configure without apostrophes
So one can easily c&p the list of arguments

Change-Id: I0555c58aa6aadc410a26309d6e51382eed390b2b
2015-09-22 11:22:46 +02:00
Miklos Vajna
aefc43ba5c autogen.sh: better error message when src_path contains spaces
Change-Id: I921ffaf2ee4be73ecfffca8bc36cfae484b70a32
2015-03-08 16:59:47 +01:00
Michael Meeks
1e03a686a3 autogen: add --best-effort to help automation bridge option changes.
When we add or deprecate configure --with / --enable options lots
of scripts can break. Instead just add --best-effort to your autogen.sh
command line to get warnings but not a failure in this case.

Change-Id: I73d6ba53ee179384c2e34bf6780d074b04f70c06
2014-11-13 16:29:46 +00:00
Christian Lohmaier
86908b38da strip trailing spaces when reading autogen.input/lastrun
Change-Id: I9d47d2d4c6d2eb14968bfd79ef2a406c57afa21d
2014-05-30 11:19:30 +02:00
Luboš Luňák
2bf2bc2c7f make it possible to do 'make -C sw/' even with builddir!=srcdir
The change in partial_build.mk assumes all the Makefile's using it
are in builddir/<module>/ or builddir/external/<module> , these are
differentiated by checking for ../External_module.mk .

Change-Id: Iddc8fa2ec0842f181780f7491cf5a2244efd014a
2014-04-23 18:50:20 +02:00
Stephan Bergmann
11545b91d5 Revert "make it possible to do 'make -C sw/' even with builddir!=srcdir"
This reverts commit 11e881a63821ea209bda509d1e502d9ba270782d, which assumed that
"all the Makefile's using it are in builddir/<module>/", which is not the case
for the external/ sub-modules.
2014-04-11 14:26:07 +02:00
Luboš Luňák
11e881a638 make it possible to do 'make -C sw/' even with builddir!=srcdir
The change in partial_build.mk assumes all the Makefile's using it
are in builddir/<module>/ , but that seems to be the case.

Change-Id: Iddc8fa2ec0842f181780f7491cf5a2244efd014a
2014-03-23 16:26:59 +01:00
Jan-Marek Glogowski
806f4d8e9a Clarify autogen.sh messages
Actually warn the user, if we ignore provided configuration files.

Also add an extended header to explain the expected behaviour.

Change-Id: I630d858c2d24aa0341d04359b45029c7faa54675
Reviewed-on: https://gerrit.libreoffice.org/8446
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2014-03-04 09:54:51 -06:00
Arnaud Versini
6b114c2dbc Generate configure before calling ./configure --help
Change-Id: I21a88802b6ca617a44def3bc96789eb97969c918
Reviewed-on: https://gerrit.libreoffice.org/6291
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2013-11-13 18:17:35 +00:00
Isamu Mogi
92e484c4b5 Ignore empty line in autogen.input
Change-Id: I5a640c996779ba548c1b4772820eaa799537c1af
Reviewed-on: https://gerrit.libreoffice.org/4991
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Tested-by: Luboš Luňák <l.lunak@suse.cz>
2013-07-26 16:12:25 +00:00
Tor Lillqvist
df4fd344b7 Make it a fatal error to pass unrecognized options to the configury
It might hurt a bit in the beginning if you have been careless with keeping
your autogen.input up-to-date, but I think this is a good idea.

Change-Id: I6b89c887c94755ac6ef50f63e0438ecec7157516
2013-05-08 13:36:46 +03:00
Caolán McNamara
53e6c47593 aix stuffs stuff into /opt/freeware/share in defacto default
Change-Id: I2cd8e3498f81b96041c81cdc48ca6277ccbb210d
2013-04-22 10:46:28 +01:00
Luboš Luňák
68c314fc80 revert back to usign autogen.sh cmdline arguments if given
This is a partial revert of ca0c54d0fe3812cec64e5c7cc83309d4397f5e0a .
Ignoring cmdline arguments if autogen.* exists is broken for several reasons:
- autogen.sh of every other package passes cmdline arguments to configure
- that's because if I was bothered to give them, I want them used
- there's no reason to prefer autogen.input now, given that autogen.input
  cannot be overwritten by autogen.sh, unlike autogen.lastrun , so there's
  no accidental loss of the switches
- running autogen.sh --foo followed by autogen.sh --bar actually runs
  configure with --foo the second time too, because the first one creates
  autogen.lastrun and the second one first complains about the cmdline
  args, then complains about autogen.lastrun, and then uses it

Change-Id: I5868610935d0312915be74602b6435eea069f937
Reviewed-on: https://gerrit.libreoffice.org/3190
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Tested-by: Luboš Luňák <l.lunak@suse.cz>
2013-04-04 10:33:20 +00:00
Tor Lillqvist
ca0c54d0fe Make autogen.sh prefer to read an autogen.input file
For backward compatibility, an autogen.lastrun file will still be used if it
exists and autogen.input does not exist. The recommended workflow is now to
keep the configuration parametets in autogen.input which is never written by
autogen.sh.

Most (?) developers used to treat autogen.lastrun as a valuable parameter file
to be edited manually anyway, and not as an ad-hoc backup copy of command-line
parameters last used. The name autogen.input better reflects this usage.

Change-Id: I7e3c747fa95e9f2f0bc44036419aaab8f4ad01e7
Reviewed-on: https://gerrit.libreoffice.org/3111
Reviewed-by: Michael Meeks <michael.meeks@suse.com>
Tested-by: Michael Meeks <michael.meeks@suse.com>
2013-04-03 13:16:56 +00:00
Norbert Thiebaud
ae4e327739 Prepare for read-only source build
This patch allows to do

mkdir <build_dir>
cd <build_dir>
<src_root>/autogen.sh
make

Only the remaining dmake modules are poluting the <src_root>...
which will get eventually convererd to gmake...

Change-Id: Iefd64732fa12e096d554cff4eee6b777deb92338
Reviewed-on: https://gerrit.libreoffice.org/1273
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2012-12-11 14:26:30 +00:00
Tor Lillqvist
b8f3214f5c Don't require configure to appear executable
Makes autogen.sh work on Cygwin when the build directory is on a
vmware Shared Folder volume.
2012-12-01 08:35:04 +02:00
Enrico Weigelt, metux ITS
695c1946e6 Fixed previous commit on autogen.sh default config
Change-Id: I29cc49dcc284b462ac29d0d040e331f3e6d08e74
Reviewed-on: https://gerrit.libreoffice.org/1097
Reviewed-by: Rene Engelhard <rene@debian.org>
Tested-by: Rene Engelhard <rene@debian.org>
2012-11-17 13:54:16 +00:00
Enrico Weigelt, metux ITS
c1caa1dca8 autogen.sh: support for default distro config
Always try to read distro-configs/default.conf (if existing) before
any option parsing.

That way, downstreams (distros, etc) can just place there site config
into the tree without having to pass any additional options to autogen.sh,
and even automatic invocations will always have the right parameters.

Change-Id: Ic5bf68adc719476d374cf03e31e054b69c931b72
Reviewed-on: https://gerrit.libreoffice.org/1096
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>
2012-11-17 10:21:56 +00:00
Stephan Bergmann
1dfb956306 Indentation clean up
Change-Id: I1e3633f5bbf6b3ad0cdb2005a2a5608f3265ffdb
2012-06-05 14:18:40 +02:00
Ruslan Kabatsayev
cbe733f19a autogen.sh: append aclocal arguments to ACLOCAL_FLAGS unconditionally
Change-Id: I2254628edfe213c3424dce2bc5d9f164752e913c
2012-05-17 11:04:56 +02:00
Michael Meeks
02f385b9ea deal with symlinks in your PWD breaking gnumake dependencies 2012-03-29 17:28:11 +01:00
Josh Heidenreich
6635337181 Fix authgen.sh to not clobber autogen.lastrun when using --help
Fix also works for -h and -?
2012-03-13 08:58:31 +10:30
Thomas Collerton
0847fd63d7 Improvement to fdo#46565 2012-03-05 10:41:25 +02:00
Thomas Collerton
39d026a11f fdo#46565: perl / autogen.sh should backup autogen.lastrun 2012-02-29 11:33:35 +00:00
David Tardon
12c35f511e add macro for extracting mingw dll names from libtool files
Hardcoding dll names from SuSE Linux in configure.in is not good,
because they might be slightly different on other systems (notably
Fedora :-), or the libraries might be compiled with different
dependencies.
2012-02-17 15:53:58 +01:00
Miklos Vajna
a36addcc85 autogen: sync vim modeline with emacs one 2012-01-09 22:42:09 +01:00
Stephan Bergmann
8d6d6bd8bd Fix to create autogen.lastrun for a single argument case. 2011-08-30 21:53:24 -04:00
Miklos Vajna
e4278fa989 autogen.sh: don't touch autogen.lastrun if it already exists 2011-08-29 09:04:42 +02:00
Norbert Thiebaud
3ea37ac700 touch autogen.lastrun to make sure that such file exist before make 2011-08-28 13:59:10 -05:00
Tor Lillqvist
e058530153 Allow comments in the autogen.lastrun file 2011-08-24 18:01:46 +03:00
Norbert Thiebaud
2a9692a465 have autogen.sh return an erro if configure failed 2011-08-18 00:26:14 -05:00
Tor Lillqvist
da456ccd77 I doubt we need a ChangeLog file 2011-07-03 17:13:53 +03:00
Tor Lillqvist
e3a07b8a6c Include environment variables already in autogen.sh's environment 2011-07-03 17:08:32 +03:00
Tor Lillqvist
173997227e Allow use of $ACLOCAL to override the name aclocal
Useful for instance when only aclocal-1.10 exists. But, systems that
are broken like that will have lots of more problems, too. It is just
a (sad?) fact that building LO on anything except those platforms that
people work on constantly will require lots of tweaks. Many of the
assumptions in various solenv .mk files for rare platforms are rather
outdated and/or arbitrary, assuming a certain mix of more or less
"official" additional tools.
2011-07-03 10:56:49 +03:00
Tor Lillqvist
29a2abb9a3 We should not look for .exe extensions for Cygwin programs 2011-05-31 10:32:37 +03:00
Tor Lillqvist
471fd2e4e8 Stylize consistently, add more Emacs mode goodness 2011-05-31 10:00:39 +03:00
Christian Lohmaier
90a9bed187 one doesn't need pkg-config on mac 2011-05-30 17:35:24 +02:00
Michael Meeks
dd771be140 initial attempt to avoid ugly errors with missing pkgconfig etc. 2011-05-30 15:23:15 +01:00
Tor Lillqvist
98bbdc8bcb Add Emacs and vim mode setting 2011-05-29 19:41:28 +03:00
Tor Lillqvist
1ec7b6a496 Don't overwrite autogen.lastrun with identical (perhaps re-ordered) contents 2011-05-29 19:41:28 +03:00
Jan Holesovsky
ca907e0220 Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
	Makefile.in
	Repository.mk
	autogen.sh
	bin/lo-commit-stat
	configure.in
	distro-configs/LibreOfficeOpenBSD.conf
	distro-configs/LibreOfficeWin32.conf
	instsetoo_native/util/openoffice.lst
	ooo.lst.in
	scp2/source/ooo/module_langpack.ulf
	set_soenv.in
	solenv/bin/ooinstall
	solenv/gbuild/CppunitTest.mk
	solenv/gbuild/Library.mk
	solenv/gbuild/LinkTarget.mk
	solenv/gbuild/TargetLocations.mk
	solenv/gbuild/platform/macosx.mk
	solenv/gbuild/platform/solaris.mk
	solenv/gbuild/platform/unxgcc.mk
	solenv/gbuild/platform/windows.mk
	solenv/inc/minor.mk
	solenv/inc/settings.mk
	tail_build/prj/makefile.mk
2011-05-27 20:39:04 +02:00
Jan Holesovsky
56c4710008 Don't mention that we are updating autogen.lastrun. 2011-04-15 14:20:36 +02:00
Tor Lillqvist
47bca2f064 Don't worry if there is no distro-configs/Foo.conf
The --with-distro options might come from bin/build-ooo in a "build"
style build, and in that case, the relevant configure options are
already on the command line, too.
2011-04-08 13:30:17 +03:00
Tor Lillqvist
45f8c190a9 Make the list of valid distros show up also in slightly older Perl versions
See http://perldoc.perl.org/functions/readdir.html .
2011-04-08 13:30:15 +03:00
Norbert Thiebaud
b8f27e21e5 fix the autogen perl wrapper: mishandling of the Darwins-pecific aclocal
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
2011-04-07 14:34:59 +02:00
Jan Holesovsky
c0b9fdfbba Migrate the old autogen.lastrun format to the new one automatically.
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
2011-04-07 14:33:40 +02:00
Michael Meeks
1e5339ec92 re-write into perl, to reduce ninja-coding, and fix distro-config bug
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
2011-04-07 14:33:04 +02:00
Michael Meeks
396fd9fc61 check more carefully for configure generation, and fix quoting of vendors 2011-04-07 13:27:47 +01:00