From 14cde5136d6b7f4f7ca96c899d19d22f93c7e3f3 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 7 Oct 2005 15:39:34 +0000 Subject: [PATCH] ltest files from bakefile add HP aCC dependencies support git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35824 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- build/aclocal/bakefile-lang.m4 | 13 +++++++++++++ build/aclocal/bakefile.m4 | 8 ++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/build/aclocal/bakefile-lang.m4 b/build/aclocal/bakefile-lang.m4 index 54fccded46..4865ae4eb8 100644 --- a/build/aclocal/bakefile-lang.m4 +++ b/build/aclocal/bakefile-lang.m4 @@ -133,6 +133,17 @@ AC_DEFUN([AC_BAKEFILE_PROG_INTELCXX], _AC_BAKEFILE_LANG_COMPILER(Intel, C++, __INTEL_COMPILER, INTELCXX=yes) ]) +dnl HP-UX aCC: see http://docs.hp.com/en/6162/preprocess.htm#macropredef +AC_DEFUN([AC_BAKEFILE_PROG_HPCC], +[ + _AC_BAKEFILE_LANG_COMPILER(HP, C, __HP_cc, HPCC=yes) +]) + +AC_DEFUN([AC_BAKEFILE_PROG_HPCXX], +[ + _AC_BAKEFILE_LANG_COMPILER(HP, C++, __HP_aCC, HPCXX=yes) +]) + dnl =========================================================================== dnl macros to detect specialty compiler options dnl =========================================================================== @@ -192,6 +203,7 @@ AC_DEFUN([AC_BAKEFILE_PROG_CC], AC_BAKEFILE_PROG_XLCC AC_BAKEFILE_PROG_SGICC AC_BAKEFILE_PROG_SUNCC + AC_BAKEFILE_PROG_HPCC fi ]) @@ -210,6 +222,7 @@ AC_DEFUN([AC_BAKEFILE_PROG_CXX], AC_BAKEFILE_PROG_XLCXX AC_BAKEFILE_PROG_SGICXX AC_BAKEFILE_PROG_SUNCXX + AC_BAKEFILE_PROG_HPCXX fi ]) diff --git a/build/aclocal/bakefile.m4 b/build/aclocal/bakefile.m4 index 344bc365de..a7e7dc1d87 100644 --- a/build/aclocal/bakefile.m4 +++ b/build/aclocal/bakefile.m4 @@ -543,8 +543,12 @@ AC_DEFUN([AC_BAKEFILE_DEPS], DEPSMODE=unixcc DEPSFLAG="-M" AC_MSG_RESULT([SGI cc]) + elif test "x$HPCC" = "xyes"; then + DEPSMODE=unixcc + DEPSFLAG="+make" + AC_MSG_RESULT([HP cc]) else - DEPS_TRACKING=0 + DEPS_TRACKING=0 AC_MSG_RESULT([none]) fi @@ -552,7 +556,7 @@ AC_DEFUN([AC_BAKEFILE_DEPS], AC_BAKEFILE_CREATE_FILE_BK_DEPS chmod +x bk-deps fi - + AC_SUBST(DEPS_TRACKING) ])