RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 23-Mar-2009 18:25:21
Branch: HEAD Handle: 2009032317252100
Modified files:
rpm CHANGES acinclude.m4 configure.ac
Log:
fix: put AC_CPP_FUNC autofu macro in aclocal.m4
Summary:
Revision Changes Path
1.2863 +1 -0 rpm/CHANGES
2.25 +31 -0 rpm/acinclude.m4
2.349 +0 -30 rpm/configure.ac
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2862 -r1.2863 CHANGES
--- rpm/CHANGES 23 Mar 2009 16:46:50 -0000 1.2862
+++ rpm/CHANGES 23 Mar 2009 17:25:21 -0000 1.2863
@@ -1,5 +1,6 @@
5.2a3 -> 5.2a4:
+ - devzero2000: fix: add autofu AC_CPP_FUNC portability macro in the
acinclude.m4
- devzero2000: add autofu AC_CPP_FUNC portability macro
- jbj: yarn: wire up rpmteFini, eliminate rpmteFree.
- jbj: yarn: wire up rpmsxFini, eliminate rpmsxFree.
@@ .
patch -p0 <<'@@ .'
Index: rpm/acinclude.m4
============================================================================
$ cvs diff -u -r2.24 -r2.25 acinclude.m4
--- rpm/acinclude.m4 25 May 2008 09:54:28 -0000 2.24
+++ rpm/acinclude.m4 23 Mar 2009 17:25:21 -0000 2.25
@@ -778,4 +778,35 @@
])
fi
])
+dnl ##
+dnl ## NAME:
+dnl ## AC_CPP_FUNC
+dnl ##
+dnl ## Checks to see if ISO C99 CPP variable __func__ works.
+dnl ## If not, perhaps __FUNCTION__ works instead.
+dnl ## If not, we'll just define __func__ to "".
+dnl ##
+dnl ## Needed for the test support code; this was found at
+dnl ## http://lists.gnu.org/archive/html/bug-autoconf/2002-07/msg00028.html
+dnl
+AC_DEFUN([AC_CPP_FUNC],
+[AC_REQUIRE([AC_PROG_CC_STDC])dnl
+AC_CACHE_CHECK([for an ANSI C99-conforming __func__], ac_cv_cpp_func,
+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
+[[char *foo = __func__;]])],
+ [ac_cv_cpp_func=yes],
+ [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
+[[char *foo = __FUNCTION__;]])],
+ [ac_cv_cpp_func=__FUNCTION__],
+ [ac_cv_cpp_func=no])])])
+if test $ac_cv_cpp_func = __FUNCTION__; then
+ AC_DEFINE(__func__,__FUNCTION__,
+ [Define to __FUNCTION__ or "" if `__func__' does not conform to
+ANSI C.])
+elif test $ac_cv_cpp_func = no; then
+ AC_DEFINE(__func__,"",
+ [Define to __FUNCTION__ or "" if `__func__' does not conform to
+ANSI C.])
+fi
+])# AC_CPP_FUNC
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.348 -r2.349 configure.ac
--- rpm/configure.ac 23 Mar 2009 16:46:50 -0000 2.348
+++ rpm/configure.ac 23 Mar 2009 17:25:21 -0000 2.349
@@ -108,36 +108,6 @@
AC_PROG_CC
AC_PROG_CPP
AC_PROG_CXX
-
-dnl Needed for the test support code; this was found at
-dnl http://lists.gnu.org/archive/html/bug-autoconf/2002-07/msg00028.html
-
-# AC_CPP_FUNC
-# ------------------ #
-# Checks to see if ANSI C99 CPP variable __func__ works.
-# If not, perhaps __FUNCTION__ works instead.
-# If not, we'll just define __func__ to "".
-AC_DEFUN([AC_CPP_FUNC],
-[AC_REQUIRE([AC_PROG_CC_STDC])dnl
-AC_CACHE_CHECK([for an ANSI C99-conforming __func__], ac_cv_cpp_func,
-[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
-[[char *foo = __func__;]])],
- [ac_cv_cpp_func=yes],
- [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
-[[char *foo = __FUNCTION__;]])],
- [ac_cv_cpp_func=__FUNCTION__],
- [ac_cv_cpp_func=no])])])
-if test $ac_cv_cpp_func = __FUNCTION__; then
- AC_DEFINE(__func__,__FUNCTION__,
- [Define to __FUNCTION__ or "" if `__func__' does not conform to
-ANSI C.])
-elif test $ac_cv_cpp_func = no; then
- AC_DEFINE(__func__,"",
- [Define to __FUNCTION__ or "" if `__func__' does not conform to
-ANSI C.])
-fi
-])# AC_CPP_FUNC
-
AC_CPP_FUNC
AC_USE_SYSTEM_EXTENSIONS
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
