Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
tg
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
tg
Commits
021e435e
Commit
021e435e
authored
Oct 19, 2015
by
V V
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updated tgl, update configure
parent
fed99d9b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
13 deletions
+15
-13
configure
configure
+12
-10
configure.ac
configure.ac
+2
-2
tgl
tgl
+1
-1
No files found.
configure
View file @
021e435e
...
@@ -4094,9 +4094,9 @@ if test "${enable_openssl+set}" = set; then :
...
@@ -4094,9 +4094,9 @@ if test "${enable_openssl+set}" = set; then :
$as_echo
"#define TGL_AVOID_OPENSSL 1"
>>
confdefs.h
$as_echo
"#define TGL_AVOID_OPENSSL 1"
>>
confdefs.h
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: checking for gcry_m
d_open
in -lgcrypt"
>
&5
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: checking for gcry_m
pi_snatch
in -lgcrypt"
>
&5
$as_echo_n
"checking for gcry_m
d_open
in -lgcrypt... "
>
&6
;
}
$as_echo_n
"checking for gcry_m
pi_snatch
in -lgcrypt... "
>
&6
;
}
if
${
ac_cv_lib_gcrypt_gcry_m
d_open
+
:
}
false
;
then
:
if
${
ac_cv_lib_gcrypt_gcry_m
pi_snatch
+
:
}
false
;
then
:
$as_echo_n
"(cached) "
>
&6
$as_echo_n
"(cached) "
>
&6
else
else
ac_check_lib_save_LIBS
=
$LIBS
ac_check_lib_save_LIBS
=
$LIBS
...
@@ -4110,33 +4110,35 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
...
@@ -4110,33 +4110,35 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
#ifdef __cplusplus
extern "C"
extern "C"
#endif
#endif
char gcry_m
d_open
();
char gcry_m
pi_snatch
();
int
int
main ()
main ()
{
{
return gcry_m
d_open
();
return gcry_m
pi_snatch
();
;
;
return 0;
return 0;
}
}
_ACEOF
_ACEOF
if
ac_fn_c_try_link
"
$LINENO
"
;
then
:
if
ac_fn_c_try_link
"
$LINENO
"
;
then
:
ac_cv_lib_gcrypt_gcry_m
d_open
=
yes
ac_cv_lib_gcrypt_gcry_m
pi_snatch
=
yes
else
else
ac_cv_lib_gcrypt_gcry_m
d_open
=
no
ac_cv_lib_gcrypt_gcry_m
pi_snatch
=
no
fi
fi
rm
-f
core conftest.err conftest.
$ac_objext
\
rm
-f
core conftest.err conftest.
$ac_objext
\
conftest
$ac_exeext
conftest.
$ac_ext
conftest
$ac_exeext
conftest.
$ac_ext
LIBS
=
$ac_check_lib_save_LIBS
LIBS
=
$ac_check_lib_save_LIBS
fi
fi
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: result:
$ac_cv_lib_gcrypt_gcry_m
d_open
"
>
&5
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: result:
$ac_cv_lib_gcrypt_gcry_m
pi_snatch
"
>
&5
$as_echo
"
$ac_cv_lib_gcrypt_gcry_m
d_open
"
>
&6
;
}
$as_echo
"
$ac_cv_lib_gcrypt_gcry_m
pi_snatch
"
>
&6
;
}
if
test
"x
$ac_cv_lib_gcrypt_gcry_m
d_open
"
=
xyes
;
then
:
if
test
"x
$ac_cv_lib_gcrypt_gcry_m
pi_snatch
"
=
xyes
;
then
:
cat
>>
confdefs.h
<<
_ACEOF
cat
>>
confdefs.h
<<
_ACEOF
#define HAVE_LIBGCRYPT 1
#define HAVE_LIBGCRYPT 1
_ACEOF
_ACEOF
LIBS
=
"-lgcrypt
$LIBS
"
LIBS
=
"-lgcrypt
$LIBS
"
else
as_fn_error
$?
"
\"
Need libgcrypt >= 1.60
\"
"
"
$LINENO
"
5
fi
fi
else
else
...
...
configure.ac
View file @
021e435e
...
@@ -38,7 +38,7 @@ AC_ARG_ENABLE(openssl,[ --disable-openssl disables OpenSSL, and don't link ag
...
@@ -38,7 +38,7 @@ AC_ARG_ENABLE(openssl,[ --disable-openssl disables OpenSSL, and don't link ag
[
[
if test "x$enableval" = "xno" ; then
if test "x$enableval" = "xno" ; then
AC_DEFINE([TGL_AVOID_OPENSSL],[1],[avoid OpenSSL entirely, use libgcrypt instead (this can't read *.pub files, though.)])
AC_DEFINE([TGL_AVOID_OPENSSL],[1],[avoid OpenSSL entirely, use libgcrypt instead (this can't read *.pub files, though.)])
AC_CHECK_LIB([gcrypt], [gcry_m
d_open
])
AC_CHECK_LIB([gcrypt], [gcry_m
pi_snatch], [], [AC_MSG_ERROR(["Need libgcrypt >= 1.60"])
])
else
else
# Don't be annoying, so don't inform the user about --disable-openssl
# Don't be annoying, so don't inform the user about --disable-openssl
AX_CHECK_OPENSSL(,[AC_MSG_ERROR([No openssl found.])])
AX_CHECK_OPENSSL(,[AC_MSG_ERROR([No openssl found.])])
...
...
tgl
@
5b725d28
Subproject commit
76e2dc111a90a9622badae90ddaf962a26cf815e
Subproject commit
5b725d288f59ada3f8905a73182fe57ae8c22986
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