attempt to fix pkgconfig on windows for static builds

10 months ago · 8a9a4ad14d
parent e5ee85a8ad
commit 8a9a4ad14d
3 changed files with 4 additions and 1 deletions
--- a/1
+++ b/1
@ -0,0 +1 @@
+ares-cvs
--- a/configure.ac
+++ b/configure.ac
@ -200,6 +200,7 @@ if test "x$enable_shared" = "xno" -a "x$enable_static" = "xyes" ; then
  AC_MSG_CHECKING([whether we need CARES_STATICLIB definition])
  if test "$ac_cv_native_windows" = "yes" ; then
    AX_APPEND_FLAG([-DCARES_STATICLIB], [AM_CPPFLAGS])
+    PKGCONFIG_CFLAGS="-DCARES_STATLICLIB"
    AC_MSG_RESULT([yes])
  else
    AC_MSG_RESULT([no])
@ -906,6 +907,7 @@ AM_CONDITIONAL(BUILD_TESTS, test "x$build_tests" = "xyes")

 AC_SUBST(AM_CFLAGS)
 AC_SUBST(AM_CPPFLAGS)
+AC_SUBST(PKGCONFIG_CFLAGS)
 AC_SUBST(BUILD_SUBDIRS)

 AC_CONFIG_FILES([Makefile           \
--- a/libcares.pc.in
+++ b/libcares.pc.in
@ -17,6 +17,6 @@ Description: asynchronous DNS lookup library
 Version: @VERSION@
 Requires: 
 Requires.private: 
-Cflags: -I${includedir}
+Cflags: -I${includedir} @PKGCONFIG_CFLAGS@
 Libs: -L${libdir} -lcares
 Libs.private: @CARES_PRIVATE_LIBS@