← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to m4/misc.m4

  • Committer: Monty Taylor
  • Date: 2008-11-01 00:11:07 UTC
  • mfrom: (520.4.42 devel)
  • mto: (520.4.45 devel)
  • mto: This revision was merged to the branch mainline in revision 573.
  • Revision ID: monty@inaugust.com-20081101001107-hyuzapp3fa73kr04
Merged from myself.

Show diffs side-by-side

added added

removed removed

Lines of Context:
m4/misc.m4
562
562
dnl END OF DRIZZLE_CHECK_MAX_INDEXES SECTION
563
563
dnl ---------------------------------------------------------------------------
564
564
 
 
565
AC_DEFUN([DRIZZLE_CHECK_C_VERSION],[
 
566
 
 
567
  dnl Print version of C compiler
 
568
  AC_MSG_CHECKING("C Compiler version")
 
569
  if test "$GCC" = "yes"
 
570
  then
 
571
    CC_VERSION=`$CC --version | sed 1q`
 
572
  elif test "$SUNCC" = "yes"
 
573
  then
 
574
    CC_VERSION=`$CC -V`
 
575
  else
 
576
    CC_VERSION=""
 
577
  fi
 
578
  AC_MSG_RESULT("$CC $CC_VERSION")
 
579
  AC_SUBST(CC_VERSION)
 
580
])
 
581
 
565
582
 
566
583
AC_DEFUN([DRIZZLE_CHECK_CXX_VERSION], [
567
 
case $SYSTEM_TYPE in
568
 
  *netware*)
569
 
    CXX_VERSION=`$CXX -version | grep -i version`
570
 
  ;;
571
 
  *)
 
584
  dnl Print version of CXX compiler
 
585
  AC_MSG_CHECKING("C++ Compiler version")
 
586
  if test "$GCC" = "yes"
 
587
  then
572
588
    CXX_VERSION=`$CXX --version | sed 1q`
573
 
    if test $? -ne "0" -o -z "$CXX_VERSION"
574
 
    then
575
 
      CXX_VERSION=`$CXX -V 2>&1|sed 1q` # trying harder for Sun and SGI
576
 
    fi
577
 
    if test $? -ne "0" -o -z "$CXX_VERSION"
578
 
    then
579
 
      CXX_VERSION=`$CXX -v 2>&1|sed 1q` # even harder for Alpha
580
 
    fi
581
 
    if test $? -ne "0" -o -z "$CXX_VERSION"
582
 
    then
583
 
      CXX_VERSION=""
584
 
    fi
585
 
esac
586
 
if test "$CXX_VERSION"
587
 
then
588
 
  AC_MSG_CHECKING("C++ compiler version")
 
589
  elif test "$SUNCC" = "yes"
 
590
  then
 
591
    CXX_VERSION=`$CXX -V`
 
592
  else
 
593
    CXX_VERSION=""
 
594
  fi
589
595
  AC_MSG_RESULT("$CXX $CXX_VERSION")
590
 
fi
591
 
AC_SUBST(CXX_VERSION)
 
596
  AC_SUBST(CXX_VERSION)
592
597
])
593
598
 
594
599
AC_DEFUN([DRIZZLE_PROG_AR], [