Merge remote-tracking branch 'origin/master' into for-steve
authorNelson Ferreira <nelson.ferreira@ieee.org>
Wed, 1 Feb 2012 16:15:57 +0000 (11:15 -0500)
committerNelson Ferreira <nelson.ferreira@ieee.org>
Wed, 1 Feb 2012 16:15:57 +0000 (11:15 -0500)
1  2 
m4/sxe-libc.m4

diff --combined m4/sxe-libc.m4
@@@ -119,7 -119,7 +119,7 @@@ AC_DEFUN([SXE_CHECK_LIBC], [dn
  AC_DEFUN([SXE_CHECK_LIBC_VERSION], [dnl
        libc_version=""
        AC_MSG_CHECKING(for standard C library version information)
-       
        case "$ac_cv_build" in
        *-*-linux*)
                dnl #### who would ever _not_ be running the distro's libc?
                        libc_version=`dpkg-query --showformat='${version}' --show libc6`
                        libc_version="GNU libc $libc_version (Debian)"
                elif test -f /etc/slackware-version ; then
-                         slackver=`cat /etc/slackware-version`
+                       slackver=`cat /etc/slackware-version`
                        libc_version=`/lib/libc.so.6|head -1|cut -d ' ' -f7|tr -d ,`
-                         if test "x$libc_version" = "x"; then
-                                 libc_version=`/lib64/libc.so.6|head -1|cut -d ' ' -f7|tr -d ,`
-                         fi
+                       if test "x$libc_version" = "x"; then
+                               libc_version=`/lib64/libc.so.6|head -1|cut -d ' ' -f7|tr -d ,`
+                       fi
                        libc_version="GNU libc $libc_version ($slackver)"
                dnl need SuSE et al checks here...
                fi
                dnl #### Tested on Debian, does this actually work elsewhere?  ;-)
                dnl #### NO! -hroptatyr
-               dnl if test -z "$libc_version"; then
+               dnl if test -z "$libc_version"; then
                dnl   libc_version=`ls /lib/libc-*.so | sed -e 's,/lib/libc-\(.*\)\.so,\1,'`
-               dnl fi
+               dnl fi
  
                if test -z "$libc_version"; then
                AC_RUN_IFELSE([AC_LANG_SOURCE([[
@@@ -155,9 -155,9 +155,9 @@@ libc_file_we_use=`$LDD ./conftest | gre
                ;;
  
        *-*-aix*)
-               libc_version="bos.rte.libc `lslpp -Lqc bos.rte.libc | cut -f3 -d:`" 
+               libc_version="bos.rte.libc `lslpp -Lqc bos.rte.libc | cut -f3 -d:`"
                ;;
-       
        *-*-solaris*)
                libc=`pkginfo -l SUNWcsl | grep VERSION: | awk '{print $2}'`
                libc_version="SUNWcsl $libc"
@@@ -226,12 -226,10 +226,12 @@@ AC_DEFUN([SXE_CHECK_BASIC_TYPES], [dn
        ## checks for typedefs
        AC_TYPE_INT16_T
        AC_TYPE_INT32_T
 +      AC_TYPE_INT64_T
        AC_TYPE_INT8_T
        AC_TYPE_MODE_T
        AC_TYPE_OFF_T
        AC_TYPE_PID_T
 +      AC_TYPE_INTPTR_T
        ## next one is obsolete, it is safe to assume that RETSIGTYPE
        ## is always `void' these days
        dnl AC_TYPE_SIGNAL
        AC_CHECK_SIZEOF([long long int], [0])
        AC_CHECK_SIZEOF([wchar_t], [0])
        AC_CHECK_SIZEOF([void *], [0])
 +      AC_CHECK_SIZEOF([float], [0])
        AC_CHECK_SIZEOF([double], [0])
        AC_CHECK_SIZEOF([long double], [0])
        AC_CHECK_SIZEOF([size_t], [0])
  
        ## we used to do:
        ## if test "$ac_cv_sizeof_short" = 0; then
-       ##      echo ""
-       ##      echo "*** PANIC *** Configure tests are not working - compiler is broken."
-       ##      echo "*** PANIC *** Please examine config.log for compilation errors."
-       ##      exit 1
+       ##      echo ""
+       ##      echo "*** PANIC *** Configure tests are not working - compiler is broken."
+       ##      echo "*** PANIC *** Please examine config.log for compilation errors."
+       ##      exit 1
        ## fi
  
        ## treat RETSIGTYPE specially since we've kicked the detection
@@@ -341,7 -338,7 +341,7 @@@ AC_DEFUN([SXE_CHECK_BASIC_FUNS], [dn
  
  AC_DEFUN([SXE_CHECK_SIGNALS], [dnl
        SXE_CHECK_HEADERS([string.h])
-         AC_CHECK_FUNCS([strsignal])
+       AC_CHECK_FUNCS([strsignal])
        AC_CHECK_DECLS([sys_siglist], [], [], [
  #include <signal.h>
  /* NetBSD declares sys_siglist in unistd.h.  */
  ])dnl SXE_CHECK_SIGNALS
  
  AC_DEFUN([SXE_CHECK_INTPTR_T], [dnl
 -      dnl not AC_CHECK_TYPE; lisp.h does hairy conditional typedef
 -      dnl why not? let's test it...
        SXE_CHECK_HEADERS([inttypes.h])
        AC_CHECK_TYPE([intptr_t], [], [], [
  #if defined HAVE_SYS_TYPES_H
        fi
  
        dnl if test "$ac_cv_header_inttypes_h" != "yes"; then
-       dnl     AC_MSG_CHECKING([for intptr_t in sys/types.h])
-       dnl     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+       dnl     AC_MSG_CHECKING([for intptr_t in sys/types.h])
+       dnl     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
        dnl #include <sys/types.h>
        dnl ]], [[
        dnl intptr_t x;
        dnl ]])], [dnl
-       dnl             AC_MSG_RESULT(yes)
-       dnl             AC_DEFINE([HAVE_INTPTR_T_IN_SYS_TYPES_H], [1],
+       dnl             AC_MSG_RESULT(yes)
+       dnl             AC_DEFINE([HAVE_INTPTR_T_IN_SYS_TYPES_H], [1],
        dnl                     [Description here!])
-       dnl             ], [dnl
-       dnl             AC_MSG_RESULT(no)])
+       dnl             ], [dnl
+       dnl             AC_MSG_RESULT(no)])
        dnl fi
  ])dnl SXE_CHECK_INTPTR_T