diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-04 01:16:26 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-04 01:16:26 +0000 |
commit | a304ab51c0a68e99957c4fe580f647a910dcba0d (patch) | |
tree | 489e8e0ec860025ea20b5f4c3ddbba44333b82f5 /configure.ac | |
parent | bbd2b8e467973919d3e924c41df4b64a40daef71 (diff) |
Make the default install path appear to be /usr on Linux, instead of /usr/local.
Also, reorganize the options, so that they're more alphabetical.
(closes issue #17013)
Reported by: klaus3000
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@267759 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index ac5fbe3e5..9be90175a 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,10 @@ AC_PREREQ(2.60) -AC_INIT(asterisk, 1.4, www.asterisk.org) +AC_INIT([asterisk], [1.4], [https://issues.asterisk.org]) + +# Allow the --help=recursive option to function correctly +AC_CONFIG_SUBDIRS([menuselect]) # cross-compile macros AC_CANONICAL_BUILD @@ -23,15 +26,16 @@ AC_USE_SYSTEM_EXTENSIONS # note- does not work on FreeBSD case "${host_os}" in freebsd*) - ac_default_prefix=/usr/local + AC_PREFIX_DEFAULT([/usr/local]) CPPFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib ;; darwin*) + AC_PREFIX_DEFAULT([/usr/local]) AC_DEFINE([AST_POLL_COMPAT], 1, [Define to 1 if internal poll should be used.]) ;; *) - ac_default_prefix=/usr + AC_PREFIX_DEFAULT([/usr]) if test ${prefix} = '/usr' || test ${prefix} = 'NONE'; then if test ${sysconfdir} = '${prefix}/etc'; then sysconfdir=/etc @@ -228,16 +232,17 @@ AC_SUBST(AST_DEVMODE) # by the --with option name, to make things easier for the users :-) AST_EXT_LIB_SETUP([ALSA], [Advanced Linux Sound Architecture], [asound]) -AST_EXT_LIB_SETUP([CURL], [cURL], [curl]) AST_EXT_LIB_SETUP([CAP], [POSIX 1.e capabilities], [cap]) AST_EXT_LIB_SETUP([CURSES], [curses], [curses]) AST_EXT_LIB_SETUP([DAHDI], [DAHDI], [dahdi]) AST_EXT_LIB_SETUP([GNUTLS], [GNU TLS support (used for iksemel only)], [gnutls]) AST_EXT_LIB_SETUP([GSM], [GSM], [gsm], [, or 'internal']) +AST_EXT_LIB_SETUP([OPENH323], [OpenH323], [h323]) AST_EXT_LIB_SETUP([IKSEMEL], [Iksemel Jabber Library], [iksemel]) AST_EXT_LIB_SETUP([IMAP_TK], [UW IMAP Toolkit], [imap]) AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet]) AST_EXT_LIB_SETUP([KDE], [KDE], [kde]) +AST_LIBCURL_CHECK_CONFIG([], [7.10.1]) AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl]) AST_EXT_LIB_SETUP([MISDN], [mISDN User Library], [misdn]) AST_EXT_LIB_SETUP([NBS], [Network Broadcast Sound], [nbs]) @@ -246,6 +251,8 @@ AST_EXT_LIB_SETUP([NETSNMP], [Net-SNMP], [netsnmp]) AST_EXT_LIB_SETUP([NEWT], [newt], [newt]) AST_EXT_LIB_SETUP([UNIXODBC], [unixODBC], [odbc]) AST_EXT_LIB_SETUP([OGG], [OGG], [ogg]) +AST_EXT_LIB_SETUP([OPENAIS], [OpenAIS], [openais]) +AST_EXT_LIB_SETUP([OPENR2], [MFR2], [openr2]) AST_EXT_LIB_SETUP([OSPTK], [OSP Toolkit], [osptk]) AST_EXT_LIB_SETUP([OSS], [Open Sound System], [oss]) AST_EXT_LIB_SETUP([POPT], [popt], [popt]) @@ -254,14 +261,13 @@ AST_EXT_LIB_SETUP([PRI], [ISDN PRI], [pri]) AST_EXT_LIB_SETUP_DEPENDENT([PRI_VERSION], [ISDN PRI get_version], [PRI], [pri]) AST_EXT_LIB_SETUP_DEPENDENT([PRI_INBANDDISCONNECT], [ISDN PRI set_inbanddisconnect], [PRI], [pri]) AST_EXT_LIB_SETUP([PWLIB], [PWlib], [pwlib]) -AST_EXT_LIB_SETUP([OPENH323], [OpenH323], [h323]) AST_EXT_LIB_SETUP([RADIUS], [Radius Client], [radius]) AST_EXT_LIB_SETUP([SPEEX], [Speex], [speex]) AST_EXT_LIB_SETUP([SPEEXDSP], [Speexdsp], [speexdsp]) AST_EXT_LIB_SETUP_DEPENDENT([SPEEX_PREPROCESS], [speex_preprocess_ctl], [], [speex]) AST_EXT_LIB_SETUP([SQLITE], [SQLite], [sqlite]) -AST_EXT_LIB_SETUP([SUPPSERV], [mISDN Supplemental Services], [suppserv]) AST_EXT_LIB_SETUP([OPENSSL], [OpenSSL], [ssl]) +AST_EXT_LIB_SETUP([SUPPSERV], [mISDN Supplemental Services], [suppserv]) AST_EXT_LIB_SETUP([FREETDS], [FreeTDS], [tds]) AST_EXT_LIB_SETUP([TERMCAP], [Termcap], [termcap]) AST_EXT_LIB_SETUP([TINFO], [Term Info], [tinfo]) @@ -1722,8 +1728,6 @@ AC_SUBST(PBX_GTK2) AC_SUBST(GTK2_INCLUDE) AC_SUBST(GTK2_LIB) -AST_LIBCURL_CHECK_CONFIG([], [7.10.1]) - AC_CONFIG_FILES([build_tools/menuselect-deps makeopts channels/h323/Makefile]) AC_OUTPUT |