MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-06-17 17:38:22 +02:00
Code Issues Releases Wiki Activity

configure: Move platform related below RB_DEFINE macros; add defines.

Browse source
This commit is contained in:
Jason Volk 2018-06-02 10:25:50 -07:00
parent 4ce6b69f69
commit 7f93f3ea2c
1 changed files with 45 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
configure.ac
View file

@ -65,37 +65,6 @@ AC_SUBST(LDFLAGS)
AC_SUBST(LIBS) AC_SUBST(LIBS)
dnl
dnl Recursive local targets (clean-local is implied)
dnl
#AM_EXTRA_RECURSIVE_TARGETS([
# mrproper
#])
dnl
dnl Coarse compiler test macros
dnl
AM_CONDITIONAL([GCC], [[[[ $CXX = g\+\+* ]]]])
AM_CONDITIONAL([CLANG], [[[[ $CXX = clang* ]]]])
dnl
dnl Coarse operating system test macros
dnl
AM_CONDITIONAL([LINUX], [[[[ $host_os = *linux* ]]]])
AM_CONDITIONAL([NETBSD], [[[[ $host_os = *netbsd* ]]]])
AM_CONDITIONAL([FREEBSD], [[[[ $host_os = *freebsd* ]]]])
AM_CONDITIONAL([MINGW], [[[[ $host_os = *mingw* ]] || [[ $host_os = *msys* ]]]])
AM_CONDITIONAL([CYGWIN], [[[[ $host_os = *cygwin* ]]]])
AM_CONDITIONAL([INTERIX], [[[[ $host_os = *interix* ]]]])
AM_CONDITIONAL([SOLARIS], [[[[ $host_os = *solaris* ]]]])
dnl *************************************************************************** dnl ***************************************************************************
dnl Preprocessor define macros dnl Preprocessor define macros
dnl dnl
@ -134,6 +103,46 @@ AC_DEFUN([CPPDEFINE],
dnl ***************************************************************************
dnl Platform
dnl
dnl
dnl Recursive local targets (clean-local is implied)
dnl
#AM_EXTRA_RECURSIVE_TARGETS([
# mrproper
#])
dnl
dnl Coarse compiler test macros
dnl
AM_CONDITIONAL([GCC], [[[[ $CXX = g\+\+* ]]]])
AM_CONDITIONAL([CLANG], [[[[ $CXX = clang* ]]]])
RB_DEFINE_UNQUOTED([CXX], ["$CXX"], [CXX Compiler])
dnl
dnl Coarse operating system test macros
dnl
AM_CONDITIONAL([LINUX], [[[[ $host_os = *linux* ]]]])
AM_CONDITIONAL([NETBSD], [[[[ $host_os = *netbsd* ]]]])
AM_CONDITIONAL([FREEBSD], [[[[ $host_os = *freebsd* ]]]])
AM_CONDITIONAL([MINGW], [[[[ $host_os = *mingw* ]] || [[ $host_os = *msys* ]]]])
AM_CONDITIONAL([CYGWIN], [[[[ $host_os = *cygwin* ]]]])
AM_CONDITIONAL([INTERIX], [[[[ $host_os = *interix* ]]]])
AM_CONDITIONAL([SOLARIS], [[[[ $host_os = *solaris* ]]]])
RB_DEFINE_UNQUOTED([OS], ["$host_os"], [Host operating system])
dnl *************************************************************************** dnl ***************************************************************************
dnl Developer options dnl Developer options
dnl dnl
@ -157,6 +166,7 @@ AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [Enable debugging suite fo
AM_CONDITIONAL([DEBUG], [[[[ "$DEBUG" = "1" ]]]]) AM_CONDITIONAL([DEBUG], [[[[ "$DEBUG" = "1" ]]]])
dnl dnl
dnl Explicit assert switch for still using assert() without --enable-debug dnl Explicit assert switch for still using assert() without --enable-debug
dnl dnl
@ -184,6 +194,7 @@ AM_COND_IF(ASSERT,
CPPDEFINE([NDEBUG]) CPPDEFINE([NDEBUG])
]) ])
dnl dnl
dnl Explicit optimize switch for enabling optimization when using --enable-debug dnl Explicit optimize switch for enabling optimization when using --enable-debug
dnl dnl
@ -205,6 +216,7 @@ AC_ARG_ENABLE(optimize, AC_HELP_STRING([--enable-optimize], [Enable optimization
AM_CONDITIONAL([OPTIMIZE], [[[[ "$OPTIMIZE" = "1" ]]]]) AM_CONDITIONAL([OPTIMIZE], [[[[ "$OPTIMIZE" = "1" ]]]])
dnl dnl
dnl Explicit optimization level switch dnl Explicit optimization level switch
dnl dnl
@ -239,6 +251,7 @@ AC_ARG_WITH(optimize-level, AC_HELP_STRING([--with-optimize-level[[[=3]]]], [Exp
]) ])
]) ])
dnl dnl
dnl Explicit log level dnl Explicit log level
dnl dnl
@ -470,6 +483,7 @@ AM_COND_IF([CLANG],
CPPFLAGS+="$CWARNS" CPPFLAGS+="$CWARNS"
dnl *************************************************************************** dnl ***************************************************************************
dnl Philology checks dnl Philology checks
dnl dnl