Commit Graph

103 Commits

Author SHA1 Message Date
Patrick Monnerat
fdee523452 buildconf: do not search tools in current directory. 2014-06-18 15:41:06 +02:00
Yang Tse
4a5aa6682d Revert changes relative to lib/*.[ch] recent renaming
This reverts renaming and usage of lib/*.h header files done
28-12-2012, reverting 2 commits:

  f871de0... build: make use of 76 lib/*.h renamed files
  ffd8e12... build: rename 76 lib/*.h files

This also reverts removal of redundant include guard (redundant thanks
to changes in above commits) done 2-12-2013, reverting 1 commit:

  c087374... curl_setup.h: remove redundant include guard

This also reverts renaming and usage of lib/*.c source files done
3-12-2013, reverting 3 commits:

  13606bb... build: make use of 93 lib/*.c renamed files
  5b6e792... build: rename 93 lib/*.c files
  7d83dff... build: commit 13606bbfde follow-up 1

Start of related discussion thread:

  http://curl.haxx.se/mail/lib-2013-01/0012.html

Asking for confirmation on pushing this revertion commit:

  http://curl.haxx.se/mail/lib-2013-01/0048.html

Confirmation summary:

  http://curl.haxx.se/mail/lib-2013-01/0079.html

NOTICE: The list of 2 files that have been modified by other
intermixed commits, while renamed, and also by at least one
of the 6 commits this one reverts follows below. These 2 files
will exhibit a hole in history unless git's '--follow' option
is used when viewing logs.

  lib/curl_imap.h
  lib/curl_smtp.h
2013-01-06 18:20:27 +01:00
Yang Tse
f871de0064 build: make use of 76 lib/*.h renamed files
76 private header files renamed to use our standard naming scheme.

This change affects 322 files in libcurl's source tree.
2012-12-28 19:37:11 +01:00
Yang Tse
919c97fa65 curl tool: use configuration files from lib directory
Configuration files such as curl_config.h and all config-*.h no longer exist
nor are generated/copied into 'src' directory, now these only exist in 'lib'
directory from where curl tool sources uses them.

Additionally old src/setup.h has been refactored into src/tool_setup.h which
now pulls lib/setup.h

The possibility of a makefile needing an include path adjustment exists.
2012-04-06 23:37:05 +02:00
Yang Tse
f8cd217f04 buildconf: minor tweaks commit 430527a1 follow-up 2011-12-23 17:45:42 +01:00
Yang Tse
430527a1d7 buildconf: minor tweaks 2011-12-21 16:21:37 +01:00
Yang Tse
34f9ec0c54 configure: libtool 1.5 tweaks 2011-12-15 18:01:00 +01:00
Yang Tse
c92234c3bc buildconf: follow-up for commit 7e02f7fd 2011-11-30 21:53:21 +01:00
Yang Tse
7e02f7fdee buildconf: fix libtool 1.5.x warnings triggered with autoconf 2.6x or later
Using libtool 1.5.x (x < 26) with autoconf 2.6x or later generates warnings
due to some libtool variables not following naming convention for variables
that will be cached.

This is addressed renaming a couple of variables to make these follow expected
naming convention.
2011-11-30 19:33:38 +01:00
Yang Tse
7afccf7a1e buildconf: warn about autoconf 2.67 and 2.68 generating bad/unusable scripts 2011-10-06 12:57:12 +02:00
Yang Tse
49b79b7631 curl tool: code moved to tool_*.[ch] files 2011-10-05 00:03:58 +02:00
Fabian Keil
5942362847 Fix spelling errors in buildconf
Found with codespell.
2011-04-21 07:55:53 -07:00
Yang Tse
ef24ecde68 symbol-scan: use configure script knowledge about how to run the C preprocessor 2010-11-25 21:05:20 +01:00
Yang Tse
fec5f03e22 buildconf: MAC OS X requires libtool version 1.5.26 or newer
MAC OS X requires libtool version 1.5.26 or newer, otherwise
configure will mishandle *.dSYM directories when it runs.
2010-11-11 12:35:12 +01:00
Fabian Keil
892d6930e7 In the m4 detection line, factor out the 2>dev/null 2010-08-28 22:51:22 +02:00
Fabian Keil
200e9b5dd1 If m4 doesn't support --version, try if gm4 does. 2010-08-28 22:51:22 +02:00
Fabian Keil
b0873cb657 If the m4 version isn't recognized at all, just say so
'm4 version  found. You need a GNU m4 installed!' is a bit confusing.
2010-08-28 22:51:22 +02:00
Daniel Stenberg
a784ed6065 findtool: file name as a full path requires a slash
Kalle Vahlman's patch applied a while ago broke how the findtool
function searches for tools, as it would always check if "$file"
was present first, which thus made the bad assumption that a file
in the current directory would be a match.

I noticed when it found 'libtool' in the current directory but
libtoolize is not there, which confused the script.
2010-05-09 23:16:37 +02:00
Kalle Vahlman
a7b9452a6b Allow tools to be defined with full path in buildconf
This is required in Scratchbox where
LIBTOOL=/targets/links/arch_tools/bin/libtool
is set in the environment.
2010-04-26 15:54:09 +02:00
Daniel Stenberg
be28825b2d restore executable bits on some files 2010-03-24 11:07:35 +01:00
Daniel Stenberg
2309b4e330 remove the CVSish $Id$ lines 2010-03-24 11:02:54 +01:00
Yang Tse
a2ddb0a61b Add a couple of renamed files to the removal list 2009-11-15 03:46:14 +00:00
Gunter Knauf
f671d0513c renamed generated config.h to curl_config.h in order to avoid clashes when libcurl is used with other projects which also have a config.h. 2009-07-14 13:25:14 +00:00
Yang Tse
ee6a618116 Adjusted libtool version parsing due to libtool --version now also
reporting package version in parentheses which confused this script.

Remove debug tracing used to debug this.
2009-06-08 00:07:18 +00:00
Yang Tse
d71c1514f2 debug test a non-greedy pattern 2009-06-07 00:48:57 +00:00
Yang Tse
2df75e84e7 Add some debug tracing 2009-06-06 20:24:58 +00:00
Yang Tse
9ab89734de remove the ofending regexp 2009-06-06 17:22:00 +00:00
Yang Tse
960c0319c4 remove line not intended to be committed 2009-06-06 14:30:47 +00:00
Yang Tse
439891cb9f attempt to fix regex 2009-06-06 14:27:28 +00:00
Yang Tse
bdfb3ef11c Adjusted libtool version parsing due to libtool --version now also
reporting package name in parentheses which confused this script.
2009-06-06 13:22:15 +00:00
Yang Tse
e3d65389d7 Depending on the libtool and automake versions being used config.guess gets
installed in the subdirectory at different stages. With some versions it is
installed when libtoolize finishes, but with others it is not installed
until automake has finished.

So we can not attempt to use config.guess until the very last buildconf stage.
2009-06-05 18:07:47 +00:00
Yang Tse
52b2bc4109 Remove more generated files.
Yet unknown error might leave libtool-like files in source directory.
2009-06-03 10:34:37 +00:00
Yang Tse
b59b3a5152 Remove more generated files 2009-06-03 03:15:19 +00:00
Yang Tse
fe6c03370e Remove all generated 'Makefile' files.
This can be done now that no file with such name exists in CVS tree.
2009-06-03 00:57:18 +00:00
Yang Tse
e3f128875c Remove more generated files 2009-06-03 00:08:09 +00:00
Yang Tse
3c38eafd75 Temporarily disable config.guess related checks 2009-06-01 18:22:03 +00:00
Yang Tse
0a1b7296b9 HP-UX requires libtool version 1.5.24 or newer 2009-06-01 02:47:57 +00:00
Daniel Stenberg
c86c294f55 - Andreas Farber made the 'buildconf' script check for the presence of m4
scripts to make it detect a bad checkout earlier. People with older
  checkouts who don't do cvs update with the -d option won't get the new dirs
  and then will get funny outputs that can be a bit hard to understand and
  fix.
2009-03-09 09:24:31 +00:00
Yang Tse
0cf10ae4d7 Remove following files generated on previous buildconf run:
ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4
2009-02-13 06:25:35 +00:00
Daniel Stenberg
0090099565 Only care about the first line of libtool --version as otherwise this script
get fooled by libtool 2, and at least libtool 1.5.2x do output the interesting
version string in the first line.
2009-01-08 22:53:37 +00:00
Yang Tse
11cb78c5f8 curlbuild.h is a generated file on configure-capable systems 2008-08-14 23:55:24 +00:00
Yang Tse
fa2a8f6fb8 Prevent buildconf from removing 'Makefile' and 'missing' files. This would blow
away our CVS checked 'missing' file and also CVS checked 'hiper/Makefile'.
2008-08-07 16:22:25 +00:00
Yang Tse
09f278121e Validate that autom4te and autoconf versions match.
Validate that aclocal and automake versions match.

Improve removal of previous run generated files.

Remove verbose debug logging of aclocal on Solaris.
2008-08-05 06:20:18 +00:00
Yang Tse
a948ca1669 This line was for local testing, not intended to be committed. 2008-08-01 07:46:21 +00:00
Yang Tse
2d15d84a01 Ensure that reserved keyword AC_DEFUN is only used for its purpose. 2008-08-01 06:07:43 +00:00
Yang Tse
a3498f96ef Reinstate the 'aclocal -I m4' in buildconf and 'ACLOCAL_AMFLAGS = -I m4' way of
including our local m4/reentrant.m4 file. This even takes care of including the
file in the distribution tarball.
2008-07-30 03:10:03 +00:00
Yang Tse
637bfa0252 Show autom4te and aclocal versions.
Set SED for Solaris to gsed if available.
2008-07-30 01:17:15 +00:00
Yang Tse
5dafa4a270 For testing purposes on SunOS systems; directly feed acinclude.m4 with
reentrant.m4 and remove reentrant.m4 before calling aclocal.
2008-07-29 19:31:34 +00:00
Yang Tse
e93bcbeee1 For debugging purposes, show all sed's available in PATH on SunOS systems. 2008-07-29 19:01:34 +00:00
Yang Tse
52d9a3c34f Tests done using 'aclocal -I m4' in buildconf and 'ACLOCAL_AMFLAGS = -I m4
in top Makefile.am triggered a problem that prevented aclocal from running
successfully on SunOS 5.10 with GNU m4 1.4.5 and GNU Autoconf 2.61

A tarball which reproduces mentioned problem is the one dated July-28-2008
http://cool.haxx.se/curl-daily/curl-7.19.0-20080728.tar.gz

We actually don't need all the bells and whistles that the above mechanism
provides. We only need to include our m4/reentrant.m4 file in acinclude.m4
so here we go with this simpler mechanism.
2008-07-29 02:26:21 +00:00