Commit Graph

427 Commits

Author SHA1 Message Date
Russell Bryant
d5d3acb67f Clear CFLAGS before running make for menuselect.
(issue #9784, reported by ovi, patch by me)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@65978 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-24 19:05:08 +00:00
Tilghman Lesher
913f9b90a0 Merged revisions 63903 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r63903 | tilghman | 2007-05-11 11:31:03 -0500 (Fri, 11 May 2007) | 2 lines

Issue 9121 - fixups for safe_asterisk script

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@63905 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-11 16:35:51 +00:00
Russell Bryant
ab7e5b5c7e I have seen multiple people post questions trying to figure out what the
message "The configure script must be executed before running 'make'" means.
So, add another like that says to specifically run ./configure.  If this isn't
obvious enough, then they should be using something like AsteriskNOW and not
installing from source.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@63535 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-09 13:24:03 +00:00
Russell Bryant
af0f8ba422 Ensure that menuselect gets executed in dependency check mode every time you run make.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@59853 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-03 16:03:35 +00:00
Russell Bryant
fd7085a3ab Export the GTK2 library and include information to sub Makefiles.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@59304 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-29 16:25:41 +00:00
Russell Bryant
1b8da31130 Making these documentation changes in the 1.4 branch upset various people, so
these chanes will only be done in the trunk.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@58955 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-16 01:41:00 +00:00
Russell Bryant
fed69df9cd Add configure script checking for GTK2 and some additional Makefile targets
to support gmenuselect


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@58947 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-15 23:53:26 +00:00
Russell Bryant
36aed17ca1 Add Asterisk version information to the generated PDF
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@58937 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-15 22:51:29 +00:00
Russell Bryant
c474809cdf Merge changes from svn/asterisk/team/russell/LaTeX_docs.
* Convert most of the doc directory into a single LaTeX formatted document
  so that we can generate a PDF, HTML, or other formats from this
  information.
* Add a CLI command to dump the application documentation into LaTeX format
  which will only be include if the configure script is run with 
  --enable-dev-mode.
* The PDF turned out to be close to 1 MB, so it is not included.  However, you
  can simply run "make asterisk.pdf" to generate it yourself.  We may include
  it in release tarballs or have automatically generated ones on the web site,
  but that has yet to be decided.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@58931 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-15 22:25:12 +00:00
Joshua Colp
177baaecc6 Add systemname to asterisk.conf generation per recent discussions about it. (issue #8968 reported by blitzrage)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53114 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-02 15:29:35 +00:00
Russell Bryant
eedd121fbc Ensure that the locations given to the Asterisk configure script for ncurses,
curses, termcap, or tinfo are further passed along to the editline configure
script.  This fixes some cross-compilation environments.
(issue #8637, reported by ovi, patch by me)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@51262 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-18 21:54:23 +00:00
Kevin P. Fleming
30e4f113a4 when building the sample greetings for maibox 1234@default during 'make samples', build a greeting for each language and file format the user selected to install with menuselect (reported by Brian Capouch on asterisk-dev)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@50754 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-13 16:45:37 +00:00
Russell Bryant
8fb6be645e Merged revisions 50227 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r50227 | russell | 2007-01-09 21:16:45 -0500 (Tue, 09 Jan 2007) | 6 lines

Make the number that represents the major version number a single digit instead
of 2.  Using two digits makes it an octal number when put into version.h, which
breaks the compilation of any out of tree module that checks the version for
any version after 1.2.7 (reported by Matteo Brancaleoni on the asterisk-dev
mailing list, who gave credit to vihai for pointing it out)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@50228 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-10 02:17:46 +00:00
Kevin P. Fleming
8332521122 various Makefile improvements to get chan_vpb (and any other C++ modules) to build properly
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@49282 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-03 03:21:25 +00:00
Kevin P. Fleming
9944304c2f use a simpler (and portable) method to ensure that menuselect is built as a host binary
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@49099 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-01 22:48:03 +00:00
Kevin P. Fleming
6e45c965e1 revert this change until a better solution can be found... 'env -i' was not being used properly, but even when changed to do so, this process fails during cross-compilation because the menuselect build still sees 'CC' as set to the cross-compiler
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@49098 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-01 22:08:24 +00:00
Jason Parker
d017436015 Minor fixes for Solaris.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@48906 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-22 22:33:46 +00:00
Joshua Colp
14f57685be Use env -i to start a fresh environment when going to build menuselect. This is more portable then using unset. (issue #8543 reported by jtodd)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@48571 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-19 03:46:12 +00:00
Kevin P. Fleming
0509ca82b4 simplify dependency tracking system, using the compiler's built-in method for generating them, and only doing dependency tracking if developer mode is enabled via the configure script
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@48525 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-16 21:14:34 +00:00
Kevin P. Fleming
be1b5dab06 since we really, really have to have autoconfig.h included before all other headers (especially system headers), the Makefile will now force it to happen (this will fix build problems with files like ast_expr2f.c, where we can't control the inclusion order in the file itself)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@48521 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-16 20:12:41 +00:00
Russell Bryant
fee1970293 FreeBSD 6.1 does not include wget by default. However, it has fetch which will
work just fine for our purposes of downloading the sounds packages.  So, check
for both wget and fetch and the configure script and use what was found to
download them.  If neither one was found, and sound packages are selected that
must be downloaded, the install process will print out an informative error
message indicating the situation.

Also, fix a couple places where "make" was hard coded into some output messages
by replacing them with the $(MAKE) variable.

(issue #8451, initial patch by pabelanger, with additional modifications by me)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@48190 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-01 23:16:28 +00:00
Jason Parker
1b872bbcfa Export several more variables in top level Makefile. Inspired by issue 8438.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@48095 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-28 18:26:53 +00:00
Russell Bryant
3519337723 Add the target "menuconfig" as an alias for the "menuselect" target. This is
just a favor to users so that if you accidentally type "make menuconfig"
instead of "make menuselect", it still works.
(inspired by a comment on IRC from wangster calling me an "especially devious
asterisk developer" for having it be menuselect instead of menuconfig. :) )


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@47494 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-11 15:31:08 +00:00
Russell Bryant
468fbbf3ca Fixes for cross-compilation on mips
(issue #8058, ywalther, with some modifications)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@46847 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-01 22:51:21 +00:00
Russell Bryant
5cc4200696 Restore the ability to remove the firmware directory without causing the
installation to fail (issue #8111)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@46093 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-24 05:23:33 +00:00
Joshua Colp
8deedb83fa Pass DESTDIR and ASTSBINDIR so that the utilities get installed in the proper location (reported on asterisk-dev mailing list)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@45775 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-20 19:03:03 +00:00
Joshua Colp
4a4fc523b8 Pass off AUDIO_LIBS so muted can link on OSX (issue #8135 reported by ssokol)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@44942 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-12 16:08:50 +00:00
Luigi Rizzo
00a6fcb35e put linker flags in ASTLDFLAGS where they belong
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@44407 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-04 22:50:48 +00:00
Kevin P. Fleming
fc72291807 ensure that local include files are always used
avoid a duplicate function name (term_init())


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@44322 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-04 00:25:44 +00:00
Russell Bryant
aff14e6d89 Fix a problem that cuased AST_DATA_DIR in defaults.h to be empty. The cause is
that since ASTDATADIR is explicitly exported using "export ASTDATADIR" at the
top of the Makefile, make no longer considers the variable "undefined", so the
Makefile can't use ?= to set ASTDATADIR if not yet set.
(issue #8063, reported by akohlsmith, fixed by me)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@44125 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-01 18:30:06 +00:00
Luigi Rizzo
719ba6b535 fix two recent build problems:
- with AST_DEVMODE, building codecs/lpc10 fails because of lots
  of warnings, and the configure step in editline fails as well.
  Fix this by removing the -Werror in these steps.

- on FreeBSD (but probably on other platforms as well), the final
  link of asterisk fails because AST_LIBS was not exported to the
  subdirs Makefiles. Add a proper fix in the top-level Makefile
  (a possible alternative way is to add "export AST_LIBS" near
  the beginning of the file).
  With this fix, i believe that some of the platform-specific
  conditionals in main/Makefile are redundant (because they should
  be already dealt with in the top level Makefile) but i don't
  have a platform to check.
  
Merging to head will happen in a moment.



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@44080 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-30 16:28:39 +00:00
Kevin P. Fleming
704397dc3c don't abuse CFLAGS and LDFLAGS for build of Asterisk components, because they are also then used for non-Asterisk components (like menuselect); use our own variables instead
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@44008 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-29 18:25:49 +00:00
Kevin P. Fleming
9f2b0f44ec a couple more environment settings that can't leak into the menuselect build
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@43993 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-29 16:38:27 +00:00
Kevin P. Fleming
6a27cee242 don't output the 'build complete' message when the target being run is already going to do an installation
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@43524 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-22 23:44:47 +00:00
Kevin P. Fleming
1485fa4c24 move this header to include where it belongs
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43298 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-19 21:48:57 +00:00
Matthew Fredrickson
2cc96500bd Mergeing in Paul Cadach's chan_h323 changes *holds breath*
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43281 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-19 17:07:22 +00:00
Jason Parker
23def858f7 We have autoconf...let's actually use it.
(note, M4 wasn't used, so...bye)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43215 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-18 19:57:09 +00:00
Kevin P. Fleming
be29512d1e more makefile tweaks to keep targets from being run when they don't need to be
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@42505 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-09 03:27:21 +00:00
Kevin P. Fleming
3f189742f6 make menuselect configure process be silent when possible
don't use #ifdef inside a macro call... it appears various versions of gcc have bugs related to this


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@41284 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-29 23:33:59 +00:00
Kevin P. Fleming
3ba8e0a973 ensure that cross-compiler info is removed from the enviroment before configuring menuselect
ensure that the user's LDFLAGS take precedence when linking the final binary


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@41178 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-26 17:05:38 +00:00
Russell Bryant
b374245688 remove some unneeded variables now that the menuselect build is isolated from
the parent project


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@41165 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-26 16:13:45 +00:00
Luigi Rizzo
379dc24745 we really need BSD make here to understand the -V option.
Fix and document this.
(problem introduced in SVN 40753)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@41147 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-25 20:10:56 +00:00
Russell Bryant
5266cd75e3 remove CFLAGS that aren't needed anymore
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40990 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-24 18:57:46 +00:00
Jason Parker
2986a59fab Okay, there are 3 reasons why I'm doing this.
1) Solaris sed doesn't have -r, which means things like \s and \S don't work.
2) GNU sed version 4.1.2 failed on a very simple test
     echo "Test   Test" | sed -r -e 's/\s/x/g'
     should have returned "TestxxxTest", but did not (however, 4.1.4 did?).
3) The CFLAGS were never set, so that entire line actually did nothing.  Now it's useful again.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40964 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-24 01:21:41 +00:00
Russell Bryant
4c41a6ccd0 merge menuselect_build ... most of the changes happened in menuselect
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40877 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-23 03:07:34 +00:00
Jason Parker
0264c362b6 a couple Solaris tweaks, to help build properly.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40832 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-22 05:24:50 +00:00
Kevin P. Fleming
a87f710062 oops... missed one
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40792 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-21 20:19:47 +00:00
Kevin P. Fleming
90b0c32c71 another variable to clear out before configuring mxml
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40791 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-21 20:18:36 +00:00
Kevin P. Fleming
ff74cbc116 replace a couple of bare 'make' with $(MAKE)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40765 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-21 13:47:45 +00:00
Kevin P. Fleming
e044e852c6 ensure that 'make' after 'svn update' that includes a configure script change won't run without making the user run configure first
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40753 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-21 03:58:02 +00:00