diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2008-11-04 15:07:54 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2008-11-04 15:07:54 +0000 |
| commit | 448562af93f8bec88e08cbaefa0dcf3d0dec64b8 (patch) | |
| tree | 548e478f6f70019b55bacc485591167d46591add /makeopts.in | |
| parent | 46d7e8dafa3602bd96a83706aa8382471e0af4f1 (diff) | |
improve configure script to remember the previous value of each dependency in build_tools/menuselect-deps, so that (once it has been written) menuselect can use this information to warn the user when a previously met dependency is no longer met
along the way, change tags used in configure script, menuselect-deps and code for various dependencies to be consistently named
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@154151 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'makeopts.in')
| -rw-r--r-- | makeopts.in | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/makeopts.in b/makeopts.in index eeccc1f8a..3856d89d4 100644 --- a/makeopts.in +++ b/makeopts.in @@ -68,8 +68,8 @@ AST_DECLARATION_AFTER_STATEMENT=@AST_DECLARATION_AFTER_STATEMENT@ AST_NO_STRICT_OVERFLOW=@AST_NO_STRICT_OVERFLOW@ AST_SHADOW_WARNINGS=@AST_SHADOW_WARNINGS@ -ASOUND_INCLUDE=@ALSA_INCLUDE@ -ASOUND_LIB=@ALSA_LIB@ +ALSA_INCLUDE=@ALSA_INCLUDE@ +ALSA_LIB=@ALSA_LIB@ CURL_INCLUDE=@CURL_INCLUDE@ CURL_LIB=@CURL_LIB@ @@ -140,8 +140,8 @@ OSPTK_LIB=@OSPTK_LIB@ # ossaudio can optionally use ffmpeg, x11, sdl and sdl_image. # Because sdl_image in turn depends on sdl, we don't duplicate the include -OSSAUDIO_INCLUDE=@OSS_INCLUDE@ @FFMPEG_INCLUDE@ @SDL_INCLUDE@ @X11_INCLUDE@ -OSSAUDIO_LIB=@OSS_LIB@ @FFMPEG_LIB@ @SDL_LIB@ @SDL_IMAGE_LIB@ @X11_LIB@ +OSS_INCLUDE=@OSS_INCLUDE@ @FFMPEG_INCLUDE@ @SDL_INCLUDE@ @X11_INCLUDE@ +OSS_LIB=@OSS_LIB@ @FFMPEG_LIB@ @SDL_LIB@ @SDL_IMAGE_LIB@ @X11_LIB@ PGSQL_INCLUDE=@PGSQL_INCLUDE@ PGSQL_LIB=@PGSQL_LIB@ @@ -197,8 +197,8 @@ SQLITE_LIB=@SQLITE_LIB@ SQLITE3_INCLUDE=@SQLITE3_INCLUDE@ SQLITE3_LIB=@SQLITE3_LIB@ -SSL_INCLUDE=@OPENSSL_INCLUDE@ -SSL_LIB=@OPENSSL_LIB@ +OPENSSL_INCLUDE=@OPENSSL_INCLUDE@ +OPENSSL_LIB=@OPENSSL_LIB@ CRYPTO_INCLUDE=@CRYPTO_INCLUDE@ CRYPTO_LIB=@CRYPTO_LIB@ @@ -215,8 +215,8 @@ UNIXODBC_LIB=@UNIXODBC_LIB@ VORBIS_INCLUDE=@VORBIS_INCLUDE@ VORBIS_LIB=@VORBIS_LIB@ -VPBAPI_INCLUDE=@VPB_INCLUDE@ -VPBAPI_LIB=@VPB_LIB@ +VPB_INCLUDE=@VPB_INCLUDE@ +VPB_LIB=@VPB_LIB@ DAHDI_INCLUDE=@DAHDI_INCLUDE@ |