automake dependency tracking and UPC (gccupc) compiler fix

SNSerHello · Oct 31, 2011 · 67228fa · 67228fa
1 parent 3b086e0
commit 67228fa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/acmacros/upc.m4 b/acmacros/upc.m4
@@ -15,7 +15,7 @@ AC_ARG_VAR([UPCFLAGS], [Unified Parallel C compiler flags])dnl
 AC_CHECK_TOOLS([UPC], [m4_default([$1], [upcc upc])], [:])
 if test "$UPC" = :; then
  AC_MSG_ERROR([no Unified Parallel C compiler was found], [77])
-#else
-# _AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([UPC])])dnl
+else
+ _AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([UPC])])dnl
 fi
 ])
diff --git a/config/support-rtedupc.m4 b/config/support-rtedupc.m4
@@ -6,6 +6,11 @@ AC_DEFUN([ROSE_SUPPORT_UPC],
 
 AC_MSG_CHECKING([for RTEDUPC])
 AC_ARG_ENABLE(rtedupc,AS_HELP_STRING([--enable-rtedupc],[Enable UPC support in ROSE (default=no)]),,[enableval=no])
+
+# set the dependence variables to avoid problems when UPC is not specified and not present
+am__fastdepUPC_TRUE='#'
+am__fastdepUPC_FALSE=
+
 AM_CONDITIONAL(ROSE_WITH_UPC, [test "x$enableval" = "xyes"])
 AS_IF([test "x$enableval" = "xyes"], [AM_PROG_UPC])
 AC_MSG_RESULT([$enableval])