[SCM] Starlink autoconf support branch, master, updated. b90acf199ae372e05db0b8657beb073d2cd1c123

[Ole Streicher]

The following commit has been merged in the master branch:
commit b90acf199ae372e05db0b8657beb073d2cd1c123
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Feb 10 12:29:59 2012 +0100

    Fix AC_LANG_CONFTEST call parameter

diff --git a/debian/patches/remove_unknown_macros.patch b/debian/patches/remove_unknown_macros.patch
index cb76a4c..9406e93 100644
--- a/debian/patches/remove_unknown_macros.patch
+++ b/debian/patches/remove_unknown_macros.patch
@@ -1,8 +1,8 @@
 Author: Ole Streicher <debian at liska.ath.cx>
 Description: Remove macros from starconf, that are not in the standard automake
  so that they may fail
---- starconf-1.3.orig/starconf.m4.in
-+++ starconf-1.3/starconf.m4.in
+--- a/starconf.m4.in
++++ b/starconf.m4.in
 @@ -714,7 +714,6 @@ AC_DEFUN([STAR_PRM_COMPATIBLE_SYMBOLS],
  #
  AC_DEFUN([STAR_CNF_TRAIL_TYPE],
@@ -11,3 +11,12 @@ Description: Remove macros from starconf, that are not in the standard automake
      AC_CACHE_CHECK([type used for Fortran string lengths],
         [star_cv_cnf_trail_type],
         [if test "$ac_cv_sizeof_voidp" = 8 -a "$ac_cv_fc_compiler_gnu" = no; then
+@@ -1790,7 +1789,7 @@ dnl The problem only affects g77/gcc, so we know we're dealing with these below
+                 AC_LANG_PUSH(C)
+                 rm -f conftest*
+                 star_cv_restfp_fixup=unknown
+-                AC_LANG_CONFTEST(AC_LANG_PROGRAM([], restFP()))
++                AC_LANG_CONFTEST([AC_LANG_PROGRAM([], restFP())])
+                 { AC_TRY_COMMAND($CC -o conftest.x -S conftest.c)
+                   test $ac_status = 0
+                 } &&

-- 
Starlink autoconf support