Make it possible to cross-compile CLN.

diff --git a/ChangeLog b/ChangeLog
index 4f6c6279205d7786ab316b5674e1e18965a1b693..c88c37544358cd3b7fb7deba51b072a8bee79e64 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-08-27  Bruno Haible  <bruno@clisp.org>
+
+       Make it possible to cross-compile CLN.
+       * m4/intparam.m4: New file.
+       * m4/floatparam.m4: New file.
+       * autoconf/aclocal.m4: Include both.
+       (CL_MACHINE): Add an additional CROSS_MACRO parameter.
+       * configure.ac (CL_MACHINE): When cross-compiling, use
+       CL_INTPARAM_CROSS and CL_FLOATPARAM_CROSS.
+
 2005-08-27  Bruno Haible  <bruno@clisp.org>
 
        Define HAVE_LONGLONG and HAVE_LONGDOUBLE when cross-compiling.

diff --git a/autoconf/aclocal.m4 b/autoconf/aclocal.m4
index 3a2727b098f1dccc7df560d7fa313c66bcd169b2..ad086e15e4ddec895e3992863c178619931472bc 100644 (file)
--- a/autoconf/aclocal.m4
+++ b/autoconf/aclocal.m4
@@ -11,6 +11,9 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+m4_include([intparam.m4])
+m4_include([floatparam.m4])
+
 dnl -*- Autoconf -*-
 dnl Copyright (C) 1993-2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
@@ -543,7 +546,7 @@ fi
 ])
 
 dnl -*- Autoconf -*-
-dnl Copyright (C) 1993-2003 Free Software Foundation, Inc.
+dnl Copyright (C) 1993-2005 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
 dnl Public License, this file may be distributed as part of a program
@@ -554,14 +557,15 @@ dnl From Bruno Haible, Marcus Daniels, Sam Steingold.
 
 AC_PREREQ(2.13)
 
+dnl CL_MACHINE([MESSAGE], [PROGRAM_TO_RUN], [CROSS_MACRO], [DESTINATION], [CACHE_VAR])
 AC_DEFUN([CL_MACHINE],
 [AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([AC_C_CHAR_UNSIGNED])dnl
 cl_machine_file_c=$2
-cl_machine_file_h=$3
-if test $cross_compiling = no; then
-if test -z "$[$4]"; then
+if test -z "$[$5]"; then
 AC_CHECKING(for [$1])
+if test $cross_compiling = no; then
+cl_machine_file_h=$4
 cat > conftest.$ac_ext <<EOF
 #include "confdefs.h"
 EOF
@@ -584,14 +588,14 @@ if test -s conftest; then
     rm -f "$cl_machine_file_h"
     mv conftest.h "$cl_machine_file_h"
   fi
-  [$4]=1
+  [$5]=1
 else
   echo "creation of $cl_machine_file_h failed"
 fi
 rm -f conftest*
-fi
 else
-echo "cross-compiling - cannot create $cl_machine_file_h"
+$3([$4])
+fi
 fi
 ])
 

diff --git a/configure.ac b/configure.ac
index 602048562884d3b6f61fb9ba33af8aefde192805..e549bd2d282a5eb37c8f0a9b548b03bdf485ff5a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -142,9 +142,9 @@ dnl
 AC_C_CHAR_UNSIGNED
                       dnl DEFS __CHAR_UNSIGNED__ if char is unsigned
 test -d 'include/cln' || mkdir -p 'include/cln'
-CL_MACHINE([integer types and behaviour],${srcdir}/autoconf/intparam.c,include/cln/intparam.h,cl_cv_file_intparam_h)
+CL_MACHINE([integer types and behaviour],${srcdir}/autoconf/intparam.c,[CL_INTPARAM_CROSS],include/cln/intparam.h,cl_cv_file_intparam_h)
                       dnl builds include/cln/intparam.h
-CL_MACHINE([floating-point types and behaviour],${srcdir}/autoconf/floatparam.c,include/cln/floatparam.h,cl_cv_file_floatparam_h)
+CL_MACHINE([floating-point types and behaviour],${srcdir}/autoconf/floatparam.c,[CL_FLOATPARAM_CROSS],include/cln/floatparam.h,cl_cv_file_floatparam_h)
                       dnl builds include/cln/floatparam.h
 dnl
 dnl           interfacing to GNU gmp (must be at least version 3)