RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 17-Feb-2015 18:58:54
Branch: rpm-5_4 Handle: 2015021717585400
Modified files: (Branch: rpm-5_4)
rpm acinclude.m4
Log:
- autofu: add compiler dialect option checks to extend
CPPFLAGS/CXXFLAGS.
Summary:
Revision Changes Path
2.31.2.4 +57 -15 rpm/acinclude.m4
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/acinclude.m4
============================================================================
$ cvs diff -u -r2.31.2.3 -r2.31.2.4 acinclude.m4
--- rpm/acinclude.m4 23 Sep 2014 08:53:37 -0000 2.31.2.3
+++ rpm/acinclude.m4 17 Feb 2015 17:58:54 -0000 2.31.2.4
@@ -848,7 +848,7 @@
dnl included in the AC_PROG_JAVA macro.
dnl
dnl @author Stephane Bortzmeyer <bortzme...@pasteur.fr>
-dnl @version $Id: acinclude.m4,v 2.31.2.3 2014/09/23 08:53:37 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.4 2015/02/17 17:58:54 jbj Exp $
dnl
AC_DEFUN([AC_CHECK_CLASS],[
AC_REQUIRE([AC_PROG_JAVA])
@@ -954,7 +954,7 @@
dnl included in the AC_PROG_JAVA macro.
dnl
dnl @author Stephane Bortzmeyer <bortzme...@pasteur.fr>
-dnl @version $Id: acinclude.m4,v 2.31.2.3 2014/09/23 08:53:37 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.4 2015/02/17 17:58:54 jbj Exp $
dnl
AC_DEFUN([AC_CHECK_CLASSPATH],[
if test "x$CLASSPATH" = x; then
@@ -997,7 +997,7 @@
dnl chmod +x $@
dnl
dnl @author Luc Maisonobe
-dnl @version $Id: acinclude.m4,v 2.31.2.3 2014/09/23 08:53:37 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.4 2015/02/17 17:58:54 jbj Exp $
dnl
AC_DEFUN([AC_CHECK_JUNIT],[
AC_CACHE_VAL(ac_cv_prog_JUNIT,[
@@ -1037,7 +1037,7 @@
dnl included in the AC_PROG_JAVA macro.
dnl
dnl @author Stephane Bortzmeyer <bortzme...@pasteur.fr>
-dnl @version $Id: acinclude.m4,v 2.31.2.3 2014/09/23 08:53:37 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.4 2015/02/17 17:58:54 jbj Exp $
dnl
AC_DEFUN([AC_CHECK_RQRD_CLASS],[
@@ -1063,7 +1063,7 @@
dnl included in the AC_PROG_JAVA macro.
dnl
dnl @author Devin Weaver <kt...@tritarget.com>
-dnl @version $Id: acinclude.m4,v 2.31.2.3 2014/09/23 08:53:37 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.4 2015/02/17 17:58:54 jbj Exp $
dnl
AC_DEFUN([AC_JAVA_OPTIONS],[
AC_ARG_WITH(java-prefix,
@@ -1113,7 +1113,7 @@
dnl This particular macro is not part of the original set of macros.
dnl
dnl @author Don Anderson
-dnl @version $Id: acinclude.m4,v 2.31.2.3 2014/09/23 08:53:37 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.4 2015/02/17 17:58:54 jbj Exp $
dnl
AC_DEFUN([AC_JNI_INCLUDE_DIR],[
@@ -1224,7 +1224,7 @@
dnl configure.in, is included in the AC_PROG_JAVA macro.
dnl
dnl @author Egon Willighagen <eg...@sci.kun.nl>
-dnl @version $Id: acinclude.m4,v 2.31.2.3 2014/09/23 08:53:37 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.4 2015/02/17 17:58:54 jbj Exp $
dnl
AC_DEFUN([AC_PROG_JAR],[
AC_REQUIRE([AC_EXEEXT])dnl
@@ -1268,7 +1268,7 @@
dnl included in the AC_PROG_JAVA macro.
dnl
dnl @author Stephane Bortzmeyer <bortzme...@pasteur.fr>
-dnl @version $Id: acinclude.m4,v 2.31.2.3 2014/09/23 08:53:37 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.4 2015/02/17 17:58:54 jbj Exp $
dnl
AC_DEFUN([AC_PROG_JAVAC],[
AC_REQUIRE([AC_EXEEXT])dnl
@@ -1296,7 +1296,7 @@
dnl included in the AC_PROG_JAVA macro.
dnl
dnl @author Stephane Bortzmeyer <bortzme...@pasteur.fr>
-dnl @version $Id: acinclude.m4,v 2.31.2.3 2014/09/23 08:53:37 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.4 2015/02/17 17:58:54 jbj Exp $
dnl
AC_DEFUN([AC_PROG_JAVAC_WORKS],[
AC_CACHE_CHECK([if $JAVAC works], ac_cv_prog_javac_works, [
@@ -1344,7 +1344,7 @@
dnl configure.in, is included in the AC_PROG_JAVA macro.
dnl
dnl @author Egon Willighagen <eg...@sci.kun.nl>
-dnl @version $Id: acinclude.m4,v 2.31.2.3 2014/09/23 08:53:37 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.4 2015/02/17 17:58:54 jbj Exp $
dnl
AC_DEFUN([AC_PROG_JAVADOC],[
AC_REQUIRE([AC_EXEEXT])dnl
@@ -1366,7 +1366,7 @@
dnl the full path of javah and CPPFLAGS is updated accordingly.
dnl
dnl @author Luc Maisonobe
-dnl @version $Id: acinclude.m4,v 2.31.2.3 2014/09/23 08:53:37 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.4 2015/02/17 17:58:54 jbj Exp $
dnl
AC_DEFUN([AC_PROG_JAVAH],[
AC_REQUIRE([AC_CANONICAL_SYSTEM])dnl
@@ -1451,7 +1451,7 @@
dnl AC_OUTPUT(Makefile)
dnl
dnl @author Stephane Bortzmeyer <bortzme...@pasteur.fr>
-dnl @version $Id: acinclude.m4,v 2.31.2.3 2014/09/23 08:53:37 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.4 2015/02/17 17:58:54 jbj Exp $
dnl
dnl Note: Modified to prefer java over kaffe. [#8059]
dnl
@@ -1481,7 +1481,7 @@
dnl included in the AC_PROG_JAVA macro.
dnl
dnl @author Stephane Bortzmeyer <bortzme...@pasteur.fr>
-dnl @version $Id: acinclude.m4,v 2.31.2.3 2014/09/23 08:53:37 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.4 2015/02/17 17:58:54 jbj Exp $
dnl
AC_DEFUN([AC_PROG_JAVA_WORKS], [
AC_CHECK_PROG(uudecode, uudecode$EXEEXT, yes)
@@ -1583,7 +1583,7 @@
dnl included in the AC_PROG_JAVA macro.
dnl
dnl @author Devin Weaver <kt...@tritarget.com>
-dnl @version $Id: acinclude.m4,v 2.31.2.3 2014/09/23 08:53:37 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.4 2015/02/17 17:58:54 jbj Exp $
dnl
AC_DEFUN([AC_TRY_COMPILE_JAVA],[
AC_REQUIRE([AC_PROG_JAVAC])dnl
@@ -1624,7 +1624,7 @@
dnl included in the AC_PROG_JAVA macro.
dnl
dnl @author Devin Weaver <kt...@tritarget.com>
-dnl @version $Id: acinclude.m4,v 2.31.2.3 2014/09/23 08:53:37 jbj Exp $
+dnl @version $Id: acinclude.m4,v 2.31.2.4 2015/02/17 17:58:54 jbj Exp $
dnl
AC_DEFUN([AC_TRY_RUN_JAVA],[
AC_REQUIRE([AC_PROG_JAVAC])dnl
@@ -1666,6 +1666,48 @@
[m4_define([rpm_AS_VAR_APPEND],
[AS_VAR_SET([$1], [AS_VAR_GET([$1])$2])])])
+# rpm_CPPFLAGS_ADD(PARAMETER, [VARIABLE = RPM_CPPFLAGS])
+# ------------------------------------------------
+# Adds parameter to RPM_CPPFLAGS if the compiler supports it. For example,
+# rpm_CPPFLAGS_ADD([-Wall],[RPM_CPPFLAGS]).
+AC_DEFUN([rpm_CPPFLAGS_ADD],
+[AS_VAR_PUSHDEF([rpm_my_cppflags], [rpm_cv_warn_$1])dnl
+AC_CACHE_CHECK([whether compiler handles $1], [rpm_my_cppflags], [
+ save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="${CPPFLAGS} $1"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
+ [AS_VAR_SET([rpm_my_cppflags], [yes])],
+ [AS_VAR_SET([rpm_my_cppflags], [no])])
+ CPPFLAGS="$save_CPPFLAGS"
+])
+AS_VAR_PUSHDEF([rpm_cppflags], m4_if([$2], [], [[RPM_CPPFLAGS]], [[$2]]))dnl
+AS_VAR_IF([rpm_my_cppflags], [yes], [rpm_AS_VAR_APPEND([rpm_cppflags], ["
$1"])])
+AS_VAR_POPDEF([rpm_cppflags])dnl
+AS_VAR_POPDEF([rpm_my_cppflags])dnl
+m4_ifval([$2], [AS_LITERAL_IF([$2], [AC_SUBST([$2])], [])])dnl
+])
+
+# rpm_CXXFLAGS_ADD(PARAMETER, [VARIABLE = RPM_CXXFLAGS])
+# ------------------------------------------------
+# Adds parameter to RPM_CXXFLAGS if the compiler supports it. For example,
+# rpm_CXXFLAGS_ADD([-Wall],[RPM_CXXFLAGS]).
+AC_DEFUN([rpm_CXXFLAGS_ADD],
+[AS_VAR_PUSHDEF([rpm_my_cxxflags], [rpm_cv_warn_$1])dnl
+AC_CACHE_CHECK([whether compiler handles $1], [rpm_my_cxxflags], [
+ save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS="${CXXFLAGS} $1"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
+ [AS_VAR_SET([rpm_my_cxxflags], [yes])],
+ [AS_VAR_SET([rpm_my_cxxflags], [no])])
+ CXXFLAGS="$save_CXXFLAGS"
+])
+AS_VAR_PUSHDEF([rpm_cxxflags], m4_if([$2], [], [[RPM_CXXFLAGS]], [[$2]]))dnl
+AS_VAR_IF([rpm_my_cxxflags], [yes], [rpm_AS_VAR_APPEND([rpm_cxxflags], ["
$1"])])
+AS_VAR_POPDEF([rpm_cxxflags])dnl
+AS_VAR_POPDEF([rpm_my_cxxflags])dnl
+m4_ifval([$2], [AS_LITERAL_IF([$2], [AC_SUBST([$2])], [])])dnl
+])
+
# rpm_CFLAGS_ADD(PARAMETER, [VARIABLE = RPM_CFLAGS])
# ------------------------------------------------
# Adds parameter to RPM_CFLAGS if the compiler supports it. For example,
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
