Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
4f6401df
Commit
4f6401df
authored
Sep 23, 2017
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
configure: Merge separate parts of GnuTLS test
parent
3613063e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
configure
configure
+2
-3
No files found.
configure
View file @
4f6401df
...
@@ -4686,7 +4686,8 @@ enabled avxsynth && require_header avxsynth/avxsynth_c.h
...
@@ -4686,7 +4686,8 @@ enabled avxsynth && require_header avxsynth/avxsynth_c.h
enabled cuda
&&
require cuda cuda.h cuInit
-lcuda
enabled cuda
&&
require cuda cuda.h cuInit
-lcuda
enabled cuvid
&&
require cuvid cuviddec.h cuvidCreateDecoder
-lnvcuvid
enabled cuvid
&&
require cuvid cuviddec.h cuvidCreateDecoder
-lnvcuvid
enabled frei0r
&&
require_header frei0r.h
enabled frei0r
&&
require_header frei0r.h
enabled gnutls
&&
require_pkg_config gnutls gnutls gnutls/gnutls.h gnutls_global_init
enabled gnutls
&&
require_pkg_config gnutls gnutls gnutls/gnutls.h gnutls_global_init
&&
check_lib gmp gmp.h mpz_export
-lgmp
enabled libbs2b
&&
require_pkg_config libbs2b libbs2b bs2b.h bs2b_open
enabled libbs2b
&&
require_pkg_config libbs2b libbs2b bs2b.h bs2b_open
enabled libdc1394
&&
require_pkg_config libdc1394 libdc1394-2 dc1394/dc1394.h dc1394_new
enabled libdc1394
&&
require_pkg_config libdc1394 libdc1394-2 dc1394/dc1394.h dc1394_new
enabled libdcadec
&&
require libdcadec libdcadec/dca_context.h dcadec_context_create
-ldcadec
enabled libdcadec
&&
require libdcadec libdcadec/dca_context.h dcadec_context_create
-ldcadec
...
@@ -4759,8 +4760,6 @@ enabled openssl && { { check_pkg_config openssl openssl openssl/ssl.h
...
@@ -4759,8 +4760,6 @@ enabled openssl && { { check_pkg_config openssl openssl openssl/ssl.h
check_lib openssl openssl/ssl.h SSL_library_init
-lssl
-lcrypto
-lws2_32
-lgdi32
||
check_lib openssl openssl/ssl.h SSL_library_init
-lssl
-lcrypto
-lws2_32
-lgdi32
||
die
"ERROR: openssl not found"
;
}
die
"ERROR: openssl not found"
;
}
enabled gnutls
&&
check_lib gmp gmp.h mpz_export
-lgmp
# SDL adds some CFLAGS that should not be part of the general CFLAGS.
# SDL adds some CFLAGS that should not be part of the general CFLAGS.
enabled avplay
&&
enabled avplay
&&
test_pkg_config sdl
"sdl >= 1.2.1 sdl < 1.3.0"
SDL_events.h SDL_PollEvent
test_pkg_config sdl
"sdl >= 1.2.1 sdl < 1.3.0"
SDL_events.h SDL_PollEvent
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment