Chiebot-Mirror
/
c-ares
mirror of https://github.com/c-ares/c-ares.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Autotools allow make to override CFLAGS/CPPFLAGS/CXXFLAGS (#695)

Browse Source 
The previous build system allowed overwriting of CFLAGS/CPPFLAGS/CXXFLAGS on the make command line. Switch to using AM_CFLAGS/AM_CPPFLAGS/AM_CXXFLAGS when we set our own flags for building which ensures they are kept even when a user tries to override.

Fixes Bug: #694
Fix By: Brad House (@bradh352)
pull/696/head
Brad House 1 year ago committed by GitHub
parent 9f03635a22
commit d6850eb4ad
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 56 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 66
      configure.ac
  2. 8
      src/lib/Makefile.am
  3. 8
      src/tools/Makefile.am
  4. 22
      test/Makefile.am

66
configure.ac
Unescape View File

@ -42,8 +42,7 @@ AC_CONFIG_MACRO_DIR([m4])
AC_USE_SYSTEM_EXTENSIONS AC_USE_SYSTEM_EXTENSIONS
AX_CXX_COMPILE_STDCXX_14([noext],[optional]) AX_CXX_COMPILE_STDCXX_14([noext],[optional])
AM_INIT_AUTOMAKE([foreign subdir-objects 1.9.6]) AM_INIT_AUTOMAKE([foreign subdir-objects 1.9.6])
AC_ENABLE_SHARED LT_INIT([win32-dll,pic,disable-fast-install,aix-soname=svr4])
LT_INIT([win32-dll,shared,pic,disable-fast-install,aix-soname=svr4])
AC_LANG([C]) AC_LANG([C])
AC_PROG_CC AC_PROG_CC
AM_PROG_CC_C_O AM_PROG_CC_C_O
@ -52,6 +51,31 @@ AC_PROG_INSTALL
AC_CANONICAL_HOST AC_CANONICAL_HOST
AX_COMPILER_VENDOR AX_COMPILER_VENDOR
AC_MSG_CHECKING([whether this is native windows])
ac_cv_native_windows=no
ac_cv_windows=no
case $host_os in
mingw*)
ac_cv_native_windows=yes
ac_cv_windows=yes
;;
cygwin*)
ac_cv_windows=yes
;;
esac
if test "$ax_cv_c_compiler_vendor" = "microsoft" ; then
ac_cv_native_windows=yes
ac_cv_windows=yes
fi
AC_MSG_RESULT($ac_cv_native_windows)
AC_ENABLE_SHARED
dnl Disable static builds by default on Windows unless overwritten since Windows
dnl can't simultaneously build shared and static with autotools.
AS_IF([test "x$ac_cv_windows" = "xyes"], [AC_DISABLE_STATIC], [AC_ENABLE_STATIC])
AC_ARG_ENABLE(warnings, AC_ARG_ENABLE(warnings,
AS_HELP_STRING([--disable-warnings],[Disable strict compiler warnings]), AS_HELP_STRING([--disable-warnings],[Disable strict compiler warnings]),
[ enable_warnings=${enableval} ], [ enable_warnings=${enableval} ],
@ -162,39 +186,20 @@ esac
AM_CONDITIONAL([CARES_USE_NO_UNDEFINED], [test "$cares_use_no_undefined" = 'yes']) AM_CONDITIONAL([CARES_USE_NO_UNDEFINED], [test "$cares_use_no_undefined" = 'yes'])
AC_MSG_CHECKING([whether this is native windows])
ac_cv_native_windows=no
ac_cv_windows=no
case $host_os in
mingw*)
ac_cv_native_windows=yes
ac_cv_windows=yes
;;
cygwin*)
ac_cv_windows=yes
;;
esac
if test "$ax_cv_c_compiler_vendor" = "microsoft" ; then
ac_cv_native_windows=yes
ac_cv_windows=yes
fi
if test "$ac_cv_native_windows" = "yes" ; then if test "$ac_cv_native_windows" = "yes" ; then
CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0602 -DWIN32_LEAN_AND_MEAN" AM_CPPFLAGS="$AM_CPPFLAGS -D_WIN32_WINNT=0x0602 -DWIN32_LEAN_AND_MEAN"
fi fi
AC_MSG_RESULT($ac_cv_native_windows)
dnl Disable static builds by default on Windows unless overwritten since Windows dnl Windows can only build shared or static, not both at the same time
dnl can't simultaneously build shared and static with autotools. if test "$ac_cv_native_windows" = "yes" -a "x$enable_shared" = "xyes" -a "x$enable_static" = "xyes" ; then
if test "x$ac_cv_windows" = "xyes" ; then AC_MSG_ERROR([Windows cannot build both static and shared simultaneously, specify --disable-shared or --disable-static])
AC_DISABLE_STATIC
fi fi
dnl Only windows requires CARES_STATICLIB definition dnl Only windows requires CARES_STATICLIB definition
if test "x$enable_shared" = "xno" -a "x$enable_static" = "xyes" ; then if test "x$enable_shared" = "xno" -a "x$enable_static" = "xyes" ; then
AC_MSG_CHECKING([whether we need CARES_STATICLIB definition]) AC_MSG_CHECKING([whether we need CARES_STATICLIB definition])
if test "$ac_cv_native_windows" = "yes" ; then if test "$ac_cv_native_windows" = "yes" ; then
AX_APPEND_FLAG([-DCARES_STATICLIB], [CPPFLAGS]) AX_APPEND_FLAG([-DCARES_STATICLIB], [AM_CPPFLAGS])
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
@ -274,11 +279,11 @@ if test "$enable_warnings" = "yes"; then
-Werror=implicit-int \ -Werror=implicit-int \
-Werror=implicit-function-declaration \ -Werror=implicit-function-declaration \
-Werror=partial-availability \ -Werror=partial-availability \
], [CFLAGS], [-Werror]) ], [AM_CFLAGS], [-Werror])
fi fi
if test "$ax_cv_c_compiler_vendor" = "intel"; then if test "$ax_cv_c_compiler_vendor" = "intel"; then
CFLAGS="$CFLAGS -shared-intel" AX_APPEND_COMPILE_FLAGS([-shared-intel], [AM_CFLAGS])
fi fi
if test "$ac_cv_native_windows" = "yes" ; then if test "$ac_cv_native_windows" = "yes" ; then
@ -818,7 +823,7 @@ if test "${CARES_THREADS}" = "yes" -a "x${ac_cv_native_windows}" != "xyes" ; the
if test "${CARES_THREADS}" = "yes" ; then if test "${CARES_THREADS}" = "yes" ; then
AC_CHECK_HEADERS([pthread.h pthread_np.h]) AC_CHECK_HEADERS([pthread.h pthread_np.h])
LIBS="$PTHREAD_LIBS $LIBS" LIBS="$PTHREAD_LIBS $LIBS"
CFLAGS="$CFLAGS $PTHREAD_CFLAGS" AM_CFLAGS="$AM_CFLAGS $PTHREAD_CFLAGS"
CC="$PTHREAD_CC" CC="$PTHREAD_CC"
CXX="$PTHREAD_CXX" CXX="$PTHREAD_CXX"
fi fi
@ -876,9 +881,10 @@ fi
AC_MSG_CHECKING([whether to build tests]) AC_MSG_CHECKING([whether to build tests])
AC_MSG_RESULT([$build_tests]) AC_MSG_RESULT([$build_tests])
AM_CONDITIONAL(BUILD_TESTS, test "x$build_tests" = "xyes") AM_CONDITIONAL(BUILD_TESTS, test "x$build_tests" = "xyes")
AC_SUBST(AM_CFLAGS)
AC_SUBST(AM_CPPFLAGS)
AC_SUBST(BUILD_SUBDIRS) AC_SUBST(BUILD_SUBDIRS)
AC_CONFIG_FILES([Makefile \ AC_CONFIG_FILES([Makefile \

8
src/lib/Makefile.am
Unescape View File

@ -8,10 +8,10 @@ ACLOCAL_AMFLAGS = -I m4 --install
# being currently built and tested are searched before the library which # being currently built and tested are searched before the library which
# might possibly already be installed in the system. # might possibly already be installed in the system.
AM_CPPFLAGS = -I$(top_builddir)/include \ AM_CPPFLAGS += -I$(top_builddir)/include \
-I$(top_builddir)/src/lib \ -I$(top_builddir)/src/lib \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib
lib_LTLIBRARIES = libcares.la lib_LTLIBRARIES = libcares.la

8
src/tools/Makefile.am
Unescape View File

@ -12,10 +12,10 @@ noinst_PROGRAMS =$(PROGS)
# being currently built and tested are searched before the library which # being currently built and tested are searched before the library which
# might possibly already be installed in the system. # might possibly already be installed in the system.
AM_CPPFLAGS = -I$(top_builddir)/include \ AM_CPPFLAGS += -I$(top_builddir)/include \
-I$(top_builddir)/src/lib \ -I$(top_builddir)/src/lib \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib
include Makefile.inc include Makefile.inc

22
test/Makefile.am vendored
Unescape View File

@ -2,15 +2,17 @@
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
AUTOMAKE_OPTIONS = foreign subdir-objects nostdinc 1.9.6 AUTOMAKE_OPTIONS = foreign subdir-objects nostdinc 1.9.6
AM_CPPFLAGS = -I$(top_builddir)/include \ AM_CPPFLAGS += -I$(top_builddir)/include \
-I$(top_builddir)/src/lib \ -I$(top_builddir)/src/lib \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib \
-I$(top_srcdir)/test \ -I$(top_srcdir)/test \
-I$(top_builddir)/test \ -I$(top_builddir)/test \
-I$(top_builddir) -I$(top_builddir)
AM_CXXFLAGS = $(PTHREAD_CFLAGS)
AM_CFLAGS = $(PTHREAD_CFLAGS) AM_CXXFLAGS :=
AM_CXXFLAGS += $(PTHREAD_CFLAGS)
AM_CFLAGS += $(PTHREAD_CFLAGS)
# Makefile.inc provides the various *SOURCES and *HEADERS defines # Makefile.inc provides the various *SOURCES and *HEADERS defines
include Makefile.inc include Makefile.inc
@ -22,7 +24,7 @@ EXTRA_DIST = fuzzcheck.sh CMakeLists.txt Makefile.m32 Makefile.msvc README.md $(
arestest_SOURCES = $(TESTSOURCES) $(TESTHEADERS) arestest_SOURCES = $(TESTSOURCES) $(TESTHEADERS)
# Not interested in coverage of test code, but linking the test binary needs the coverage option # Not interested in coverage of test code, but linking the test binary needs the coverage option
arestest_CXXFLAGS = $(GMOCK_CFLAGS) arestest_CXXFLAGS = $(AM_CXXFLAGS) $(GMOCK_CFLAGS)
arestest_LDADD = $(GMOCK_LIBS) $(top_builddir)/src/lib/libcares.la $(PTHREAD_LIBS) $(CODE_COVERAGE_LIBS) arestest_LDADD = $(GMOCK_LIBS) $(top_builddir)/src/lib/libcares.la $(PTHREAD_LIBS) $(CODE_COVERAGE_LIBS)
aresfuzz_SOURCES = $(FUZZSOURCES) aresfuzz_SOURCES = $(FUZZSOURCES)

Write Preview
Loading…
Cancel
Save