From 031dc14d8465663c81ddf5bef346a52750b28510 Mon Sep 17 00:00:00 2001 From: yangsheng Date: Thu, 14 May 2009 15:23:35 +0000 Subject: [PATCH] Branch b1_8 b=18668 i=adilger, johann Remove the AS_TR_CPP macro to avoid autoconf compatiblity issue. --- build/autoconf/lustre-build-darwin.m4 | 2 +- build/autoconf/lustre-build-linux.m4 | 20 +++--------- build/autoconf/lustre-build.m4 | 13 -------- libsysio/configure.in | 60 +++++++++++++++++------------------ 4 files changed, 35 insertions(+), 60 deletions(-) diff --git a/build/autoconf/lustre-build-darwin.m4 b/build/autoconf/lustre-build-darwin.m4 index a14ebf8..6f1be34 100644 --- a/build/autoconf/lustre-build-darwin.m4 +++ b/build/autoconf/lustre-build-darwin.m4 @@ -13,7 +13,7 @@ do AC_MSG_CHECKING([for $1]) AS_IF([AC_TRY_COMMAND(nm /mach | grep "[$1]" >/dev/null 2>/dev/null)],[ AC_MSG_RESULT([yes]) - AC_DEFINE_UNQUOTED([AS_TR_CPP([HAVE_$ac_func])]) $2 + AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_$ac_func])) $2 ],[ AC_MSG_RESULT([no]) $3 ])dnl diff --git a/build/autoconf/lustre-build-linux.m4 b/build/autoconf/lustre-build-linux.m4 index 30d4076..c32cc4d 100644 --- a/build/autoconf/lustre-build-linux.m4 +++ b/build/autoconf/lustre-build-linux.m4 @@ -109,6 +109,7 @@ LB_LINUX_TRY_COMPILE([ #endif ],[ RHEL_KENEL="yes" + RHEL_KERNEL="yes" AC_MSG_RESULT([yes]) ],[ AC_MSG_RESULT([no]) @@ -192,9 +193,9 @@ LB_CHECK_FILE([$LINUX_CONFIG],[], # at 2.6.19 # $LINUX/include/linux/config.h is removed # and at more old has only one line # include -LB_CHECK_FILES([$LINUX_OBJ/include/linux/autoconf.h - $LINUX_OBJ/include/linux/version.h - ],[], +LB_CHECK_FILE([$LINUX_OBJ/include/linux/autoconf.h],[], + [AC_MSG_ERROR([Run make config in $LINUX.])]) +LB_CHECK_FILE([$LINUX_OBJ/include/linux/version.h],[], [AC_MSG_ERROR([Run make config in $LINUX.])]) # ------------ rhconfig.h includes runtime-generated bits -- @@ -622,16 +623,3 @@ AC_CACHE_CHECK([for $1], ac_Header, AS_IF([test AS_VAR_GET(ac_Header) = yes], [$2], [$3])[]dnl AS_VAR_POPDEF([ac_Header])dnl ]) - -# -# Like AC_CHECK_HEADERS but for kernel space headers -# -AC_DEFUN([LB_CHECK_LINUX_HEADERS], -[AH_CHECK_HEADERS([$1])dnl -for ac_header in $1 -do -LB_CHECK_LINUX_HEADER($ac_header, - [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_$ac_header)) $2], - [$3])dnl -done -]) diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4 index 3669e5e..50a4236 100644 --- a/build/autoconf/lustre-build.m4 +++ b/build/autoconf/lustre-build.m4 @@ -45,19 +45,6 @@ AS_IF([test AS_VAR_GET(lb_File) = yes], [$2], [$3])[]dnl AS_VAR_POPDEF([lb_File])dnl ])# LB_CHECK_FILE -# -# LB_CHECK_FILES -# -# LB_CHECK_FILE over multiple files -# -AC_DEFUN([LB_CHECK_FILES], -[AC_FOREACH([AC_FILE_NAME], [$1], - [LB_CHECK_FILE(AC_FILE_NAME, - [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_[]AC_FILE_NAME), 1, - [Define to 1 if you have the - file `]AC_File['.]) -$2], - [$3])])]) # # LB_ARG_LIBS_INCLUDES diff --git a/libsysio/configure.in b/libsysio/configure.in index 2aedbf1..4fcd3c0 100644 --- a/libsysio/configure.in +++ b/libsysio/configure.in @@ -361,49 +361,49 @@ if test x$have_st_gen = xyes; then fi AC_MSG_CHECKING(whether .text pseudo-op must be used) -AC_CACHE_VAL(sysio_asm_dot_text, [dnl +AC_CACHE_VAL(am_cv_sysio_asm_dot_text, [dnl cat > conftest.s </dev/null; then - sysio_asm_dot_text=.text + am_cv_sysio_asm_dot_text=.text fi rm -f conftest*]) -if test -z "$sysio_dot_text"; then +if test -z "$am_cv_sysio_asm_dot_text"; then AC_MSG_RESULT(no) else AC_MSG_RESULT(yes) fi AC_CACHE_CHECK(for assembler global-symbol directive, - sysio_asm_global_directive, [dnl -sysio_asm_global_directive=UNKNOWN + am_cv_sysio_asm_global_directive, [dnl +am_cv_sysio_asm_global_directive=UNKNOWN for ac_globl in .globl .global .EXPORT; do cat > conftest.s </dev/null; then - sysio_asm_global_directive=${ac_globl} + am_cv_sysio_asm_global_directive=${ac_globl} fi rm -f conftest* - test $sysio_asm_global_directive != UNKNOWN && break + test $am_cv_sysio_asm_global_directive != UNKNOWN && break done]) -if test $sysio_asm_global_directive = UNKNOWN; then +if test $am_cv_sysio_asm_global_directive = UNKNOWN; then AC_MSG_ERROR(cannot determine asm global directive) #else -# AC_DEFINE_UNQUOTED(ASM_GLOBAL_DIRECTIVE, ${sysio_asm_global_directive}) +# AC_DEFINE_UNQUOTED(ASM_GLOBAL_DIRECTIVE, ${am_cv_sysio_asm_global_directive}) fi AC_CACHE_CHECK(for .set assembler directive, - sysio_asm_set_directive, [dnl + am_cv_sysio_asm_set_directive, [dnl cat > conftest.s<&AC_FD_CC 2>&AC_FD_CC; then - sysio_asm_set_directive=yes + am_cv_sysio_asm_set_directive=yes else - sysio_asm_set_directive=no + am_cv_sysio_asm_set_directive=no fi rm -f conftest*]) -#if test $sysio_asm_set_directive = yes; then +#if test $am_cv_sysio_asm_set_directive = yes; then # AC_DEFINE(HAVE_ASM_SET_DIRECTIVE) #fi -AC_CACHE_CHECK(for assembler .weak directive, sysio_asm_weak_directive, +AC_CACHE_CHECK(for assembler .weak directive, am_cv_sysio_asm_weak_directive, [dnl cat > conftest.s </dev/null; then - sysio_asm_weak_directive=yes + am_cv_sysio_asm_weak_directive=yes else - sysio_asm_weak_directive=no + am_cv_sysio_asm_weak_directive=no fi rm -f conftest*]) -if test $sysio_asm_weak_directive = no; then +if test $am_cv_sysio_asm_weak_directive = no; then AC_CACHE_CHECK(for assembler .weakext directive, - sysio_asm_weakext_directive, [dnl + am_cv_sysio_asm_weakext_directive, [dnl cat > conftest.s </dev/null; then - sysio_asm_weakext_directive=yes + am_cv_sysio_asm_weakext_directive=yes else - sysio_asm_weakext_directive=no + am_cv_sysio_asm_weakext_directive=no fi rm -f conftest*]) fi # no .weak -if test x$sysio_asm_weak_directive = xyes; then +if test x$am_cv_sysio_asm_weak_directive = xyes; then AC_DEFINE(HAVE_ASM_WEAK_DIRECTIVE) fi -if test x$sysio_asm_weakext_directive = xyes; then +if test x$am_cv_sysio_asm_weakext_directive = xyes; then AC_DEFINE(HAVE_ASM_WEAKEXT_DIRECTIVE) fi -- 1.8.3.1