Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
1b297742
Commit
1b297742
authored
Jul 23, 2014
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
configure: Improve the check for the resolver library.
parent
35dd5530
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
53 additions
and
29 deletions
+53
-29
configure
configure
+33
-16
configure.ac
configure.ac
+20
-13
No files found.
configure
View file @
1b297742
...
...
@@ -11687,11 +11687,16 @@ fi
if
test
"
$ac_cv_header_resolv_h
"
=
"yes"
then
ac_save_LIBS
=
"
$LIBS
"
for
lib
in
''
-lresolv
do
LIBS
=
"
$lib
$ac_save_LIBS
"
cat
confdefs.h -
<<
_ACEOF
>conftest.
$ac_ext
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: checking for resolver library"
>
&5
$as_echo_n
"checking for resolver library... "
>
&6
;
}
if
${
ac_cv_have_resolv
+
:
}
false
;
then
:
$as_echo_n
"(cached) "
>
&6
else
ac_save_LIBS
=
"
$LIBS
"
for
lib
in
''
-lresolv
do
LIBS
=
"
$lib
$ac_save_LIBS
"
cat
confdefs.h -
<<
_ACEOF
>conftest.
$ac_ext
/* end confdefs.h. */
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
...
...
@@ -11700,25 +11705,37 @@ then
int
main ()
{
res_query("foo",ns_c_in,0,0,0);
if (!(_res.options & RES_INIT)) res_init(); res_query("foo",ns_c_in,0,0,0)
;
return 0;
}
_ACEOF
if
ac_fn_c_try_link
"
$LINENO
"
;
then
:
$as_echo
"#define HAVE_RESOLV 1"
>>
confdefs.h
RESOLV_LIBS
=
"
$lib
"
ac_cv_have_resolv
=
${
lib
:-
"none required"
}
else
ac_cv_have_resolv
=
"not found"
fi
rm
-f
core conftest.err conftest.
$ac_objext
\
conftest
$ac_exeext
conftest.
$ac_ext
if
test
"
${
RESOLV_LIBS
+set
}
"
=
set
;
then
break
fi
done
LIBS
=
"
$ac_save_LIBS
"
test
"x
$ac_cv_have_resolv
"
=
"xnot found"
||
break
done
LIBS
=
"
$ac_save_LIBS
"
fi
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: result:
$ac_cv_have_resolv
"
>
&5
$as_echo
"
$ac_cv_have_resolv
"
>
&6
;
}
case
"
$ac_cv_have_resolv
"
in
"not found"
)
;;
"none required"
)
$as_echo
"#define HAVE_RESOLV 1"
>>
confdefs.h
;;
*
)
$as_echo
"#define HAVE_RESOLV 1"
>>
confdefs.h
RESOLV_LIBS
=
$ac_cv_have_resolv
;;
esac
fi
if
test
"x
$with_lcms2
"
!=
"xno"
...
...
configure.ac
View file @
1b297742
...
...
@@ -1419,21 +1419,28 @@ WINE_NOTICE_WITH(gphoto,[test "$ac_cv_lib_gphoto2_port_gp_port_info_list_new" !=
dnl **** Check for resolver library ***
if test "$ac_cv_header_resolv_h" = "yes"
then
ac_save_LIBS="$LIBS"
for lib in '' -lresolv
do
LIBS="$lib $ac_save_LIBS"
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#ifdef HAVE_NETINET_IN_H
AC_CACHE_CHECK([for resolver library], ac_cv_have_resolv,
[ac_save_LIBS="$LIBS"
for lib in '' -lresolv
do
LIBS="$lib $ac_save_LIBS"
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif
#include <resolv.h>]],[[res_query("foo",ns_c_in,0,0,0);]])],
[AC_DEFINE(HAVE_RESOLV, 1, [Define if you have the resolver library and header])
AC_SUBST(RESOLV_LIBS,"$lib")])
if test "${RESOLV_LIBS+set}" = set; then
break
fi
done
LIBS="$ac_save_LIBS"
#include <resolv.h>]],[[if (!(_res.options & RES_INIT)) res_init(); res_query("foo",ns_c_in,0,0,0)]])],
[ac_cv_have_resolv=${lib:-"none required"}],[ac_cv_have_resolv="not found"])
test "x$ac_cv_have_resolv" = "xnot found" || break
done
LIBS="$ac_save_LIBS"])
case "$ac_cv_have_resolv" in
"not found") ;;
"none required")
AC_DEFINE(HAVE_RESOLV, 1, [Define if you have the resolver library and header]) ;;
*)
AC_DEFINE(HAVE_RESOLV, 1)
AC_SUBST(RESOLV_LIBS,$ac_cv_have_resolv) ;;
esac
fi
dnl **** Check for LittleCMS ***
...
...
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