Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
TLMSP curl
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CYBER - Cyber Security
TS 103 523 MSP
TLMSP
TLMSP curl
Commits
9418c56f
Commit
9418c56f
authored
15 years ago
by
Yang Tse
Browse files
Options
Downloads
Patches
Plain Diff
c-ares' --enable-curldebug adjustments
parent
7dbd5029
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ares/configure.ac
+6
-16
6 additions, 16 deletions
ares/configure.ac
ares/m4/cares-compilers.m4
+33
-13
33 additions, 13 deletions
ares/m4/cares-compilers.m4
with
39 additions
and
29 deletions
ares/configure.ac
+
6
−
16
View file @
9418c56f
...
...
@@ -110,22 +110,6 @@ esac
dnl libtool setup
AC_PROG_LIBTOOL
CARES_CHECK_CURLDEBUG
AM_CONDITIONAL(CURLDEBUG, test x$want_curldebug = xyes)
AC_MSG_CHECKING([if we need -no-undefined])
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
need_no_undefined=yes
;;
*)
need_no_undefined=no
;;
esac
AC_MSG_RESULT($need_no_undefined)
AM_CONDITIONAL(NO_UNDEFINED, test x$need_no_undefined = xyes)
dnl **********************************************************************
dnl platform/compiler/architecture specific checks/flags
dnl **********************************************************************
...
...
@@ -161,6 +145,12 @@ esac
CARES_CHECK_COMPILER_HALT_ON_ERROR
CARES_CHECK_COMPILER_ARRAY_SIZE_NEGATIVE
CARES_CHECK_NO_UNDEFINED
AM_CONDITIONAL(NO_UNDEFINED, test x$need_no_undefined = xyes)
CARES_CHECK_CURLDEBUG
AM_CONDITIONAL(CURLDEBUG, test x$want_curldebug = xyes)
dnl **********************************************************************
dnl Compilation based checks should not be done before this point.
dnl **********************************************************************
...
...
This diff is collapsed.
Click to expand it.
ares/m4/cares-compilers.m4
+
33
−
13
View file @
9418c56f
...
...
@@ -16,7 +16,7 @@
#***************************************************************************
# File version for 'aclocal' use. Keep it a single number.
# serial 5
3
# serial 5
4
dnl CARES_CHECK_COMPILER
...
...
@@ -24,6 +24,7 @@ dnl -------------------------------------------------
dnl Verify if the C compiler being used is known.
AC_DEFUN([CARES_CHECK_COMPILER], [
AC_BEFORE([$0],[CARES_CHECK_NO_UNDEFINED])dnl
#
compiler_id="unknown"
compiler_num="0"
...
...
@@ -1095,20 +1096,13 @@ AC_DEFUN([CARES_CHECK_CURLDEBUG], [
supports_curldebug="no"
fi
if test "$supports_curldebug" != "no"; then
if test "$enable_shared" = "yes"; then
if test "x$allow_undefined" = "xno"; then
supports_curldebug="no"
elif test "x$allow_undefined_flag" = "xunsupported"; then
supports_curldebug="no"
elif test "x$need_no_undefined" = "xyes"; then
supports_curldebug="no"
fi
if test "$supports_curldebug" = "no"; then
AC_MSG_WARN([shared library does not support undefined symbols.])
fi
if test "$enable_shared" = "yes" &&
test "$need_no_undefined" = "yes"; then
supports_curldebug="no"
AC_MSG_WARN([shared library does not support undefined symbols.])
fi
if test ! -f "$srcdir/../include/curl/curlbuild.h.dist"; then
AC_MSG_WARN([source not embedded in curl's CVS tree.])
AC_MSG_WARN([
c-ares
source not embedded in curl's CVS tree.])
supports_curldebug="no"
elif test ! -f "$srcdir/../include/curl/Makefile.in"; then
AC_MSG_WARN([curl's buildconf has not been run.])
...
...
@@ -1159,6 +1153,32 @@ AC_DEFUN([CARES_CHECK_CURLDEBUG], [
])
dnl CARES_CHECK_NO_UNDEFINED
dnl -------------------------------------------------
AC_DEFUN([CARES_CHECK_NO_UNDEFINED], [
AC_BEFORE([$0],[CARES_CHECK_CURLDEBUG])dnl
AC_MSG_CHECKING([if we need -no-undefined])
need_no_undefined="no"
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
need_no_undefined="yes"
;;
esac
if test "x$allow_undefined" = "xno"; then
need_no_undefined="yes"
elif test "x$allow_undefined_flag" = "xunsupported"; then
need_no_undefined="yes"
fi
case $compiler_id in
IBM_C | INTEL_UNIX_C | INTEL_WINDOWS_C | SUNPRO_C)
need_no_undefined="yes"
;;
esac
AC_MSG_RESULT($need_no_undefined)
])
dnl CARES_CHECK_PROG_CC
dnl -------------------------------------------------
dnl Check for compiler program, preventing CFLAGS and
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment